浏览代码

new upstream release

git-svn-id: http://trac.vinelinux.org/repos/projects/specs@11386 ec354946-7b23-47d6-9f5a-488ba84defc7
ara_t 7 年之前
父节点
当前提交
2ac9f61830

+ 27 - 9
lib/libg/libghc-aeson/libghc-aeson-vl.spec

@@ -1,8 +1,8 @@
 %define pkg_name    aeson
-%define pkg_version 0.11.3.0
+%define pkg_version 1.2.3.0
 %define pkg_release 1%{?_dist_release}
 
-%define ghc_version 8.0.1
+%define ghc_version 8.2.2
 
 Summary: Haskell libraries: %{pkg_name} and dependent libraries
 Name:    libghc-%{pkg_name}
@@ -17,9 +17,17 @@ 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: transformers-compat-0.5.1.4.tar.gz
-Source12: tagged-0.8.5.tar.gz
-Source13: fail-4.9.0.0.tar.gz
+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
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
 
@@ -59,6 +67,12 @@ 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} \
@@ -79,11 +93,11 @@ done
 cd %{_builddir}/%{pkg_name}-%{version}
 cabal configure \
     --prefix=%{_prefix} \
-    --libdir=%{_libdir}/ghc-lib/%{pkg_name}/%{pkg_name}-%{version} \
+    --libdir=%{_libdir}/ghc-lib/%{name}/%{pkg_name}-%{version} \
     --libsubdir= \
-    --datadir=%{_datadir}/%{pkg_name}/%{pkg_name}-%{version} \
+    --datadir=%{_datadir}/%{name}/%{pkg_name}-%{version} \
     --datasubdir= \
-    --docdir=%{_docdir}/%{pkg_name}/%{pkg_name}-%{version}
+    --docdir=%{_docdir}/%{name}/%{pkg_name}-%{version}
 
 cabal build
 cabal haddock
@@ -95,7 +109,7 @@ cabal register --gen-pkg-config=${PKG_CONF_DIR}/%{pkg_name}-%{version}.conf
 cabal copy --destdir=${RPM_BUILD_ROOT}
 
 %{__cp} changelog.md LICENSE README.markdown \
-        ${RPM_BUILD_ROOT}%{_docdir}/%{pkg_name}/%{pkg_name}-%{version}
+        ${RPM_BUILD_ROOT}%{_docdir}/%{name}/%{pkg_name}-%{version}
 
 %clean
 %{__rm} -rf ${RPM_BUILD_ROOT}
@@ -115,6 +129,10 @@ ghc-pkg recache
 
 
 %changelog
+* 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
+
 * Fri Feb 03 2017 Toshiaki Ara <ara_t@384.jp> 0.11.3.0-1
 - update to 0.11.3.0
 - build using ghc-8.0.1

+ 45 - 38
lib/libg/libghc-build-pandoc/libghc-build-pandoc-vl.spec

@@ -1,13 +1,8 @@
 %define pkg_name    build-pandoc
-%define pkg_version 1.19.2.4
+%define pkg_version 2.0.6
 %define pkg_release 1%{?_dist_release}
 
-%define ghc_version 8.0.1
-# to fix wrong dependencies in cabal files
-# do not use '-'
-%define oldtime_version 1.1.0.3
-%define utf8string_version 1.0.1.1
-
+%define ghc_version 8.2.2
 
 Summary: Haskell libraries: %{pkg_name} and dependent libraries
 Name:    libghc-%{pkg_name}
@@ -21,35 +16,40 @@ 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
-Source1: JuicyPixels-3.2.8.3.tar.gz
-Source2: SHA-1.6.4.2.tar.gz
-Source3: blaze-markup-0.8.0.0.tar.gz
-Source4: blaze-html-0.9.0.1.tar.gz
-Source5: cmark-0.5.6.tar.gz
-Source6: digest-0.0.1.2.tar.gz
-Source7: doctemplates-0.1.0.2.tar.gz
-Source8: extensible-exceptions-0.1.1.4.tar.gz
-Source9: haddock-library-1.4.3.tar.gz
-Source10: hslua-0.4.1.tar.gz
-Source11: hxt-charproperties-9.2.0.1.tar.gz
-Source12: hxt-regex-xmlschema-9.2.0.3.tar.gz
-Source13: hxt-unicode-9.0.2.4.tar.gz
-Source14: hxt-9.3.1.16.tar.gz
-Source15: old-time-1.1.0.3.tar.gz
-Source16: pandoc-types-1.17.0.5.tar.gz
-Source17: regex-pcre-builtin-0.94.4.8.8.35.tar.gz
-Source18: safe-0.3.15.tar.gz
-Source19: tagsoup-0.14.1.tar.gz
-Source20: temporary-1.2.1.1.tar.gz
-Source21: unix-compat-0.4.3.1.tar.gz
-Source22: filemanip-0.3.6.3.tar.gz
-Source23: utf8-string-1.0.1.1.tar.gz
-Source24: skylighting-0.1.1.5.tar.gz
-Source25: xml-1.3.14.tar.gz
-Source26: texmath-0.9.4.4.tar.gz
-Source27: zip-archive-0.3.1.1.tar.gz
+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
 
