Forráskód Böngészése

libghc-*: rebuild with ghc-8.4.2

git-svn-id: http://trac.vinelinux.org/repos/projects/specs@11634 ec354946-7b23-47d6-9f5a-488ba84defc7
ara_t 7 éve
szülő
commit
3bed3061c7

+ 42 - 70
lib/libg/libghc-aeson/libghc-aeson-vl.spec

@@ -1,9 +1,7 @@
 %define pkg_name    aeson
-%define pkg_version 1.2.3.0
+%define pkg_version 1.3.1.1
 %define pkg_release 1%{?_dist_release}
 
-%define ghc_version 8.2.2
-
 Summary: Haskell libraries: %{pkg_name} and dependent libraries
 Name:    libghc-%{pkg_name}
 Version: %{pkg_version}
@@ -13,32 +11,36 @@ License: BSD3
 Group:   Applications/Text
 URL:     http://hackage.haskell.org
 
-Source0: %{pkg_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: base-compat-0.9.3.tar.gz
-Source12: th-abstraction-0.2.6.0.tar.gz
-Source13: time-locale-compat-0.1.1.3.tar.gz
-Source14: transformers-compat-0.5.1.4.tar.gz
-Source15: uuid-types-1.0.3.tar.gz
-Source16: tagged-0.8.5.tar.gz
-
-# to fix wrong dependencies in cabal files
-# do not use '-'
-%define tagged_version 0.8.5
-Source51: tagged.cabal
+Source0: packages
+
+Source11: base-compat-0.10.1.tar.gz
+Source12: base-compat.cabal
+Source13: th-abstraction-0.2.6.0.tar.gz
+Source14: th-abstraction.cabal
+Source15: time-locale-compat-0.1.1.4.tar.gz
+Source16: time-locale-compat.cabal
+Source17: transformers-compat-0.6.2.tar.gz
+Source18: transformers-compat.cabal
+Source19: uuid-types-1.0.3.tar.gz
+Source20: uuid-types.cabal
+Source21: tagged-0.8.5.tar.gz
+Source22: tagged.cabal
+Source23: aeson-1.3.1.1.tar.gz
+Source24: aeson.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: docbook-utils docbook-utils-pdf docbook-style-xsl
 
 Requires: ghc haskell-platform
+Requires: haskell-platform-dep
 Requires: libghc-dlist
+Requires: libghc-old-locale
 
 Vendor: Project Vine
 Distribution: Vine Linux
@@ -51,74 +53,39 @@ Haskell libraries: %{pkg_name}
 
 %prep
 %{__rm} -rf ${RPM_BUILD_ROOT}
-%{__rm} -rf %{_builddir}/package.conf
-%{__rm} -rf ${HOME}/.ghc
-%setup -q -n %{pkg_name}-%{version}
 
 %build
-# Initialise the package db
-ghc-pkg init %{_builddir}/package.conf
+%ghc_pkg_init
 
-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}
-  # fix wrong dependencies
-  case ${pkg} in
-      "tagged-%{tagged_version}") %{__cp} %{SOURCE51} . ;;
-      *) ;;
-  esac
-
-  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 ..
+for pkg in `cat %{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
-cd %{_builddir}/%{pkg_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.markdown \
+     ${RPM_BUILD_ROOT}%{_docdir}/%{name}/%{pkg_name}-%{version}
+popd
 
-%{__cp} changelog.md LICENSE README.markdown \
-        ${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
@@ -129,6 +96,11 @@ ghc-pkg recache
 
 
 %changelog
+* Fri May 18 2018 Toshiaki Ara <ara_t@384.jp> 1.3.1.1-1
+- update to 1.3.1.1
+- rebuild using ghc-8.4.2
+- rewrite using macro
+
 * Tue Jan 09 2018 Toshiaki Ara <ara_t@384.jp> 1.2.3.0-1
 - update to 1.2.3.0
 - build using ghc-8.2.2

+ 102 - 86
lib/libg/libghc-build-pandoc/libghc-build-pandoc-vl.spec

@@ -1,9 +1,7 @@
 %define pkg_name    build-pandoc
-%define pkg_version 2.0.6
+%define pkg_version 2.2.1
 %define pkg_release 1%{?_dist_release}
 
-%define ghc_version 8.2.2
-
 Summary: Haskell libraries: %{pkg_name} and dependent libraries
 Name:    libghc-%{pkg_name}
 Version: %{pkg_version}
@@ -15,64 +13,102 @@ URL:     http://hackage.haskell.org
 
 Source0: packages
 
-# num=1; for pkg in `cat packages`; do echo "Source${num}: ${pkg}.tar.gz"; num=`expr ${num} + 1`; done
-Source11: Glob-0.9.1.tar.gz
-Source12: JuicyPixels-3.2.9.3.tar.gz
-Source13: SHA-1.6.4.2.tar.gz
-Source14: blaze-markup-0.8.0.0.tar.gz
-Source15: cmark-gfm-0.1.3.tar.gz
-Source16: cmdargs-0.10.19.tar.gz
-Source17: digest-0.0.1.2.tar.gz
-Source18: fail-4.9.0.0.tar.gz
-Source19: haddock-library-1.4.3.tar.gz
-Source20: hxt-charproperties-9.2.0.1.tar.gz
-Source21: old-time-1.1.0.3.tar.gz
-Source22: pandoc-types-1.17.3.tar.gz
-Source23: regex-pcre-builtin-0.94.4.8.8.35.tar.gz
-Source24: safe-0.3.15.tar.gz
-Source25: tagsoup-0.14.2.tar.gz
-Source26: temporary-1.2.1.1.tar.gz
-Source27: utf8-string-1.0.1.1.tar.gz
-Source28: xml-1.3.14.tar.gz
-Source29: blaze-html-0.9.0.1.tar.gz
-Source30: aeson-pretty-0.8.5.tar.gz
-Source31: hslua-0.9.5.tar.gz
-Source32: hxt-unicode-9.0.2.4.tar.gz
-Source33: hxt-regex-xmlschema-9.2.0.3.tar.gz
-Source34: zip-archive-0.3.1.1.tar.gz
-Source35: texmath-0.10.1.tar.gz
-Source36: doctemplates-0.2.1.tar.gz
-Source37: hslua-module-text-0.1.2.1.tar.gz
-Source38: hxt-9.3.1.16.tar.gz
-Source39: skylighting-0.5.0.1.tar.gz
-
-# to fix wrong dependencies in cabal files
-# do not use '-'
-%define oldtime_version 1.1.0.3
-%define utf8string_version 1.0.1.1
-Source101: old-time.cabal
-Source102: utf8-string.cabal
-
-BuildRoot: %{_tmppath}/%{name}-%{version}-root
+Source11: Glob-0.9.2.tar.gz
+Source12: Glob.cabal
+Source13: JuicyPixels-3.2.9.5.tar.gz
+Source14: JuicyPixels.cabal
+Source15: SHA-1.6.4.4.tar.gz
+Source16: SHA.cabal
+Source17: base64-bytestring-1.0.0.1.tar.gz
+Source18: base64-bytestring.cabal
+Source19: blaze-markup-0.8.2.1.tar.gz
+Source20: blaze-markup.cabal
+Source21: cmark-gfm-0.1.3.tar.gz
+Source22: cmark-gfm.cabal
+Source23: cmdargs-0.10.20.tar.gz
+Source24: cmdargs.cabal
+Source25: colour-2.3.4.tar.gz
+Source26: colour.cabal
+Source27: data-default-instances-containers-0.0.1.tar.gz
+Source28: data-default-instances-containers.cabal
+Source29: data-default-instances-dlist-0.0.1.tar.gz
+Source30: data-default-instances-dlist.cabal
+Source31: data-default-instances-old-locale-0.0.1.tar.gz
+Source32: data-default-instances-old-locale.cabal
+Source33: digest-0.0.1.2.tar.gz
+Source34: digest.cabal
+Source35: fail-4.9.0.0.tar.gz
+Source36: fail.cabal
+Source37: hxt-charproperties-9.2.0.1.tar.gz
+Source38: hxt-charproperties.cabal
+Source39: old-time-1.1.0.3.tar.gz
+Source40: old-time.cabal
+Source41: pandoc-types-1.17.4.2.tar.gz
+Source42: pandoc-types.cabal
+Source43: regex-pcre-builtin-0.94.4.8.8.35.tar.gz
+Source44: regex-pcre-builtin.cabal
+Source45: safe-0.3.17.tar.gz
+Source46: safe.cabal
+Source47: tagsoup-0.14.6.tar.gz
+Source48: tagsoup.cabal
+Source49: temporary-1.3.tar.gz
+Source50: temporary.cabal
+Source51: utf8-string-1.0.1.1.tar.gz
+Source52: utf8-string.cabal
+Source53: xml-1.3.14.tar.gz
+Source54: xml.cabal
+Source55: blaze-html-0.9.0.1.tar.gz
+Source56: blaze-html.cabal
+Source57: aeson-pretty-0.8.7.tar.gz
+Source58: aeson-pretty.cabal
+Source59: ansi-terminal-0.8.0.4.tar.gz
+Source60: ansi-terminal.cabal
+Source61: data-default-0.7.1.1.tar.gz
+Source62: data-default.cabal
+Source63: hslua-0.9.5.2.tar.gz
+Source64: hslua.cabal
+Source65: hxt-unicode-9.0.2.4.tar.gz
+Source66: hxt-unicode.cabal
+Source67: hxt-regex-xmlschema-9.2.0.3.tar.gz
+Source68: hxt-regex-xmlschema.cabal
+Source69: zip-archive-0.3.2.4.tar.gz
+Source70: zip-archive.cabal
+Source71: texmath-0.11.tar.gz
+Source72: texmath.cabal
+Source73: doctemplates-0.2.2.1.tar.gz
+Source74: doctemplates.cabal
+Source75: hslua-module-text-0.1.2.1.tar.gz
+Source76: hslua-module-text.cabal
+Source77: hxt-9.3.1.16.tar.gz
+Source78: hxt.cabal
+Source79: skylighting-core-0.7.1.tar.gz
+Source80: skylighting-core.cabal
+Source81: skylighting-0.7.1.tar.gz
+Source82: skylighting.cabal
 
 BuildRequires: ghc haskell-platform
-BuildRequires: libffi-devel gmp-devel zlib-devel
-BuildRequires: libghc-data-default-class
 BuildRequires: libghc-dlist
-BuildRequires: libghc-data-default
+BuildRequires: libghc-old-locale
 BuildRequires: libghc-aeson
-BuildRequires: libghc-http-client-tls
+BuildRequires: libghc-semigroups
 BuildRequires: yaml
+BuildRequires: libghc-data-default-class
+BuildRequires: libghc-http-client-tls
+BuildRequires: libghc-haddock-library
 
+BuildRequires: zlib-devel
 BuildRequires: docbook-utils docbook-utils-pdf docbook-style-xsl
 
 Requires: ghc haskell-platform
-Requires: libghc-data-default-class
+Requires: haskell-platform-dep
 Requires: libghc-dlist
-Requires: libghc-data-default
+Requires: libghc-old-locale
 Requires: libghc-aeson
-Requires: libghc-http-client-tls
+Requires: libghc-semigroups
 Requires: yaml
+Requires: libghc-data-default-class
+Requires: libghc-http-client-tls
+Requires: libghc-haddock-library
 
 Vendor: Project Vine
 Distribution: Vine Linux
@@ -83,55 +119,30 @@ Packager: ara_t
 Haskell libraries: %{pkg_name}
 
 
-%prep
-%{__rm} -rf ${RPM_BUILD_ROOT}
-%{__rm} -rf %{_builddir}/package.conf
-%{__rm} -rf ${HOME}/.ghc
-%setup -q -T -c %{name}-%{version}
-
 %build
-# Initialise the package db
-ghc-pkg init %{_builddir}/package.conf
-
-PKG_CONF_DIR=${RPM_BUILD_ROOT}%{_libdir}/ghc-%{ghc_version}/package.conf.d
-%{__rm} -rf ${PKG_CONF_DIR}
-%{__mkdir_p} ${PKG_CONF_DIR}
+%ghc_pkg_init
 
 cd %{_builddir}
 for pkg in `cat %{SOURCE0}`; do
-  %{__tar} xzf %{_sourcedir}/${pkg}.tar.gz
-  cd ${pkg}
-    # fix wrong dependencies
-    case ${pkg} in
-        "old-time-%{oldtime_version}")       %{__cp} %{SOURCE101} . ;;
-        "utf8-string-%{utf8string_version}") %{__cp} %{SOURCE102} . ;;
-        *) ;;
-    esac
-
-  cabal configure \
-    --prefix=%{_prefix} \
-    --libdir=%{_libdir}/ghc-lib/%{name}/${pkg} \
-    --libsubdir= \
-    --datadir=%{_datadir}/%{name}/${pkg} \
-    --datasubdir= \
-    --docdir=%{_docdir}/%{name}/${pkg}
-
-  cabal build
-  cabal haddock || : # aviod Error
-  cabal copy --destdir=${RPM_BUILD_ROOT}
-  cabal register --inplace
-  cabal register --gen-pkg-config=${PKG_CONF_DIR}/%{name}_${pkg}.conf
-  cd ..
+    %{__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
 
+
 %clean
 %{__rm} -rf ${RPM_BUILD_ROOT}
 
 %post
-ghc-pkg recache
+%ghc_pkg_recache
 
 %postun
-ghc-pkg recache
+%ghc_pkg_recache
 
 
 %files
@@ -144,6 +155,11 @@ ghc-pkg recache
 
 
 %changelog
+* Fri May 18 2018 Toshiaki Ara <ara_t@384.jp> 2.2.1-1
+- update to 2.2.1
+- rebuild using ghc-8.4.2
+- rewrite using macro
+
 * Tue Jan 09 2018 Toshiaki Ara <ara_t@384.jp> 2.0.6-1
 - update to 2.0.6
 - build using ghc-8.2.2

+ 24 - 33
lib/libg/libghc-data-default-class/libghc-data-default-class-vl.spec

@@ -1,8 +1,6 @@
 %define pkg_name    data-default-class
 %define pkg_version 0.1.2.0
-%define pkg_release 2%{?_dist_release}
-
-%define ghc_version 8.2.2
+%define pkg_release 3%{?_dist_release}
 
 Summary: Haskell libraries: %{pkg_name}
 Name:    libghc-%{pkg_name}
@@ -13,7 +11,10 @@ License: BSD3
 Group:   Applications/Text
 URL:     http://hackage.haskell.org
 
-Source0: %{pkg_name}-%{version}.tar.gz
+Source0: packages
+
+Source11: data-default-class-0.1.2.0.tar.gz
+Source12: data-default-class.cabal
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
 
@@ -22,6 +23,7 @@ BuildRequires: libffi-devel gmp-devel zlib-devel
 BuildRequires: docbook-utils docbook-utils-pdf docbook-style-xsl
 
 Requires: ghc haskell-platform
+Requires: haskell-platform-dep
 
 
 Vendor: Project Vine
@@ -35,46 +37,31 @@ Haskell libraries: %{pkg_name}-%{version}
 
 %prep
 %{__rm} -rf ${RPM_BUILD_ROOT}
-%{__rm} -rf %{_builddir}/package.conf
-%{__rm} -rf ${HOME}/.ghc
-%setup -q -n %{pkg_name}-%{version}
 
 %build
-# Initialise the package db
-ghc-pkg init %{_builddir}/package.conf
-
-PKG_CONF_DIR=${RPM_BUILD_ROOT}%{_libdir}/ghc-%{ghc_version}/package.conf.d
-%{__rm} -rf ${PKG_CONF_DIR}
-%{__mkdir_p} ${PKG_CONF_DIR}
+%ghc_pkg_init
 
-cabal configure \
-    --prefix=%{_prefix} \
-    --libdir=%{_libdir}/ghc-lib/%{name}-%{version} \
-    --libsubdir= \
-    --datadir=%{_datadir}/%{name}-%{version} \
-    --datasubdir= \
-    --docdir=%{_docdir}/%{name}-%{version}
+cd %{_builddir}
+for pkg in `cat %{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
 
-cabal build
-cabal haddock || : # avoid Error
-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}
-
-%{__cp} LICENSE \
-        ${RPM_BUILD_ROOT}%{_docdir}/%{pkg_name}-%{version}
 
 %clean
 %{__rm} -rf ${RPM_BUILD_ROOT}
 
 %post
