pandoc: rebuild with ghc-8.0.1

git-svn-id: http://trac.vinelinux.org/repos/projects/specs@10917 ec354946-7b23-47d6-9f5a-488ba84defc7

p/pandoc-citeproc/pandoc-citeproc-vl.spec

@@ -1,5 +1,5 @@
 %define pkg_name    pandoc-citeproc
-%define pkg_version 0.10
+%define pkg_version 0.10.4
 %define pkg_release 1%{?_dist_release}
 
 %define pandoc_version 1.17.1
@@ -14,19 +14,22 @@ Group:    Applications/Text
 URL:      http://hackage.haskell.org
 
 Source0: %{name}-%{version}.tar.gz
-Source1: cmdargs-0.10.14.tar.gz
-Source2: aeson-pretty-0.7.2.tar.gz
-Source3: conduit-extra-1.1.13.1.tar.gz
-Source4: hs-bibutils-5.5.tar.gz
-Source5: rfc5051-0.1.0.3.tar.gz
-Source6: setenv-0.1.1.3.tar.gz
-Source7: xml-types-0.3.6.tar.gz
-Source8: xml-conduit-1.3.4.2.tar.gz
-Source100: packages
+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.1.tar.gz
+Source12: cmdargs-0.10.14.tar.gz
+Source13: aeson-pretty-0.8.2.tar.gz
+Source14: conduit-extra-1.1.15.tar.gz
+Source15: hs-bibutils-5.5.tar.gz
+Source16: rfc5051-0.1.0.3.tar.gz
+Source17: setenv-0.1.1.3.tar.gz
+Source18: xml-types-0.3.6.tar.gz
+Source19: xml-conduit-1.3.5.tar.gz
 
 BuildRoot: %{_tmppath}/%{pkg_name}-%{version}-root
 
-BuildRequires: ghc haskell-platform-base cabal-install
+BuildRequires: ghc haskell-platform
 BuildRequires: libffi-devel gmp-devel zlib-devel
 
 BuildRequires: libghc-data-default-class
@@ -40,7 +43,6 @@ BuildRequires: pandoc = %{pandoc_version}
 BuildRequires: pandoc-libs = %{pandoc_version}
 
 BuildRequires: docbook-utils docbook-utils-pdf docbook-style-xsl
-BuildRequires: hscolour
 
 Requires: pandoc = %{pandoc_version}
 
@@ -59,6 +61,8 @@ More details on CSL can be found here: http://citationstyles.org/.
 
 %prep
 %{__rm} -rf ${RPM_BUILD_ROOT}
+%{__rm} -rf %{_builddir}/package.conf
+%{__rm} -rf ${HOME}/.ghc
 %setup -q
 
 %build
@@ -67,7 +71,7 @@ ghc-pkg init %{_builddir}/package.conf
 
 # install dependent packages
 cd %{_builddir}
-for pkg in `cat %{_sourcedir}/packages`; do
+for pkg in `cat %{SOURCE1}`; do
   %{__tar} xzf %{_sourcedir}/${pkg}.tar.gz
   cd ${pkg}
   cabal configure
@@ -111,6 +115,10 @@ cabal copy --destdir=${RPM_BUILD_ROOT}
 
 
 %changelog
+* Fri Feb 03 2017 Toshiaki Ara <ara_t@384.jp> 0.10.4-1
+- update to 0.10.4
+- build using ghc-8.0.1
+
 * Sat Jun 18 2016 Toshiaki Ara <ara_t@384.jp> 0.10-1
 - update to 0.10
 

p/pandoc-crossref/pandoc-crossref-vl.spec

@@ -1,6 +1,6 @@
 %define pkg_name    pandoc-crossref
-%define pkg_version 0.2.1.3
-%define pkg_release 2%{?_dist_release}
+%define pkg_version 0.2.4.2
+%define pkg_release 1%{?_dist_release}
 
 %define pandoc_version 1.17.1
 
@@ -14,17 +14,19 @@ Group:    Applications/Text
 URL:      http://hackage.haskell.org
 
 Source0: %{name}-%{version}.tar.gz
