new upstream release

git-svn-id: http://trac.vinelinux.org/repos/projects/specs@11383 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.11.1.2
+%define pkg_version 0.12.2.5
 %define pkg_release 1%{?_dist_release}
 
-%define pandoc_version 1.19.2.4
+%define pandoc_version 2.0.6
 
 Summary:  Library and executable for using citeproc with pandoc
 Name:    %{pkg_name}
@@ -17,15 +17,13 @@ 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: base-compat-0.9.3.tar.gz
-Source12: cmdargs-0.10.18.tar.gz
-Source13: aeson-pretty-0.8.5.tar.gz
-Source14: conduit-extra-1.2.0.tar.gz
-Source15: hs-bibutils-6.2.0.1.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.6.0.tar.gz
+Source11: hs-bibutils-6.2.0.1.tar.gz
+Source12: rfc5051-0.1.0.3.tar.gz
+Source13: setenv-0.1.1.3.tar.gz
+Source14: typed-process-0.2.1.0.tar.gz
+Source15: xml-types-0.3.6.tar.gz
+Source16: conduit-extra-1.2.3.2.tar.gz
+Source17: xml-conduit-1.4.0.4.tar.gz
 
 BuildRoot: %{_tmppath}/%{pkg_name}-%{version}-root
 
@@ -115,8 +113,13 @@ cabal copy --destdir=${RPM_BUILD_ROOT}
 
 
 %changelog
-* Sun Oct 29 2017 Toshiaki Ara <ara_t@384.jp> 0.11.1.2-1
-- update to 0.11.1.2
+* 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
+
+* Tue Feb 21 2017 Toshiaki Ara <ara_t@384.jp> 0.10.4.1-1
+- update to 0.10.4.1
+- build using ghc-8.0.2
 
 * Fri Feb 03 2017 Toshiaki Ara <ara_t@384.jp> 0.10.4-1
 - update to 0.10.4

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

@@ -1,8 +1,8 @@
 %define pkg_name    pandoc-crossref
-%define pkg_version 0.2.6.0
+%define pkg_version 0.3.0.0
 %define pkg_release 1%{?_dist_release}
 
-%define pandoc_version 1.19.2.4
+%define pandoc_version 2.0.6
 
 Summary:  Library and executable for using citeproc with pandoc
 Name:    %{pkg_name}
@@ -18,11 +18,21 @@ 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
+Source12: colour-2.3.4.tar.gz
+Source13: data-accessor-0.2.2.7.tar.gz
+Source14: open-browser-0.2.1.0.tar.gz
 Source15: utility-ht-0.0.14.tar.gz
-Source16: data-accessor-template-0.2.1.14.tar.gz
+Source16: roman-numerals-0.5.1.5.tar.gz
+Source17: ansi-terminal-0.7.1.1.tar.gz
+Source18: data-accessor-transformers-0.2.1.7.tar.gz
+Source19: data-accessor-template-0.2.1.14.tar.gz
+Source20: ansi-wl-pprint-0.6.8.1.tar.gz
+Source21: optparse-applicative-0.14.0.0.tar.gz
+
+# to fix wrong dependencies in cabal files
+# do not use '-'
+%define ansi_wl_pprint_version 0.6.8.1
+Source101: ansi-wl-pprint.cabal
 
 BuildRoot: %{_tmppath}/%{pkg_name}-%{version}-root
 
@@ -75,6 +85,13 @@ cd %{_builddir}
 for pkg in `cat %{_sourcedir}/packages`; do
   %{__tar} xzf %{_sourcedir}/${pkg}.tar.gz
   cd ${pkg}
+    # fix wrong dependencies
+    case ${pkg} in
+        "ansi-wl-pprint-%{ansi_wl_pprint_version}") \
+            %{__cp} %{SOURCE101} . ;;
+        *) ;;
+    esac
+
   cabal configure
   cabal build
   cabal copy
@@ -98,10 +115,6 @@ cabal copy --destdir=${RPM_BUILD_ROOT}
 
 %install
 %{__rm} -rf ${RPM_BUILD_ROOT}%{_libdir}
-%{__mv} ${RPM_BUILD_ROOT}%{_datadir}/%{name}-%{version}/*.md \
- ${RPM_BUILD_ROOT}%{_docdir}/%{name}-%{version}/
-%{__mv} ${RPM_BUILD_ROOT}%{_docdir}/%{name}-%{version}/html/*.md \
- ${RPM_BUILD_ROOT}%{_docdir}/%{name}-%{version}/
 
 %clean
 %{__rm} -rf ${RPM_BUILD_ROOT}
@@ -110,12 +123,17 @@ cabal copy --destdir=${RPM_BUILD_ROOT}
 %files
 %defattr(-, root, root)
 %{_bindir}/pandoc-crossref
+%{_datadir}/%{name}-%{version}/
 %{_docdir}/%{name}-%{version}/
 
 
 %changelog
-* Sun Oct 29 2017 Toshiaki Ara <ara_t@384.jp> 0.2.6.0-1
-- update to 0.2.6.0
+* 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
+
+* Tue Feb 21 2017 Toshiaki Ara <ara_t@384.jp> 0.2.4.2-2
+- rebuild using ghc-8.0.2
 
 * Thu Feb 02 2017 Toshiaki Ara <ara_t@384.jp> 0.2.4.2-1
 - update to 0.2.4.2

p/pandoc/pandoc-vl.spec

@@ -1,8 +1,8 @@
 %define pkg_name    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
+%define ghc_version 8.2.2
 
 Summary:     general markup converter
 Summary(ja): 汎用マークアップ変換ツール
@@ -16,7 +16,7 @@ Group:   Applications/Text
 URL:     http://hackage.haskell.org
 
 Source0: pandoc-%{pkg_version}/pandoc-%{pkg_version}.tar.gz
-Source1: pandoc.cabal
+# Source1: pandoc.cabal
 
 BuildRoot: %{_tmppath}/%{pkg_name}-%{version}-root
 
@@ -112,7 +112,7 @@ 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} .
+# %{__cp} %{SOURCE1} .
 cabal configure \
     --prefix=%{_prefix} \
     --libdir=%{_libdir}/%{name}-%{version} \
@@ -128,9 +128,11 @@ cabal register --gen-pkg-config=${PKG_CONF_DIR}/%{name}.conf
 
 %install
 %{__mkdir_p} ${RPM_BUILD_ROOT}%{_docdir}/%{name}-%{version}
-%{__cp} BUGS changelog CONTRIBUTING.md COPYING.md COPYRIGHT README.md \
+%{__cp} \
+ BUGS changelog CONTRIBUTING.md COPYING.md COPYRIGHT \
+ MANUAL.txt README.md \
  ${RPM_BUILD_ROOT}%{_docdir}/%{name}-%{version}
-%{__rm} ${RPM_BUILD_ROOT}%{_datadir}/%{name}-%{version}/COPYRIGHT
+%{__rm} ${RPM_BUILD_ROOT}%{_datadir}/%{name}-%{version}/{COPYRIGHT,MANUAL.txt}
 
 %{__mv} ${RPM_BUILD_ROOT}%{_datadir}/%{name}-%{version}/man \
  ${RPM_BUILD_ROOT}%{_datadir}
@@ -159,8 +161,13 @@ ghc-pkg recache
 
 
 %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-2
+- 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-2
 - rebuild using ghc-8.0.1