pandoc: new upstream release (build with ghc-8.4.2)

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

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

@@ -1,8 +1,8 @@
 %define pkg_name    pandoc-citeproc
-%define pkg_version 0.12.2.5
+%define pkg_version 0.14.3.1
 %define pkg_release 1%{?_dist_release}
 
-%define pandoc_version 2.0.6
+%define pandoc_version 2.2.1
 
 Summary:  Library and executable for using citeproc with pandoc
 Name:    %{pkg_name}
@@ -13,31 +13,36 @@ License:  BSD3
 Group:    Applications/Text
 URL:      http://hackage.haskell.org
 
-Source0: %{name}-%{version}.tar.gz
+Source0: packages
-Source1: packages
+
-
+Source11: base-orphans-0.7.tar.gz
-# num=11; for pkg in `cat packages`; do echo "Source${num}: ${pkg}.tar.gz"; num=`expr ${num} + 1`; done
+Source12: base-orphans.cabal
-Source11: hs-bibutils-6.2.0.1.tar.gz
+Source13: hs-bibutils-6.2.0.1.tar.gz
-Source12: rfc5051-0.1.0.3.tar.gz
+Source14: hs-bibutils.cabal
-Source13: setenv-0.1.1.3.tar.gz
+Source15: rfc5051-0.1.0.3.tar.gz
-Source14: typed-process-0.2.1.0.tar.gz
+Source16: rfc5051.cabal
-Source15: xml-types-0.3.6.tar.gz
+Source17: setenv-0.1.1.3.tar.gz
-Source16: conduit-extra-1.2.3.2.tar.gz
+Source18: setenv.cabal
-Source17: xml-conduit-1.4.0.4.tar.gz
+Source19: typed-process-0.2.2.0.tar.gz
+Source20: typed-process.cabal
+Source21: xml-types-0.3.6.tar.gz
+Source22: xml-types.cabal
+Source23: transformers-base-0.4.5.2.tar.gz
+Source24: transformers-base.cabal
+Source25: conduit-extra-1.3.0.tar.gz
+Source26: conduit-extra.cabal
+Source27: monad-control-1.0.2.3.tar.gz
+Source28: monad-control.cabal
+Source29: xml-conduit-1.8.0.tar.gz
+Source30: xml-conduit.cabal
+Source31: pandoc-citeproc-0.14.3.1.tar.gz
+Source32: pandoc-citeproc.cabal
 
 BuildRoot: %{_tmppath}/%{pkg_name}-%{version}-root
 
 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: yaml
 BuildRequires: libghc-build-pandoc
-BuildRequires: pandoc = %{pandoc_version}
 BuildRequires: pandoc-libs = %{pandoc_version}
 
 BuildRequires: docbook-utils docbook-utils-pdf docbook-style-xsl
@@ -59,45 +64,41 @@ 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
-# Initialise the package db
+%ghc_pkg_init
-ghc-pkg init %{_builddir}/package.conf
 
-# install dependent packages
 cd %{_builddir}
-for pkg in `cat %{SOURCE1}`; do
+for pkg in `sed '$d' %{SOURCE0}`; do
-  %{__tar} xzf %{_sourcedir}/${pkg}.tar.gz
+    %{__tar} xzf %{_sourcedir}/${pkg}.tar.gz
-  cd ${pkg}
+    pushd ${pkg}
-  cabal configure
+        %ghc_fix_dependencies ${pkg}
-  cabal build
+        %{__cabal} configure
-  cabal copy
+        %{__cabal} build
-  cabal register --inplace
+        %{__cabal} copy
-  cd ..
+        %{__cabal} register --inplace
+    popd
 done
 
-# build pandoc-citeproc
+for pkg in `tail -n 1 %{SOURCE0}`; do
-cd %{name}-%{version}
+    %{__tar} xzf %{_sourcedir}/${pkg}.tar.gz
-cabal configure \
+    pushd ${pkg}
-      --prefix=%{_prefix} \
+        %ghc_fix_dependencies ${pkg}
-      --libdir=%{_libdir}/%{name}-%{version} \
+        %cabal_configure1 ${pkg}
-      --libsubdir= \
+        %cabal_build
-      --datadir=%{_datadir}/%{name}-%{version} \
+        %cabal_haddock
-      --datasubdir= \
+        %cabal_copy_resister ${pkg}
-      --docdir=%{_docdir}/%{name}-%{version}
+    popd
+done
 