@@ -120,7 +120,7 @@ for pkg in `cat %{SOURCE0}`; do
   cabal haddock || : # aviod Error
   cabal copy --destdir=${RPM_BUILD_ROOT}
   cabal register --inplace
-  cabal register --gen-pkg-config=${PKG_CONF_DIR}/%{pkg_name}_${pkg}.conf
+  cabal register --gen-pkg-config=${PKG_CONF_DIR}/%{name}_${pkg}.conf
   cd ..
 done
 
@@ -136,14 +136,21 @@ ghc-pkg recache
 
 %files
 %defattr(-, root, root)
+%{_bindir}/
 %{_libdir}/ghc-%{ghc_version}/
 %{_libdir}/ghc-lib/
-%{_docdir}/%{name}
+%{_datadir}/%{name}/
+%{_docdir}/%{name}/
 
 
 %changelog
-* Sun Oct 29 2017 Toshiaki Ara <ara_t@384.jp> 1.19.2.4-1
-- update to 1.19.2.4
+* 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
+
+* Tue Feb 21 2017 Toshiaki Ara <ara_t@384.jp> 1.19.2.1-1
+- update to 1.19.2.1
+- build using ghc-8.0.2
 
 * Fri Feb 03 2017 Toshiaki Ara <ara_t@384.jp> 1.17.1-1
 - update to 1.17.1

+ 10 - 5
lib/libg/libghc-data-default-class/libghc-data-default-class-vl.spec

@@ -1,8 +1,8 @@
 %define pkg_name    data-default-class
 %define pkg_version 0.1.2.0
-%define pkg_release 1%{?_dist_release}
+%define pkg_release 2%{?_dist_release}
 
-%define ghc_version 8.0.1
+%define ghc_version 8.2.2
 
 Summary: Haskell libraries: %{pkg_name}
 Name:    libghc-%{pkg_name}
@@ -23,10 +23,12 @@ BuildRequires: docbook-utils docbook-utils-pdf docbook-style-xsl
 
 Requires: ghc haskell-platform
 
+
 Vendor: Project Vine
 Distribution: Vine Linux
 Packager: ara_t
 
+
 %description
 Haskell libraries: %{pkg_name}-%{version}
 
@@ -47,11 +49,11 @@ PKG_CONF_DIR=${RPM_BUILD_ROOT}%{_libdir}/ghc-%{ghc_version}/package.conf.d
 
 cabal configure \
     --prefix=%{_prefix} \
-    --libdir=%{_libdir}/ghc-lib/%{pkg_name}-%{version} \
+    --libdir=%{_libdir}/ghc-lib/%{name}-%{version} \
     --libsubdir= \
-    --datadir=%{_datadir}/%{pkg_name}-%{version} \
+    --datadir=%{_datadir}/%{name}-%{version} \
     --datasubdir= \
-    --docdir=%{_docdir}/%{pkg_name}-%{version}
+    --docdir=%{_docdir}/%{name}-%{version}
 
 cabal build
 cabal haddock || : # avoid Error
@@ -83,6 +85,9 @@ ghc-pkg recache
 
 
 %changelog
+* Tue Jan 09 2018 Toshiaki Ara <ara_t@384.jp> 0.1.2.0-2
+- rebuild using ghc-8.2.2
+
 * Fri Feb 03 2017 Toshiaki Ara <ara_t@384.jp> 0.1.2.0-1
 - update to 0.1.2.0
 - rebuild using ghc-8.0.1

+ 11 - 11
lib/libg/libghc-data-default/libghc-data-default-vl.spec

@@ -1,11 +1,8 @@
 %define pkg_name    data-default
 %define pkg_version 0.7.1.1
-%define pkg_release 1%{?_dist_release}
+%define pkg_release 2%{?_dist_release}
 
-%define ghc_version 8.0.1
-# to fix wrong dependencies in cabal files
-# do not use '-'
-%define oldlocale_version 1.0.0.7
+%define ghc_version 8.2.2
 
 Summary: Haskell libraries: %{pkg_name} and dependent libraries
 Name:    libghc-%{pkg_name}