-Source1: base-unicode-symbols-0.2.2.4.tar.gz
-Source2: data-accessor-0.2.2.7.tar.gz
-Source3: data-accessor-transformers-0.2.1.7.tar.gz
-Source4: roman-numerals-0.5.1.5.tar.gz
-Source5: utility-ht-0.0.11.tar.gz
-Source6: data-accessor-template-0.2.1.12.tar.gz
-Source100: packages
+Source1: packages
+
+# num=11; for pkg in `cat packages`; do echo "Source${num}: ${pkg}.tar.gz"; num=`expr ${num} + 1`; done
+Source11: base-unicode-symbols-0.2.2.4.tar.gz
+Source12: data-accessor-0.2.2.7.tar.gz
+Source13: data-accessor-transformers-0.2.1.7.tar.gz
+Source14: roman-numerals-0.5.1.5.tar.gz
+Source15: utility-ht-0.0.12.tar.gz
+Source16: data-accessor-template-0.2.1.13.tar.gz
 
 BuildRoot: %{_tmppath}/%{pkg_name}-%{version}-root
 
-BuildRequires: ghc haskell-platform-base cabal-install
+BuildRequires: ghc haskell-platform
 BuildRequires: libffi-devel gmp-devel zlib-devel
 
 BuildRequires: libghc-data-default-class
@@ -37,7 +39,6 @@ BuildRequires: libghc-build-pandoc
 BuildRequires: pandoc-libs = %{pandoc_version}
 
 BuildRequires: docbook-utils docbook-utils-pdf docbook-style-xsl
-BuildRequires: hscolour
 
 Requires: pandoc = %{pandoc_version}
 
@@ -61,6 +62,8 @@ You need to specify -M chapters for non-latex/pdf output however.
 
 %prep
 %{__rm} -rf ${RPM_BUILD_ROOT}
+%{__rm} -rf %{_builddir}/package.conf
+%{__rm} -rf ${HOME}/.ghc
 %setup -q
 
 %build
@@ -111,6 +114,10 @@ cabal copy --destdir=${RPM_BUILD_ROOT}
 
 
 %changelog
+* Thu Feb 02 2017 Toshiaki Ara <ara_t@384.jp> 0.2.4.2-1
+- update to 0.2.4.2
+- rebuild using ghc-8.0.1
+
 * Sun Jun 19 2016 Toshiaki Ara <ara_t@384.jp> 0.2.1.3-2
 - rebuild under pandoc-1.17.1
 

p/pandoc/pandoc-vl.spec

@@ -1,8 +1,8 @@
 %define pkg_name    pandoc
 %define pkg_version 1.17.1
-%define pkg_release 1%{?_dist_release}
+%define pkg_release 2%{?_dist_release}
 
-%define ghc_version 7.10.3
+%define ghc_version 8.0.1
 
 Summary:     general markup converter
 Summary(ja): 汎用マークアップ変換ツール
@@ -16,22 +16,22 @@ Group:   Applications/Text
 URL:     http://hackage.haskell.org
 
 Source0: pandoc-%{pkg_version}/pandoc-%{pkg_version}.tar.gz
+Source1: pandoc.cabal
 
 BuildRoot: %{_tmppath}/%{pkg_name}-%{version}-root
 
-BuildRequires: ghc haskell-platform-base cabal-install
+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-aeson
-BuildRequires: libghc-http-client-tls
+# BuildRequires: libghc-http-client-tls
 BuildRequires: yaml
 BuildRequires: libghc-build-pandoc
 
 BuildRequires: docbook-utils docbook-utils-pdf docbook-style-xsl
-BuildRequires: hscolour
 
 Requires: libffi
 
@@ -100,6 +100,8 @@ Librariy of pandoc for building pandoc-citeproc and pandoc-crossref
 
 %prep
 %{__rm} -rf ${RPM_BUILD_ROOT}
+%{__rm} -rf %{_builddir}/package.conf
+%{__rm} -rf ${HOME}/.ghc
 %setup -q
 
 %build
@@ -107,8 +109,10 @@ Librariy of pandoc for building pandoc-citeproc and pandoc-crossref
 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}
 
+%{__cp} %{SOURCE1} .
 cabal configure \
     --prefix=%{_prefix} \
     --libdir=%{_libdir}/%{name}-%{version} \
@@ -155,6 +159,9 @@ ghc-pkg recache
 
 
 %changelog
+* Fri Feb 03 2017 Toshiaki Ara <ara_t@384.jp> 1.17.1-2
+- rebuild using ghc-8.0.1
+
 * Sat Jun 18 2016 Toshiaki Ara <ara_t@384.jp> 1.17.1-1
 - update to 1.17.1