-cabal build
-cabal haddock || :
-cabal copy --destdir=${RPM_BUILD_ROOT}
 
 %install
 %{__rm} -rf ${RPM_BUILD_ROOT}%{_libdir}
-%{__mv} ${RPM_BUILD_ROOT}%{_datadir}/%{name}-%{version}/{changelog,README.md} \
+%{__mv} \
+ ${RPM_BUILD_ROOT}%{_datadir}/%{name}-%{version}/{changelog,README.md} \
  ${RPM_BUILD_ROOT}%{_docdir}/%{name}-%{version}/
-%{__mv} ${RPM_BUILD_ROOT}%{_datadir}/%{name}-%{version}/man \
+%{__mv} \
+ ${RPM_BUILD_ROOT}%{_datadir}/%{name}-%{version}/man \
  ${RPM_BUILD_ROOT}%{_datadir}/
 
 %clean
@@ -113,6 +114,11 @@ cabal copy --destdir=${RPM_BUILD_ROOT}
 
 
 %changelog
+* Fri May 18 2018 Toshiaki Ara <ara_t@384.jp> 0.14.3.1-1
+- update to 0.14.3.1
+- rebuild using ghc-8.4.2 and pandoc-2.2.1
+- rewrite using macro
+
 * Tue Jan 09 2018 Toshiaki Ara <ara_t@384.jp> 0.12.2.5-1
 - update to 0.12.2.5
 - build using ghc-8.2.2

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

@@ -1,8 +1,8 @@
 %define pkg_name    pandoc-crossref
-%define pkg_version 0.3.0.0
+%define pkg_version 0.3.2.0
 %define pkg_release 1%{?_dist_release}
 
-%define pandoc_version 2.0.6
+%define pandoc_version 2.2.1
 
 Summary:  Library and executable for using citeproc with pandoc
 Name:    %{pkg_name}
@@ -13,39 +13,35 @@ License:  BSD3
 Group:    Applications/Text
 URL:      http://hackage.haskell.org
 
-Source0: %{name}-%{version}.tar.gz
+Source0: packages
-Source1: packages
+
-
+Source11: ansi-wl-pprint-0.6.8.2.tar.gz
-# num=11; for pkg in `cat packages`; do echo "Source${num}: ${pkg}.tar.gz"; num=`expr ${num} + 1`; done
+Source12: ansi-wl-pprint.cabal
-Source11: base-unicode-symbols-0.2.2.4.tar.gz
+Source13: base-unicode-symbols-0.2.2.4.tar.gz
-Source12: colour-2.3.4.tar.gz
+Source14: base-unicode-symbols.cabal
-Source13: data-accessor-0.2.2.7.tar.gz
+Source15: data-accessor-0.2.2.7.tar.gz
-Source14: open-browser-0.2.1.0.tar.gz
+Source16: data-accessor.cabal
-Source15: utility-ht-0.0.14.tar.gz
+Source17: open-browser-0.2.1.0.tar.gz
-Source16: roman-numerals-0.5.1.5.tar.gz
+Source18: open-browser.cabal
-Source17: ansi-terminal-0.7.1.1.tar.gz
+Source19: temporary-1.2.1.1.tar.gz
-Source18: data-accessor-transformers-0.2.1.7.tar.gz
+Source20: temporary.cabal
-Source19: data-accessor-template-0.2.1.14.tar.gz
+Source21: utility-ht-0.0.14.tar.gz
-Source20: ansi-wl-pprint-0.6.8.1.tar.gz
+Source22: utility-ht.cabal
-Source21: optparse-applicative-0.14.0.0.tar.gz
+Source23: optparse-applicative-0.14.2.0.tar.gz
-
+Source24: optparse-applicative.cabal
-# to fix wrong dependencies in cabal files
+Source25: roman-numerals-0.5.1.5.tar.gz
-# do not use '-'
+Source26: roman-numerals.cabal
-%define ansi_wl_pprint_version 0.6.8.1
+Source27: data-accessor-transformers-0.2.1.7.tar.gz
-Source101: ansi-wl-pprint.cabal
+Source28: data-accessor-transformers.cabal
+Source29: data-accessor-template-0.2.1.15.tar.gz
+Source30: data-accessor-template.cabal
+Source31: pandoc-crossref-0.3.2.0.tar.gz
+Source32: pandoc-crossref.cabal
 
 BuildRoot: %{_tmppath}/%{pkg_name}-%{version}-root
 