@@ -26,6 +23,8 @@ 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
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
@@ -38,8 +37,6 @@ BuildRequires: libghc-dlist
 BuildRequires: docbook-utils docbook-utils-pdf docbook-style-xsl
 
 Requires: ghc haskell-platform
-Requires: libghc-data-default-class
-Requires: libghc-dlist
 
 Vendor: Project Vine
 Distribution: Vine Linux
@@ -85,7 +82,7 @@ for pkg in `cat %{SOURCE1}`; do
   cabal haddock || : # aviod Error
   cabal copy --destdir=${RPM_BUILD_ROOT}
   cabal register --inplace
-  cabal register --gen-pkg-config=${PKG_CONF_DIR}/%{pkg_name}_${pkg}.conf
+  cabal register --gen-pkg-config=${PKG_CONF_DIR}/%{name}_${pkg}.conf
   cd ..
 done
 
@@ -95,9 +92,9 @@ cabal configure \
     --prefix=%{_prefix} \
     --libdir=%{_libdir}/ghc-lib/%{name}/%{pkg_name}-%{version} \
     --libsubdir= \
-    --datadir=%{_datadir}/%{pkg_name}/%{pkg_name}-%{version} \
+    --datadir=%{_datadir}/%{name}/%{pkg_name}-%{version} \
     --datasubdir= \
-    --docdir=%{_docdir}/%{pkg_name}/%{pkg_name}-%{version}
+    --docdir=%{_docdir}/%{name}/%{pkg_name}-%{version}
 
 cabal build
 cabal haddock
@@ -109,7 +106,7 @@ cabal register --gen-pkg-config=${PKG_CONF_DIR}/%{pkg_name}-%{version}.conf
 cabal copy --destdir=${RPM_BUILD_ROOT}
 
 %{__cp} LICENSE \
-        ${RPM_BUILD_ROOT}%{_docdir}/%{pkg_name}/%{pkg_name}-%{version}
+        ${RPM_BUILD_ROOT}%{_docdir}/%{name}/%{pkg_name}-%{version}
 
 %clean
 %{__rm} -rf ${RPM_BUILD_ROOT}
@@ -129,6 +126,9 @@ ghc-pkg recache
 
 
 %changelog
+* Tue Jan 09 2018 Toshiaki Ara <ara_t@384.jp> 0.7.1.1-2
+- rebuild using ghc-8.2.2
+
 * Fri Feb 03 2017 Toshiaki Ara <ara_t@384.jp> 0.7.1.1-1
 - update to 0.7.1.1
 - build using ghc-8.0.1

+ 10 - 6
lib/libg/libghc-dlist/libghc-dlist-vl.spec

@@ -1,8 +1,8 @@
 %define pkg_name    dlist
-%define pkg_version 0.8.0.2
+%define pkg_version 0.8.0.3
 %define pkg_release 1%{?_dist_release}
 
-%define ghc_version 8.0.1
+%define ghc_version 8.2.2
 
 Summary: Haskell libraries: %{pkg_name}
 Name:    libghc-%{pkg_name}
@@ -48,11 +48,11 @@ PKG_CONF_DIR=${RPM_BUILD_ROOT}%{_libdir}/ghc-%{ghc_version}/package.conf.d
 
 cabal configure \
     --prefix=%{_prefix} \
-    --libdir=%{_libdir}/ghc-lib/%{pkg_name}-%{version} \
+    --libdir=%{_libdir}/ghc-lib/%{name}-%{version} \
     --libsubdir= \
-    --datadir=%{_datadir}/%{pkg_name}-%{version} \
+    --datadir=%{_datadir}/%{name}-%{version} \
     --datasubdir= \
-    --docdir=%{_docdir}/%{pkg_name}-%{version}
+    --docdir=%{_docdir}/%{name}-%{version}
 
 cabal build
 cabal haddock || : # avoid Error
@@ -64,7 +64,7 @@ cabal register --gen-pkg-config=${PKG_CONF_DIR}/%{pkg_name}-%{version}.conf
 cabal copy --destdir=${RPM_BUILD_ROOT}
 
 %{__cp} LICENSE \
-        ${RPM_BUILD_ROOT}%{_docdir}/%{pkg_name}-%{version}
+        ${RPM_BUILD_ROOT}%{_docdir}/%{name}-%{version}
 
 %clean
 %{__rm} -rf ${RPM_BUILD_ROOT}
@@ -84,6 +84,10 @@ ghc-pkg recache
 
 
 %changelog
+* Tue Jan 09 2018 Toshiaki Ara <ara_t@384.jp> 0.8.0.3-1
+- update to 0.8.0.3
+- build using ghc-8.2.2
+
 * Fri Feb 03 2017 Toshiaki Ara <ara_t@384.jp> 0.8.0.2-1
 - update to 0.1.2.0
 - build using ghc-8.0.1