-ghc-pkg recache
+%ghc_pkg_recache
 
 %postun
-ghc-pkg recache
+%ghc_pkg_recache
 
 
 %files
@@ -85,6 +72,10 @@ ghc-pkg recache
 
 
 %changelog
+* Fri May 18 2018 Toshiaki Ara <ara_t@384.jp> 0.1.2.0-3
+- rebuild using ghc-8.4.2
+- rewrite using macro
+
 * Tue Jan 09 2018 Toshiaki Ara <ara_t@384.jp> 0.1.2.0-2
 - rebuild using ghc-8.2.2
 

+ 28 - 68
lib/libg/libghc-data-default/libghc-data-default-vl.spec

@@ -1,8 +1,6 @@
 %define pkg_name    data-default
 %define pkg_version 0.7.1.1
-%define pkg_release 2%{?_dist_release}
-
-%define ghc_version 8.2.2
+%define pkg_release 3%{?_dist_release}
 
 Summary: Haskell libraries: %{pkg_name} and dependent libraries
 Name:    libghc-%{pkg_name}
@@ -13,30 +11,29 @@ License: BSD3
 Group:   Applications/Text
 URL:     http://hackage.haskell.org
 
-Source0: %{pkg_name}-%{version}.tar.gz
-Source1: packages
+Source0: packages
 