-BuildRequires: ghc haskell-platform
 BuildRequires: libffi-devel gmp-devel zlib-devel
-
+BuildRequires: ghc haskell-platform
-BuildRequires: libghc-data-default-class
-BuildRequires: libghc-dlist
-BuildRequires: libghc-data-default
-BuildRequires: libghc-aeson
-BuildRequires: libghc-http-client-tls
-BuildRequires: yaml
-BuildRequires: libghc-build-pandoc
 BuildRequires: pandoc-libs = %{pandoc_version}
 
 BuildRequires: docbook-utils docbook-utils-pdf docbook-style-xsl
@@ -72,46 +68,33 @@ 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
-# Initialise the package db
+%ghc_pkg_init
-ghc-pkg init %{_builddir}/package.conf
 
-# install dependent packages
 cd %{_builddir}
-for pkg in `cat %{_sourcedir}/packages`; do
+for pkg in `sed '$d' %{SOURCE0}`; do
-  %{__tar} xzf %{_sourcedir}/${pkg}.tar.gz
+    %{__tar} xzf %{_sourcedir}/${pkg}.tar.gz
-  cd ${pkg}
+    pushd ${pkg}
-    # fix wrong dependencies
+        %ghc_fix_dependencies ${pkg}
-    case ${pkg} in
+        %{__cabal} configure
-        "ansi-wl-pprint-%{ansi_wl_pprint_version}") \
+        %{__cabal} build
-            %{__cp} %{SOURCE101} . ;;
+        %{__cabal} copy
-        *) ;;
+        %{__cabal} register --inplace
-    esac
+    popd
-
-  cabal configure
-  cabal build
-  cabal copy
-  cabal register --inplace
-  cd ..
 done
 
-# build pandoc-crossref
+for pkg in `tail -n 1 %{SOURCE0}`; do
-cd %{name}-%{version}
+    %{__tar} xzf %{_sourcedir}/${pkg}.tar.gz
-cabal configure \
+    pushd ${pkg}
-      --prefix=%{_prefix} \
+        %ghc_fix_dependencies ${pkg}
-      --libdir=%{_libdir}/%{name}-%{version} \
+        %cabal_configure1 ${pkg}
-      --libsubdir= \
+        %cabal_build
-      --datadir=%{_datadir}/%{name}-%{version} \
+        %cabal_haddock
-      --datasubdir= \
+        %cabal_copy_resister ${pkg}
-      --docdir=%{_docdir}/%{name}-%{version}
+    popd
+done
 
-cabal build
-cabal haddock || :
-cabal copy --destdir=${RPM_BUILD_ROOT}
 
 %install
 %{__rm} -rf ${RPM_BUILD_ROOT}%{_libdir}
@@ -128,6 +111,11 @@ cabal copy --destdir=${RPM_BUILD_ROOT}
 
 
 %changelog
+* Fri May 18 2018 Toshiaki Ara <ara_t@384.jp> 0.3.2.0-1
+- update to 0.3.2.0
+- rebuild using ghc-8.4.2 and pandoc-2.2.1
+- rewrite using macro
+
 * Tue Jan 09 2018 Toshiaki Ara <ara_t@384.jp> 0.3.0.0-1
 - update to 0.3.0.0
 - build using ghc-8.2.2

p/pandoc/pandoc-vl.spec

@@ -1,9 +1,7 @@
 %define pkg_name    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:     general markup converter
 Summary(ja): 汎用マークアップ変換ツール
 
@@ -15,8 +13,10 @@ License: GPLv2+
 Group:   Applications/Text
 URL:     http://hackage.haskell.org
 
-Source0: pandoc-%{pkg_version}/pandoc-%{pkg_version}.tar.gz
+Source0: packages
-# Source1: pandoc.cabal
+
+Source11: pandoc-2.2.1.tar.gz
+Source12: pandoc.cabal
 
 BuildRoot: %{_tmppath}/%{pkg_name}-%{version}-root
 
