Browse Source

yaml: rebuild with ghc-8.4.2

git-svn-id: http://trac.vinelinux.org/repos/projects/specs@11631 ec354946-7b23-47d6-9f5a-488ba84defc7
ara_t 6 years ago
parent
commit
0414412849
1 changed files with 62 additions and 64 deletions
  1. 62 64
      y/yaml/yaml-vl.spec

+ 62 - 64
y/yaml/yaml-vl.spec

@@ -1,9 +1,7 @@
 %define pkg_name    yaml
-%define pkg_version 0.8.25.1
+%define pkg_version 0.8.30
 %define pkg_release 1%{?_dist_release}
 
-%define ghc_version 8.2.2
-
 Summary: Support for parsing and rendering YAML documents
 Name:    %{pkg_name}
 Version: %{pkg_version}
@@ -13,31 +11,42 @@ License: BSD3
 Group:   Applications/Text
 URL:     http://hackage.haskell.org
 
-Source0: %{name}-%{version}.tar.gz
-Source1: packages
-
-# num=11; for pkg in `cat packages`; do echo "Source${num}: ${pkg}.tar.gz"; num=`expr ${num} + 1`; done
-Source11: mmorph-1.1.0.tar.gz
-Source12: semigroups-0.18.3.tar.gz
-Source13: transformers-base-0.4.4.tar.gz
-Source14: unliftio-core-0.1.1.0.tar.gz
-Source15: monad-control-1.0.2.2.tar.gz
-Source16: lifted-base-0.2.3.11.tar.gz
-Source17: resourcet-1.1.10.tar.gz
-Source18: conduit-1.2.12.1.tar.gz
+Source0: packages
+
+Source11: exceptions-0.10.0.tar.gz
+Source12: exceptions.cabal
+Source13: unliftio-core-0.1.1.0.tar.gz
+Source14: unliftio-core.cabal
+Source15: vector-algorithms-0.7.0.1.tar.gz
+Source16: vector-algorithms.cabal
+Source17: resourcet-1.2.1.tar.gz
+Source18: resourcet.cabal
+Source19: mono-traversable-1.0.8.1.tar.gz
+Source20: mono-traversable.cabal
+Source21: conduit-1.3.0.2.tar.gz
+Source22: conduit.cabal
+Source23: yaml-0.8.30.tar.gz
+Source24: yaml.cabal
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
 
 BuildRequires: ghc haskell-platform
 BuildRequires: libffi-devel gmp-devel zlib-devel
 BuildRequires: libghc-dlist
+BuildRequires: libghc-old-locale
 BuildRequires: libghc-aeson
+BuildRequires: libghc-semigroups
+
 
 BuildRequires: docbook-utils docbook-utils-pdf docbook-style-xsl
 
 Requires: ghc haskell-platform
+Requires: haskell-platform-dep
 Requires: libghc-dlist
+Requires: libghc-old-locale
 Requires: libghc-aeson
+Requires: libghc-semigroups
+
 
 Vendor: Project Vine
 Distribution: Vine Linux
@@ -56,70 +65,54 @@ The package is broken down into two primary modules.
 For most users, "Data.Yaml" is recommended.
 #'
 
-%prep
+
+ %prep
 %{__rm} -rf ${RPM_BUILD_ROOT}
-%{__rm} -rf %{_builddir}/package.conf
-%{__rm} -rf ${HOME}/.ghc
-%setup -q
 
 %build
-# Initialise the package db
-ghc-pkg init %{_builddir}/package.conf
-
-PKG_CONF_DIR=${RPM_BUILD_ROOT}%{_libdir}/ghc-%{ghc_version}/package.conf.d
-%{__mkdir_p} ${PKG_CONF_DIR}
-
-# install dependent packages
-cd %{_builddir}
-for pkg in `cat %{SOURCE1}`; do
-  %{__tar} xzf %{_sourcedir}/${pkg}.tar.gz
-  cd ${pkg}
-  cabal configure \
-    --prefix=%{_prefix} \
-    --libdir=%{_libdir}/ghc-lib/%{name}/${pkg} \
-    --libsubdir= \
-    --datadir=%{_datadir}/%{name}/${pkg} \
-    --datasubdir= \
-    --docdir=%{_docdir}/%{name}/${pkg}
-
-  cabal build
-  cabal haddock || : # avoid Error
-  cabal copy --destdir=${RPM_BUILD_ROOT}
-  cabal register --inplace
-  cabal register --gen-pkg-config=${PKG_CONF_DIR}/%{name}_${pkg}.conf
-  cd ..
+%ghc_pkg_init
+
+for pkg in `sed '$d' %{SOURCE0}`; do
+    %{__tar} xzf %{_sourcedir}/${pkg}.tar.gz
+    pushd ${pkg}
+        %ghc_fix_dependencies ${pkg}
+        %cabal_configure2 %{name} ${pkg}
+        %cabal_build
+        %cabal_haddock
+        %cabal_copy_resister %{name}_${pkg}
+    popd
+done
+
+# build yaml
+for pkg in `tail -n 1 %{SOURCE0}`; do
+    %{__tar} xzf %{_sourcedir}/${pkg}.tar.gz
+    pushd ${pkg}
+        %ghc_fix_dependencies ${pkg}
+        %cabal_configure2 %{name} ${pkg} \
+                              -f -no-exe
+        %cabal_build
+        %cabal_haddock
+        %cabal_copy_resister %{pkg_name}-%{version}
+    popd
 done
 
-# build
-cd %{_builddir}/%{name}-%{version}
-cabal configure \
-    --prefix=%{_prefix} \
-    --libdir=%{_libdir}/ghc-lib/%{name}/%{pkg_name}-%{version} \
-    --libsubdir= \
-    --datadir=%{_datadir}/%{name}/%{pkg_name}-%{version} \
-    --datasubdir= \
-    --docdir=%{_docdir}/%{name}/%{pkg_name}-%{version}
-
-cabal build
-cabal haddock
-cabal copy --destdir=${RPM_BUILD_ROOT}
-cabal register --inplace
-cabal register --gen-pkg-config=${PKG_CONF_DIR}/%{pkg_name}-%{version}.conf
 
 %install
-cabal copy --destdir=${RPM_BUILD_ROOT}
+# copy documents
+pushd %{_builddir}/%{pkg_name}-%{version}
+    %{__cp} ChangeLog.md README.md \
+     ${RPM_BUILD_ROOT}%{_docdir}/%{name}/%{pkg_name}-%{version}
+popd
 
-%{__cp} ChangeLog.md LICENSE README.md \
-        ${RPM_BUILD_ROOT}%{_docdir}/%{name}/%{pkg_name}-%{version}
 
 %clean
 %{__rm} -rf ${RPM_BUILD_ROOT}
 
 %post
-ghc-pkg recache
+%ghc_pkg_recache
 
 %postun
-ghc-pkg recache
+%ghc_pkg_recache
 
 
 %files
@@ -131,6 +124,11 @@ ghc-pkg recache
 
 
 %changelog
+* Fri May 18 2018 Toshiaki Ara <ara_t@384.jp> 0.8.30-1
+- update to 0.8.30
+- rebuild using ghc-8.4.2
+- rewrite using macro
+
 * Tue Jan 09 2018 Toshiaki Ara <ara_t@384.jp> 0.8.25.1-1
 - update to 0.8.25.1
 - build using ghc-8.2.2