-# num=11; for pkg in `cat packages`; do echo "Source${num}: ${pkg}.tar.gz"; num=`expr ${num} + 1`; done
 Source11: data-default-instances-containers-0.0.1.tar.gz
-Source12: data-default-instances-dlist-0.0.1.tar.gz
-Source13: old-locale-1.0.0.7.tar.gz
-Source14: data-default-instances-old-locale-0.0.1.tar.gz
-
-# to fix wrong dependencies in cabal files
-# do not use '-'
-%define oldlocale_version 1.0.0.7
-Source101: old-locale.cabal
+Source12: data-default-instances-containers.cabal
+Source13: data-default-instances-dlist-0.0.1.tar.gz
+Source14: data-default-instances-dlist.cabal
+Source15: data-default-instances-old-locale-0.0.1.tar.gz
+Source16: data-default-instances-old-locale.cabal
+Source17: data-default-0.7.1.1.tar.gz
+Source18: data-default.cabal
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
 
 BuildRequires: ghc haskell-platform
 BuildRequires: libffi-devel gmp-devel zlib-devel
 BuildRequires: libghc-data-default-class
+BuildRequires: libghc-old-locale
 BuildRequires: libghc-dlist
 
 BuildRequires: docbook-utils docbook-utils-pdf docbook-style-xsl
 
 Requires: ghc haskell-platform