+ 54 - 36
lib/libg/libghc-http-client-tls/libghc-http-client-tls-vl.spec

@@ -1,11 +1,8 @@
 %define pkg_name    http-client-tls
-%define pkg_version 0.2.4.1
+%define pkg_version 0.3.5.1
 %define pkg_release 1%{?_dist_release}
 
-%define ghc_version 8.0.1
-# to fix wrong dependencies in cabal files
-# do not use '-'
-%define exceptions_version 0.8.3
+%define ghc_version 8.2.2
 
 Summary: Haskell libraries: %{pkg_name} and dependent libraries
 Name:    libghc-%{pkg_name}
@@ -21,29 +18,36 @@ 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: blaze-builder-0.4.0.2.tar.gz
-Source13: byteable-0.1.1.tar.gz
-Source14: cereal-0.5.4.0.tar.gz
-Source15: cookie-0.4.2.1.tar.gz
-Source16: hourglass-0.2.10.tar.gz
-Source17: http-types-0.9.1.tar.gz
-Source18: memory-0.13.tar.gz
-Source19: asn1-types-0.3.2.tar.gz
-Source20: asn1-encoding-0.9.4.tar.gz
-Source21: asn1-parse-0.9.4.tar.gz
-Source22: cryptonite-0.21.tar.gz
-Source23: mime-types-0.1.0.7.tar.gz
-Source24: pem-0.2.2.tar.gz
-Source25: socks-0.5.5.tar.gz
-Source26: exceptions-0.8.3.tar.gz
-Source27: streaming-commons-0.1.17.tar.gz
-Source28: http-client-0.4.31.2.tar.gz
-Source29: x509-1.6.5.tar.gz
-Source30: x509-store-1.6.2.tar.gz
-Source31: x509-system-1.6.4.tar.gz
-Source32: x509-validation-1.6.5.tar.gz
-Source33: tls-1.3.9.tar.gz
-Source34: connection-0.2.7.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
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
 
@@ -88,19 +92,25 @@ 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/%{pkg_name}/${pkg} \
+    --libdir=%{_libdir}/ghc-lib/%{name}/${pkg} \
     --libsubdir= \
-    --datadir=%{_datadir}/%{pkg_name}/${pkg} \
+    --datadir=%{_datadir}/%{name}/${pkg} \
     --datasubdir= \
-    --docdir=%{_docdir}/%{pkg_name}/${pkg}
+    --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}/%{pkg_name}_${pkg}.conf
+  cabal register --gen-pkg-config=${PKG_CONF_DIR}/%{name}_${pkg}.conf
   cd ..
 done
 
@@ -108,11 +118,11 @@ done
 cd %{_builddir}/%{pkg_name}-%{version}
 cabal configure \
     --prefix=%{_prefix} \
-    --libdir=%{_libdir}/ghc-lib/%{pkg_name}/%{pkg_name}-%{version} \
+    --libdir=%{_libdir}/ghc-lib/%{name}/%{pkg_name}-%{version} \
     --libsubdir= \
-    --datadir=%{_datadir}/%{pkg_name}/%{pkg_name}-%{version} \
+    --datadir=%{_datadir}/%{name}/%{pkg_name}-%{version} \
     --datasubdir= \
-    --docdir=%{_docdir}/%{pkg_name}/%{pkg_name}-%{version}
+    --docdir=%{_docdir}/%{name}/%{pkg_name}-%{version}
 
 cabal build
 cabal haddock
@@ -124,7 +134,7 @@ cabal register --gen-pkg-config=${PKG_CONF_DIR}/%{pkg_name}-%{version}.conf
 cabal copy --destdir=${RPM_BUILD_ROOT}
 
 %{__cp} LICENSE \
-        ${RPM_BUILD_ROOT}%{_docdir}/%{pkg_name}/%{pkg_name}-%{version}
+        ${RPM_BUILD_ROOT}%{_docdir}/%{name}/%{pkg_name}-%{version}
 
 %clean
 %{__rm} -rf ${RPM_BUILD_ROOT}
@@ -144,6 +154,14 @@ ghc-pkg recache
 
 
 %changelog
+* 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
+
+* Tue Feb 21 2017 Toshiaki Ara <ara_t@384.jp> 0.3.3.1-1
+- update to 0.3.3.1
+- build using ghc-8.0.2
+
 * Fri Feb 03 2017 Toshiaki Ara <ara_t@384.jp> 0.2.4.1-1
 - update to 0.2.4.1
 - build using ghc-8.0.1