@@ -25,10 +25,12 @@ 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-http-client-tls
+BuildRequires: libghc-haddock-library
 BuildRequires: libghc-build-pandoc
 
 BuildRequires: docbook-utils docbook-utils-pdf docbook-style-xsl
@@ -94,57 +96,61 @@ markdownからHTMLに変換する既存のツールは正規表現で置換し
 Summary:  Library of pandoc
 Group:    Development/Libraries
 
+Requires: haskell-platform-dep
+Requires: libghc-data-default-class
+Requires: libghc-dlist
+Requires: libghc-old-locale
+Requires: libghc-aeson
+Requires: libghc-semigroups
+Requires: yaml
+Requires: libghc-http-client-tls
+Requires: libghc-haddock-library
+Requires: libghc-build-pandoc
+
 %description libs
 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
-# Initialise the package db
+%ghc_pkg_init
-ghc-pkg init %{_builddir}/package.conf
+
-
+cd %{_builddir}
-PKG_CONF_DIR=${RPM_BUILD_ROOT}%{_libdir}/ghc-%{ghc_version}/package.conf.d
+for pkg in `cat %{SOURCE0}`; do
-%{__rm} -rf ${PKG_CONF_DIR}
+    %{__tar} xzf %{_sourcedir}/${pkg}.tar.gz
-%{__mkdir_p} ${PKG_CONF_DIR}
+    pushd ${pkg}
-
+        %ghc_fix_dependencies ${pkg}
-# %{__cp} %{SOURCE1} .
+        %cabal_configure1 ${pkg}
-cabal configure \
+        %cabal_build
-    --prefix=%{_prefix} \
+        %cabal_haddock
-    --libdir=%{_libdir}/%{name}-%{version} \
+        %cabal_copy_resister ${pkg}
-    --libsubdir= \
+    popd
-    --datadir=%{_datadir}/%{name}-%{version} \
+done
-    --datasubdir= \
+
-    --docdir=%{_docdir}/%{name}-%{version}
-
-cabal build
-cabal haddock
-cabal copy --destdir=${RPM_BUILD_ROOT}
-cabal register --gen-pkg-config=${PKG_CONF_DIR}/%{name}.conf
 
 %install
-%{__mkdir_p} ${RPM_BUILD_ROOT}%{_docdir}/%{name}-%{version}
+%{__mkdir_p} ${RPM_BUILD_ROOT}%{_mandir}/man1
-%{__cp} \
+
- BUGS changelog CONTRIBUTING.md COPYING.md COPYRIGHT \
+# copy documents and mannual
- MANUAL.txt README.md \
+pushd %{_builddir}/%{name}-%{version}
- ${RPM_BUILD_ROOT}%{_docdir}/%{name}-%{version}
+    %{__cp} \
-%{__rm} ${RPM_BUILD_ROOT}%{_datadir}/%{name}-%{version}/{COPYRIGHT,MANUAL.txt}
+     BUGS changelog CONTRIBUTING.md COPYING.md COPYRIGHT \
+     MANUAL.txt README.md \
+     ${RPM_BUILD_ROOT}%{_docdir}/%{name}-%{version}
+    %{__cp} man/pandoc.1 ${RPM_BUILD_ROOT}%{_mandir}/man1/
+popd
 
-%{__mv} ${RPM_BUILD_ROOT}%{_datadir}/%{name}-%{version}/man \
- ${RPM_BUILD_ROOT}%{_datadir}
 
 %clean
 %{__rm} -rf ${RPM_BUILD_ROOT}
 
 %post libs
-ghc-pkg recache
+%ghc_pkg_recache
 
 %postun libs
-ghc-pkg recache
+%ghc_pkg_recache
 
 
 %files
@@ -152,15 +158,20 @@ ghc-pkg recache
 %{_bindir}/pandoc
 %{_datadir}/%{name}-%{version}/
 %{_docdir}/%{name}-%{version}/
-%{_mandir}/man1/pandoc.1.gz
+%{_mandir}/man1/
 
 %files libs
 %defattr(-, root, root)
-%{_libdir}/%{name}-%{version}/
 %{_libdir}/ghc-%{ghc_version}/
+%{_libdir}/ghc-lib/%{name}-%{version}/
 
 
 %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