+Requires: haskell-platform-dep
 
 Vendor: Project Vine
 Distribution: Vine Linux
@@ -49,73 +46,31 @@ Haskell libraries: %{pkg_name} and dependent libraries
 
 %prep
 %{__rm} -rf ${RPM_BUILD_ROOT}
-%{__rm} -rf %{_builddir}/package.conf
-%{__rm} -rf ${HOME}/.ghc
-%setup -q -n %{pkg_name}-%{version}
 
 %build
-# Initialise the package db
-ghc-pkg init %{_builddir}/package.conf
+%ghc_pkg_init
 
-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}
-  case ${pkg} in
-      "old-locale-%{oldlocale_version}") %{__cp} %{SOURCE101} . ;;
-      *) ;;
-  esac
-
-  cabal configure \
-    --prefix=%{_prefix} \
-    --libdir=%{_libdir}/ghc-lib/%{name}/${pkg} \
-    --libsubdir= \
-    --datadir=%{_datadir}/%{name}/${pkg} \
-    --datasubdir= \
-    --docdir=%{_docdir}/%{name}/${pkg}
-
-  cabal build
-  cabal haddock || : # aviod Error
-  cabal copy --destdir=${RPM_BUILD_ROOT}
-  cabal register --inplace
-  cabal register --gen-pkg-config=${PKG_CONF_DIR}/%{name}_${pkg}.conf
-  cd ..
+for pkg in `cat %{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
-cd %{_builddir}/%{pkg_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}
-
-%{__cp} LICENSE \
-        ${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
@@ -126,6 +81,11 @@ ghc-pkg recache
 
 
 %changelog
+* Fri May 18 2018 Toshiaki Ara <ara_t@384.jp> 0.7.1.1-3
+- rebuild using ghc-8.4.2
+- rewrite using macro
+- add BuildRequires: libghc-old-locale
+
 * Tue Jan 09 2018 Toshiaki Ara <ara_t@384.jp> 0.7.1.1-2
 - rebuild using ghc-8.2.2
 

+ 27 - 34
lib/libg/libghc-dlist/libghc-dlist-vl.spec

@@ -1,9 +1,7 @@
 %define pkg_name    dlist
-%define pkg_version 0.8.0.3
+%define pkg_version 0.8.0.4
 %define pkg_release 1%{?_dist_release}
 
-%define ghc_version 8.2.2
-
 Summary: Haskell libraries: %{pkg_name}
 Name:    libghc-%{pkg_name}
 Version: %{pkg_version}
@@ -13,7 +11,10 @@ License: BSD3
 Group:   Applications/Text
 URL:     http://hackage.haskell.org
 
-Source0: %{pkg_name}-%{version}.tar.gz
+Source0: packages
+
+Source11: dlist-0.8.0.4.tar.gz
+Source12: dlist.cabal
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
 
@@ -22,6 +23,7 @@ BuildRequires: libffi-devel gmp-devel zlib-devel
 BuildRequires: docbook-utils docbook-utils-pdf docbook-style-xsl
 
 Requires: ghc haskell-platform
+Requires: haskell-platform-dep
 
 Vendor: Project Vine
 Distribution: Vine Linux
@@ -34,46 +36,31 @@ Haskell libraries: %{pkg_name}-%{version}
 
 %prep
 %{__rm} -rf ${RPM_BUILD_ROOT}
-%{__rm} -rf %{_builddir}/package.conf
-%{__rm} -rf ${HOME}/.ghc
-%setup -q -n %{pkg_name}-%{version}
 
 %build
-# Initialise the package db
-ghc-pkg init %{_builddir}/package.conf
-
-PKG_CONF_DIR=${RPM_BUILD_ROOT}%{_libdir}/ghc-%{ghc_version}/package.conf.d
-%{__rm} -rf ${PKG_CONF_DIR}
-%{__mkdir_p} ${PKG_CONF_DIR}
-
-cabal configure \
-    --prefix=%{_prefix} \
-    --libdir=%{_libdir}/ghc-lib/%{name}-%{version} \
-    --libsubdir= \
-    --datadir=%{_datadir}/%{name}-%{version} \
-    --datasubdir= \
-    --docdir=%{_docdir}/%{name}-%{version}
+%ghc_pkg_init
 
-cabal build
-cabal haddock || : # avoid Error
-cabal copy --destdir=${RPM_BUILD_ROOT}
-cabal register --inplace
-cabal register --gen-pkg-config=${PKG_CONF_DIR}/%{pkg_name}-%{version}.conf
+cd %{_builddir}
+for pkg in `cat %{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
 
-%install
-cabal copy --destdir=${RPM_BUILD_ROOT}
-
-%{__cp} LICENSE \
-        ${RPM_BUILD_ROOT}%{_docdir}/%{name}-%{version}
 
 %clean
 %{__rm} -rf ${RPM_BUILD_ROOT}
 
 %post
-ghc-pkg recache
+%ghc_pkg_recache
 
 %postun
-ghc-pkg recache
+%ghc_pkg_recache
 
 
 %files
@@ -84,7 +71,12 @@ ghc-pkg recache
 
 
 %changelog
-* Tue Jan 09 2018 Toshiaki Ara <ara_t@384.jp> 0.8.0.3-1
+* Fri May 18 2018 Toshiaki Ara <ara_t@384.jp> 0.8.0.4-1
+- update to 0.8.0.4
+- build using ghc-8.4.2
+- rewrite using macro
+
+* Tue Jan 09 2018 Toshiaki Ara <ara_t@384.jp> 0.8.0.4-1
 - update to 0.8.0.3
 - build using ghc-8.2.2
 
@@ -100,3 +92,4 @@ ghc-pkg recache
 
 * Tue Mar 01 2016 Toshiaki Ara <ara_t@384.jp> 0.7.1.2-1
 - new package
+

+ 79 - 99
lib/libg/libghc-http-client-tls/libghc-http-client-tls-vl.spec

@@ -1,9 +1,7 @@
 %define pkg_name    http-client-tls
-%define pkg_version 0.3.5.1
+%define pkg_version 0.3.5.3
 %define pkg_release 1%{?_dist_release}
 
-%define ghc_version 8.2.2
-
 Summary: Haskell libraries: %{pkg_name} and dependent libraries
 Name:    libghc-%{pkg_name}
 Version: %{pkg_version}
@@ -13,56 +11,76 @@ License: BSD3
 Group:   Applications/Text
 URL:     http://hackage.haskell.org
 
-Source0: %{pkg_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: base64-bytestring-1.0.0.1.tar.gz
-Source12: basement-0.0.4.tar.gz
-Source13: blaze-builder-0.4.0.2.tar.gz
-Source14: byteable-0.1.1.tar.gz
-Source15: cereal-0.5.4.0.tar.gz
-Source16: exceptions-0.8.3.tar.gz
-Source17: hourglass-0.2.10.tar.gz
-Source18: http-types-0.11.tar.gz
-Source19: mime-types-0.1.0.7.tar.gz
-Source20: pem-0.2.2.tar.gz
-Source21: foundation-0.0.17.tar.gz
-Source22: streaming-commons-0.1.18.tar.gz
-Source23: cookie-0.4.3.tar.gz
-Source24: socks-0.5.6.tar.gz
-Source25: memory-0.14.11.tar.gz
-Source26: http-client-0.5.7.1.tar.gz
-Source27: cryptonite-0.24.tar.gz
-Source28: asn1-types-0.3.2.tar.gz
-Source29: asn1-encoding-0.9.5.tar.gz
-Source30: asn1-parse-0.9.4.tar.gz
-Source31: x509-1.7.2.tar.gz
-Source32: x509-store-1.6.5.tar.gz
-Source33: x509-validation-1.6.9.tar.gz
-Source34: x509-system-1.6.6.tar.gz
-Source35: tls-1.4.0.tar.gz
-Source36: connection-0.2.8.tar.gz
-
-# to fix wrong dependencies in cabal files
-# do not use '-'
-%define exceptions_version 0.8.3
-Source51: exceptions.cabal
+Source0: packages
+
+Source11: basement-0.0.7.tar.gz
+Source12: basement.cabal
+Source13: blaze-builder-0.4.1.0.tar.gz
+Source14: blaze-builder.cabal
+Source15: byteable-0.1.1.tar.gz
+Source16: byteable.cabal
+Source17: cereal-0.5.5.0.tar.gz
+Source18: cereal.cabal
+Source19: cookie-0.4.4.tar.gz
+Source20: cookie.cabal
+Source21: hourglass-0.2.11.tar.gz
+Source22: hourglass.cabal
+Source23: http-types-0.12.1.tar.gz
+Source24: http-types.cabal
+Source25: mime-types-0.1.0.7.tar.gz
+Source26: mime-types.cabal
+Source27: streaming-commons-0.2.0.0.tar.gz
+Source28: streaming-commons.cabal
+Source29: transformers-compat-0.6.2.tar.gz
+Source30: transformers-compat.cabal
+Source31: foundation-0.0.20.tar.gz
+Source32: foundation.cabal
+Source33: socks-0.5.6.tar.gz
+Source34: socks.cabal
+Source35: exceptions-0.10.0.tar.gz
+Source36: exceptions.cabal
+Source37: memory-0.14.16.tar.gz
+Source38: memory.cabal
+Source39: pem-0.2.4.tar.gz
+Source40: pem.cabal
+Source41: http-client-0.5.12.1.tar.gz
+Source42: http-client.cabal
+Source43: cryptonite-0.25.tar.gz
+Source44: cryptonite.cabal
+Source45: asn1-types-0.3.2.tar.gz
+Source46: asn1-types.cabal
+Source47: asn1-encoding-0.9.5.tar.gz
+Source48: asn1-encoding.cabal
+Source49: asn1-parse-0.9.4.tar.gz
+Source50: asn1-parse.cabal
+Source51: x509-1.7.3.tar.gz
+Source52: x509.cabal
+Source53: x509-store-1.6.6.tar.gz
+Source54: x509-store.cabal
+Source55: x509-validation-1.6.10.tar.gz
+Source56: x509-validation.cabal
+Source57: x509-system-1.6.6.tar.gz
+Source58: x509-system.cabal
+Source59: tls-1.4.1.tar.gz
+Source60: tls.cabal
+Source61: connection-0.2.8.tar.gz
+Source62: connection.cabal
+Source63: http-client-tls-0.3.5.3.tar.gz
+Source64: http-client-tls.cabal
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
 
 BuildRequires: ghc haskell-platform
 BuildRequires: libffi-devel gmp-devel zlib-devel
-BuildRequires: libghc-dlist
-BuildRequires: libghc-data-default
-BuildRequires: libghc-aeson
+BuildRequires: libghc-data-default-class
+BuildRequires: libghc-semigroups
 
 BuildRequires: docbook-utils docbook-utils-pdf docbook-style-xsl
 
 Requires: ghc haskell-platform
-Requires: libghc-dlist
-Requires: libghc-data-default
-Requires: libghc-aeson
+Requires: haskell-platform-dep
+Requires: libghc-data-default-class
+Requires: libghc-semigroups
 
 
 Vendor: Project Vine
@@ -76,74 +94,31 @@ Haskell libraries: %{pkg_name} and dependent libraries
 
 %prep
 %{__rm} -rf ${RPM_BUILD_ROOT}
-%{__rm} -rf %{_builddir}/package.conf
-%{__rm} -rf ${HOME}/.ghc
-%setup -q -n %{pkg_name}-%{version}
 
 %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}
+%ghc_pkg_init
 
-# install dependent packages
 cd %{_builddir}
-for pkg in `cat %{SOURCE1}`; do
-  %{__tar} xzf %{_sourcedir}/${pkg}.tar.gz
-  cd ${pkg}
-  # fix wrong dependencies
-  case ${pkg} in
-      "exceptions-%{exceptions_version}") %{__cp} %{SOURCE51} . ;;
-      *) ;;
-  esac
-
-  cabal configure \
-    --prefix=%{_prefix} \
-    --libdir=%{_libdir}/ghc-lib/%{name}/${pkg} \
-    --libsubdir= \
-    --datadir=%{_datadir}/%{name}/${pkg} \
-    --datasubdir= \
-    --docdir=%{_docdir}/%{name}/${pkg}
-
-  cabal build
-  cabal haddock || : # aviod Error
-  cabal copy --destdir=${RPM_BUILD_ROOT}
-  cabal register --inplace
-  cabal register --gen-pkg-config=${PKG_CONF_DIR}/%{name}_${pkg}.conf
-  cd ..
+for pkg in `cat %{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
-cd %{_builddir}/%{pkg_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}
-
-%{__cp} LICENSE \
-        ${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
@@ -154,6 +129,11 @@ ghc-pkg recache
 
 
 %changelog
+* Fri May 18 2018 Toshiaki Ara <ara_t@384.jp> 0.3.5.3-1
+- update to 0.3.5.3
+- rebuild using ghc-8.4.2
+- rewrite using macro
+
 * Tue Jan 09 2018 Toshiaki Ara <ara_t@384.jp> 0.3.5.1-1
 - update to 0.3.5.1
 - build using ghc-8.2.2