From 94e2078ec1bbe3fc3d3213b96fe3363878df9576 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Mon, 31 Jan 2011 00:03:39 +0000 Subject: [PATCH 001/165] Initial setup of the repo --- .gitignore | 0 sources | 0 2 files changed, 0 insertions(+), 0 deletions(-) create mode 100644 .gitignore create mode 100644 sources diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..e69de29 diff --git a/sources b/sources new file mode 100644 index 0000000..e69de29 From 6bafb1d0bb0191e732f007ded035b92c2d6474f5 Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Mon, 31 Jan 2011 15:24:15 +1000 Subject: [PATCH 002/165] initial import (#652582) --- .gitignore | 1 + pandoc.spec | 74 +++++++++++++++++++++++++++++++++++++++++++++++++++++ sources | 1 + 3 files changed, 76 insertions(+) create mode 100644 pandoc.spec diff --git a/.gitignore b/.gitignore index e69de29..3b152c4 100644 --- a/.gitignore +++ b/.gitignore @@ -0,0 +1 @@ +/pandoc-1.6.0.1.tar.gz diff --git a/pandoc.spec b/pandoc.spec new file mode 100644 index 0000000..b66e564 --- /dev/null +++ b/pandoc.spec @@ -0,0 +1,74 @@ +%global pkg_name pandoc + +%global common_summary Haskell %{pkg_name} library + +%global common_description Pandoc is a Haskell library for converting from one markup format to another,\ +and a command-line tool that uses this library. It can read markdown and\ +(subsets of) reStructuredText, HTML, and LaTeX, and it can write markdown,\ +reStructuredText, HTML, LaTeX, ConTeXt, Docbook, OpenDocument, ODT, RTF,\ +MediaWiki, groff man pages, EPUB, and S5 and Slidy HTML slide shows. + +%global ghc_pkg_deps ghc-HTTP-devel, ghc-mtl-devel, ghc-network-devel, ghc-parsec-devel, ghc-texmath-devel, ghc-utf8-string-devel, ghc-xhtml-devel, ghc-xml-devel, ghc-zip-archive-devel + +# debuginfo is not useful for ghc +%global debug_package %{nil} + +Name: %{pkg_name} +Version: 1.6.0.1 +Release: 1%{?dist} +Summary: Markup converter for markdown + +Group: Applications/Publishing +License: GPLv2+ +URL: http://hackage.haskell.org/package/%{name} +Source0: http://hackage.haskell.org/packages/archive/%{name}/%{version}/%{name}-%{version}.tar.gz +# fedora ghc archs: +ExclusiveArch: %{ix86} x86_64 ppc alpha +BuildRequires: ghc, ghc-doc, ghc-prof +BuildRequires: ghc-rpm-macros >= 0.7.3 +BuildRequires: hscolour +%{?ghc_pkg_deps:BuildRequires: %{ghc_pkg_deps}, %(echo %{ghc_pkg_deps} | sed -e "s/\(ghc-[^, ]\+\)-devel/\1-doc,\1-prof/g")} + +%description +%{common_description} + + +%prep +%setup -q + + +%build +%ghc_lib_build + + +%install +%ghc_lib_install + +rm $RPM_BUILD_ROOT%{_datadir}/%{name}-%{version}/{BUGS,COPYRIGHT,INSTALL,README,changelog} + + +%{?ghc_binlib_package} + + +%files +%defattr(-,root,root,-) +%doc BUGS COPYING COPYRIGHT README +%attr(755,root,root) %{_bindir}/%{name} +%attr(755,root,root) %{_bindir}/markdown2pdf +%{_datadir}/%{name}-%{version} +%{_mandir}/man1/* + + +%changelog +* Fri Jan 14 2011 Jens Petersen - 1.6.0.1-1 +- 1.6.0.1 +- add description +- update to cabal2spec-0.22.4 + +* Fri Nov 12 2010 Jens Petersen - 1.6-1 +- GPLv2+ +- take care of docdir files +- add dependencies + +* Thu Nov 11 2010 Fedora Haskell SIG - 1.6-0 +- initial packaging for Fedora automatically generated by cabal2spec-0.22.2 diff --git a/sources b/sources index e69de29..9251a7a 100644 --- a/sources +++ b/sources @@ -0,0 +1 @@ +d19a630462595941b3100dff6f839aa3 pandoc-1.6.0.1.tar.gz From 72a3d371e637afabff8a90f16cfe83017b67b37e Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Mon, 31 Jan 2011 15:31:14 +1000 Subject: [PATCH 003/165] fix manpages perms and improve summary --- pandoc.spec | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/pandoc.spec b/pandoc.spec index b66e564..e19f77b 100644 --- a/pandoc.spec +++ b/pandoc.spec @@ -15,8 +15,8 @@ MediaWiki, groff man pages, EPUB, and S5 and Slidy HTML slide shows. Name: %{pkg_name} Version: 1.6.0.1 -Release: 1%{?dist} -Summary: Markup converter for markdown +Release: 2%{?dist} +Summary: Markup conversion tool for markdown Group: Applications/Publishing License: GPLv2+ @@ -56,10 +56,14 @@ rm $RPM_BUILD_ROOT%{_datadir}/%{name}-%{version}/{BUGS,COPYRIGHT,INSTALL,README, %attr(755,root,root) %{_bindir}/%{name} %attr(755,root,root) %{_bindir}/markdown2pdf %{_datadir}/%{name}-%{version} -%{_mandir}/man1/* +%attr(644,root,root) %{_mandir}/man1/* %changelog +* Mon Jan 31 2011 Jens Petersen - 1.6.0.1-2 +- fix manpage perms (narasim) +- improve the summary (#652582) + * Fri Jan 14 2011 Jens Petersen - 1.6.0.1-1 - 1.6.0.1 - add description From 6744d71d0470dc487d79e89d9a2ed126804913ea Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Tue, 8 Feb 2011 08:12:41 -0600 Subject: [PATCH 004/165] - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild --- pandoc.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pandoc.spec b/pandoc.spec index e19f77b..d99c7b8 100644 --- a/pandoc.spec +++ b/pandoc.spec @@ -15,7 +15,7 @@ MediaWiki, groff man pages, EPUB, and S5 and Slidy HTML slide shows. Name: %{pkg_name} Version: 1.6.0.1 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Markup conversion tool for markdown Group: Applications/Publishing @@ -60,6 +60,9 @@ rm $RPM_BUILD_ROOT%{_datadir}/%{name}-%{version}/{BUGS,COPYRIGHT,INSTALL,README, %changelog +* Tue Feb 08 2011 Fedora Release Engineering - 1.6.0.1-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild + * Mon Jan 31 2011 Jens Petersen - 1.6.0.1-2 - fix manpage perms (narasim) - improve the summary (#652582) From ebd14bfdd334ea8dbd936a149d9882a47e726742 Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Tue, 15 Feb 2011 22:20:46 +1000 Subject: [PATCH 005/165] rebuild --- pandoc.spec | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pandoc.spec b/pandoc.spec index d99c7b8..096caaf 100644 --- a/pandoc.spec +++ b/pandoc.spec @@ -10,12 +10,9 @@ MediaWiki, groff man pages, EPUB, and S5 and Slidy HTML slide shows. %global ghc_pkg_deps ghc-HTTP-devel, ghc-mtl-devel, ghc-network-devel, ghc-parsec-devel, ghc-texmath-devel, ghc-utf8-string-devel, ghc-xhtml-devel, ghc-xml-devel, ghc-zip-archive-devel -# debuginfo is not useful for ghc -%global debug_package %{nil} - Name: %{pkg_name} Version: 1.6.0.1 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Markup conversion tool for markdown Group: Applications/Publishing @@ -47,7 +44,7 @@ BuildRequires: hscolour rm $RPM_BUILD_ROOT%{_datadir}/%{name}-%{version}/{BUGS,COPYRIGHT,INSTALL,README,changelog} -%{?ghc_binlib_package} +%ghc_binlib_package %files @@ -60,6 +57,9 @@ rm $RPM_BUILD_ROOT%{_datadir}/%{name}-%{version}/{BUGS,COPYRIGHT,INSTALL,README, %changelog +* Tue Feb 15 2011 Jens Petersen - 1.6.0.1-4 +- rebuild for latest zip-archive and haskell-platform-2011.1 updates + * Tue Feb 08 2011 Fedora Release Engineering - 1.6.0.1-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild From a1de0d112e0291e55c1ff8d47256c5e5419c31f5 Mon Sep 17 00:00:00 2001 From: "Fabio M. Di Nitto" Date: Thu, 10 Mar 2011 09:15:38 +0100 Subject: [PATCH 006/165] Enable build on sparcv9 Signed-off-by: Fabio M. Di Nitto --- pandoc.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/pandoc.spec b/pandoc.spec index 096caaf..43be5f2 100644 --- a/pandoc.spec +++ b/pandoc.spec @@ -12,7 +12,7 @@ MediaWiki, groff man pages, EPUB, and S5 and Slidy HTML slide shows. Name: %{pkg_name} Version: 1.6.0.1 -Release: 4%{?dist} +Release: 5%{?dist} Summary: Markup conversion tool for markdown Group: Applications/Publishing @@ -20,7 +20,7 @@ License: GPLv2+ URL: http://hackage.haskell.org/package/%{name} Source0: http://hackage.haskell.org/packages/archive/%{name}/%{version}/%{name}-%{version}.tar.gz # fedora ghc archs: -ExclusiveArch: %{ix86} x86_64 ppc alpha +ExclusiveArch: %{ix86} x86_64 ppc alpha sparcv9 BuildRequires: ghc, ghc-doc, ghc-prof BuildRequires: ghc-rpm-macros >= 0.7.3 BuildRequires: hscolour @@ -57,6 +57,9 @@ rm $RPM_BUILD_ROOT%{_datadir}/%{name}-%{version}/{BUGS,COPYRIGHT,INSTALL,README, %changelog +* Thu Mar 10 2011 Fabio M. Di Nitto - 1.6.0.1-5 +- Enable build on sparcv9 + * Tue Feb 15 2011 Jens Petersen - 1.6.0.1-4 - rebuild for latest zip-archive and haskell-platform-2011.1 updates From a0c4f7e2d2c37c6a9adae199aceeb88a708b2469 Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Sat, 12 Mar 2011 21:45:24 +0900 Subject: [PATCH 007/165] add .chain-deps file for haskell-sig.git rebuild.sh --- .chain-deps | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 .chain-deps diff --git a/.chain-deps b/.chain-deps new file mode 100644 index 0000000..a1be845 --- /dev/null +++ b/.chain-deps @@ -0,0 +1,3 @@ +# rebuild.sh config file: see + +CHAIN_PKGS="ghc-digest ghc-xml : ghc-texmath ghc-zip-archive" From a5779edaacc1dd10ade79b42c6e7588c2e98a999 Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Sat, 28 May 2011 15:56:09 +0900 Subject: [PATCH 008/165] update to 1.8.1.1 and cabal2spec-0.23; new dependencies --- .chain-deps | 2 +- .gitignore | 1 + pandoc.spec | 21 ++++++++++++--------- sources | 2 +- 4 files changed, 15 insertions(+), 11 deletions(-) diff --git a/.chain-deps b/.chain-deps index a1be845..0711e81 100644 --- a/.chain-deps +++ b/.chain-deps @@ -1,3 +1,3 @@ # rebuild.sh config file: see -CHAIN_PKGS="ghc-digest ghc-xml : ghc-texmath ghc-zip-archive" +CHAIN_PKGS="ghc-digest ghc-xml : ghc-texmath ghc-zip-archive :" diff --git a/.gitignore b/.gitignore index 3b152c4..71e63f9 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ /pandoc-1.6.0.1.tar.gz +/pandoc-1.8.1.1.tar.gz diff --git a/pandoc.spec b/pandoc.spec index 43be5f2..26ac6f6 100644 --- a/pandoc.spec +++ b/pandoc.spec @@ -8,11 +8,9 @@ and a command-line tool that uses this library. It can read markdown and\ reStructuredText, HTML, LaTeX, ConTeXt, Docbook, OpenDocument, ODT, RTF,\ MediaWiki, groff man pages, EPUB, and S5 and Slidy HTML slide shows. -%global ghc_pkg_deps ghc-HTTP-devel, ghc-mtl-devel, ghc-network-devel, ghc-parsec-devel, ghc-texmath-devel, ghc-utf8-string-devel, ghc-xhtml-devel, ghc-xml-devel, ghc-zip-archive-devel - Name: %{pkg_name} -Version: 1.6.0.1 -Release: 5%{?dist} +Version: 1.8.1.1 +Release: 1%{?dist} Summary: Markup conversion tool for markdown Group: Applications/Publishing @@ -20,11 +18,11 @@ License: GPLv2+ URL: http://hackage.haskell.org/package/%{name} Source0: http://hackage.haskell.org/packages/archive/%{name}/%{version}/%{name}-%{version}.tar.gz # fedora ghc archs: -ExclusiveArch: %{ix86} x86_64 ppc alpha sparcv9 -BuildRequires: ghc, ghc-doc, ghc-prof -BuildRequires: ghc-rpm-macros >= 0.7.3 +ExclusiveArch: %{ix86} x86_64 ppc alpha sparcv9 ppc64 +BuildRequires: ghc-prof +BuildRequires: ghc-rpm-macros BuildRequires: hscolour -%{?ghc_pkg_deps:BuildRequires: %{ghc_pkg_deps}, %(echo %{ghc_pkg_deps} | sed -e "s/\(ghc-[^, ]\+\)-devel/\1-doc,\1-prof/g")} +BuildRequires: ghc-citeproc-hs-prof, ghc-dlist-prof, ghc-HTTP-prof, ghc-json-prof, ghc-mtl-prof, ghc-network-prof, ghc-pandoc-types-prof, ghc-parsec-prof, ghc-tagsoup-prof, ghc-texmath-prof, ghc-utf8-string-prof, ghc-xhtml-prof, ghc-xml-prof, ghc-zip-archive-prof, %description %{common_description} @@ -41,7 +39,7 @@ BuildRequires: hscolour %install %ghc_lib_install -rm $RPM_BUILD_ROOT%{_datadir}/%{name}-%{version}/{BUGS,COPYRIGHT,INSTALL,README,changelog} +rm %{buildroot}%{_datadir}/%{name}-%{version}/{BUGS,COPYRIGHT,INSTALL,README,changelog} %ghc_binlib_package @@ -57,6 +55,11 @@ rm $RPM_BUILD_ROOT%{_datadir}/%{name}-%{version}/{BUGS,COPYRIGHT,INSTALL,README, %changelog +* Sat May 28 2011 Jens Petersen - 1.8.1.1-1 +- update to 1.8.1.1 +- update to cabal2spec-0.23: add ppc64 +- new depends on citeproc-hs, dlist, json, pandoc-types, tagsoup + * Thu Mar 10 2011 Fabio M. Di Nitto - 1.6.0.1-5 - Enable build on sparcv9 diff --git a/sources b/sources index 9251a7a..2fee0c3 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -d19a630462595941b3100dff6f839aa3 pandoc-1.6.0.1.tar.gz +f5eb2d711cd65f2842487a6599de59b7 pandoc-1.8.1.1.tar.gz From a2b49bb98ee2dc1e7a545e31d1cdaa549aa42225 Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Sat, 28 May 2011 22:33:36 +0900 Subject: [PATCH 009/165] add pandoc_markdown.5.gz to filelist --- pandoc.spec | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pandoc.spec b/pandoc.spec index 26ac6f6..9f56fc8 100644 --- a/pandoc.spec +++ b/pandoc.spec @@ -52,6 +52,7 @@ rm %{buildroot}%{_datadir}/%{name}-%{version}/{BUGS,COPYRIGHT,INSTALL,README,cha %attr(755,root,root) %{_bindir}/markdown2pdf %{_datadir}/%{name}-%{version} %attr(644,root,root) %{_mandir}/man1/* +%attr(644,root,root) %{_mandir}/man5/* %changelog @@ -59,6 +60,7 @@ rm %{buildroot}%{_datadir}/%{name}-%{version}/{BUGS,COPYRIGHT,INSTALL,README,cha - update to 1.8.1.1 - update to cabal2spec-0.23: add ppc64 - new depends on citeproc-hs, dlist, json, pandoc-types, tagsoup +- new pandoc_markdown.5 manpage * Thu Mar 10 2011 Fabio M. Di Nitto - 1.6.0.1-5 - Enable build on sparcv9 From 370ae302494f9a819500c6cb840b1d691bddf198 Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Wed, 22 Jun 2011 18:30:26 +0900 Subject: [PATCH 010/165] use BR ghc-Cabal-devel and ghc_arches (cabal2spec-0.23.2) --- pandoc.spec | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/pandoc.spec b/pandoc.spec index 9f56fc8..bf10332 100644 --- a/pandoc.spec +++ b/pandoc.spec @@ -10,16 +10,15 @@ MediaWiki, groff man pages, EPUB, and S5 and Slidy HTML slide shows. Name: %{pkg_name} Version: 1.8.1.1 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Markup conversion tool for markdown Group: Applications/Publishing License: GPLv2+ URL: http://hackage.haskell.org/package/%{name} Source0: http://hackage.haskell.org/packages/archive/%{name}/%{version}/%{name}-%{version}.tar.gz -# fedora ghc archs: -ExclusiveArch: %{ix86} x86_64 ppc alpha sparcv9 ppc64 -BuildRequires: ghc-prof +ExclusiveArch: %{ghc_arches} +BuildRequires: ghc-Cabal-devel BuildRequires: ghc-rpm-macros BuildRequires: hscolour BuildRequires: ghc-citeproc-hs-prof, ghc-dlist-prof, ghc-HTTP-prof, ghc-json-prof, ghc-mtl-prof, ghc-network-prof, ghc-pandoc-types-prof, ghc-parsec-prof, ghc-tagsoup-prof, ghc-texmath-prof, ghc-utf8-string-prof, ghc-xhtml-prof, ghc-xml-prof, ghc-zip-archive-prof, @@ -33,6 +32,7 @@ BuildRequires: ghc-citeproc-hs-prof, ghc-dlist-prof, ghc-HTTP-prof, ghc-json-pr %build +#%%define cabal_configure_options -f highlighting %ghc_lib_build @@ -56,6 +56,9 @@ rm %{buildroot}%{_datadir}/%{name}-%{version}/{BUGS,COPYRIGHT,INSTALL,README,cha %changelog +* Wed Jun 22 2011 Jens Petersen - 1.8.1.1-2 +- BR ghc-Cabal-devel instead of ghc-prof and use ghc_arches (cabal2spec-0.23.2) + * Sat May 28 2011 Jens Petersen - 1.8.1.1-1 - update to 1.8.1.1 - update to cabal2spec-0.23: add ppc64 From 915fa9703cb950e90803a3bbba66d74848a54bd4 Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Wed, 22 Jun 2011 18:32:37 +0900 Subject: [PATCH 011/165] update .chain-deps --- .chain-deps | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/.chain-deps b/.chain-deps index 0711e81..490264a 100644 --- a/.chain-deps +++ b/.chain-deps @@ -1,3 +1 @@ -# rebuild.sh config file: see - -CHAIN_PKGS="ghc-digest ghc-xml : ghc-texmath ghc-zip-archive :" +ghc-digest ghc-dlist ghc-json ghc-pandoc-types ghc-tagsoup ghc-xml : ghc-citeproc-hs ghc-texmath ghc-zip-archive : From 580b04cb940a84a244116c6403d7e6f28f665149 Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Thu, 23 Jun 2011 10:10:32 +0900 Subject: [PATCH 012/165] also BR random and extensible-exceptions --- pandoc.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pandoc.spec b/pandoc.spec index bf10332..3033501 100644 --- a/pandoc.spec +++ b/pandoc.spec @@ -21,7 +21,7 @@ ExclusiveArch: %{ghc_arches} BuildRequires: ghc-Cabal-devel BuildRequires: ghc-rpm-macros BuildRequires: hscolour -BuildRequires: ghc-citeproc-hs-prof, ghc-dlist-prof, ghc-HTTP-prof, ghc-json-prof, ghc-mtl-prof, ghc-network-prof, ghc-pandoc-types-prof, ghc-parsec-prof, ghc-tagsoup-prof, ghc-texmath-prof, ghc-utf8-string-prof, ghc-xhtml-prof, ghc-xml-prof, ghc-zip-archive-prof, +BuildRequires: ghc-citeproc-hs-prof, ghc-dlist-prof, ghc-HTTP-prof, ghc-json-prof, ghc-mtl-prof, ghc-network-prof, ghc-pandoc-types-prof, ghc-parsec-prof, ghc-tagsoup-prof, ghc-texmath-prof, ghc-utf8-string-prof, ghc-xhtml-prof, ghc-xml-prof, ghc-zip-archive-prof, ghc-extensible-exceptions-prof, ghc-random-prof %description %{common_description} From 424d69bbf1e351f55458f61858223a81a483b091 Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Wed, 13 Jul 2011 10:56:01 +0900 Subject: [PATCH 013/165] build with code highlighting support using highlighting-kate --- pandoc.spec | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/pandoc.spec b/pandoc.spec index 3033501..4e6a03c 100644 --- a/pandoc.spec +++ b/pandoc.spec @@ -10,7 +10,7 @@ MediaWiki, groff man pages, EPUB, and S5 and Slidy HTML slide shows. Name: %{pkg_name} Version: 1.8.1.1 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Markup conversion tool for markdown Group: Applications/Publishing @@ -21,7 +21,7 @@ ExclusiveArch: %{ghc_arches} BuildRequires: ghc-Cabal-devel BuildRequires: ghc-rpm-macros BuildRequires: hscolour -BuildRequires: ghc-citeproc-hs-prof, ghc-dlist-prof, ghc-HTTP-prof, ghc-json-prof, ghc-mtl-prof, ghc-network-prof, ghc-pandoc-types-prof, ghc-parsec-prof, ghc-tagsoup-prof, ghc-texmath-prof, ghc-utf8-string-prof, ghc-xhtml-prof, ghc-xml-prof, ghc-zip-archive-prof, ghc-extensible-exceptions-prof, ghc-random-prof +BuildRequires: ghc-citeproc-hs-prof, ghc-dlist-prof, ghc-highlighting-kate-prof, ghc-HTTP-prof, ghc-json-prof, ghc-mtl-prof, ghc-network-prof, ghc-pandoc-types-prof, ghc-parsec-prof, ghc-tagsoup-prof, ghc-texmath-prof, ghc-utf8-string-prof, ghc-xhtml-prof, ghc-xml-prof, ghc-zip-archive-prof, ghc-extensible-exceptions-prof, ghc-random-prof %description %{common_description} @@ -32,7 +32,7 @@ BuildRequires: ghc-citeproc-hs-prof, ghc-dlist-prof, ghc-HTTP-prof, ghc-json-pr %build -#%%define cabal_configure_options -f highlighting +%define cabal_configure_options -f highlighting %ghc_lib_build @@ -56,6 +56,9 @@ rm %{buildroot}%{_datadir}/%{name}-%{version}/{BUGS,COPYRIGHT,INSTALL,README,cha %changelog +* Wed Jul 13 2011 Jens Petersen - 1.8.1.1-3 +- build with code highlighting support using highlighting-kate + * Wed Jun 22 2011 Jens Petersen - 1.8.1.1-2 - BR ghc-Cabal-devel instead of ghc-prof and use ghc_arches (cabal2spec-0.23.2) From 70c38b33761d3e5f055521acf94acd67d22a06f1 Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Thu, 21 Jul 2011 11:45:35 +0900 Subject: [PATCH 014/165] update to 1.8.1.2 --- .gitignore | 1 + pandoc.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 71e63f9..b6cd958 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ /pandoc-1.6.0.1.tar.gz /pandoc-1.8.1.1.tar.gz +/pandoc-1.8.1.2.tar.gz diff --git a/pandoc.spec b/pandoc.spec index 4e6a03c..3aa5432 100644 --- a/pandoc.spec +++ b/pandoc.spec @@ -9,8 +9,8 @@ reStructuredText, HTML, LaTeX, ConTeXt, Docbook, OpenDocument, ODT, RTF,\ MediaWiki, groff man pages, EPUB, and S5 and Slidy HTML slide shows. Name: %{pkg_name} -Version: 1.8.1.1 -Release: 3%{?dist} +Version: 1.8.1.2 +Release: 1%{?dist} Summary: Markup conversion tool for markdown Group: Applications/Publishing @@ -56,6 +56,9 @@ rm %{buildroot}%{_datadir}/%{name}-%{version}/{BUGS,COPYRIGHT,INSTALL,README,cha %changelog +* Thu Jul 21 2011 Jens Petersen - 1.8.1.2-1 +- update to 1.8.1.2 + * Wed Jul 13 2011 Jens Petersen - 1.8.1.1-3 - build with code highlighting support using highlighting-kate diff --git a/sources b/sources index 2fee0c3..12958c0 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -f5eb2d711cd65f2842487a6599de59b7 pandoc-1.8.1.1.tar.gz +0de71332fcc1ec4b9807d387a6c98301 pandoc-1.8.1.2.tar.gz From 2ce2556658fcb031e1f1d49e3499419bd03af866 Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Fri, 22 Jul 2011 11:12:19 +0900 Subject: [PATCH 015/165] rebuild --- pandoc.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pandoc.spec b/pandoc.spec index 3aa5432..3d2b4c6 100644 --- a/pandoc.spec +++ b/pandoc.spec @@ -10,7 +10,7 @@ MediaWiki, groff man pages, EPUB, and S5 and Slidy HTML slide shows. Name: %{pkg_name} Version: 1.8.1.2 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Markup conversion tool for markdown Group: Applications/Publishing @@ -56,6 +56,9 @@ rm %{buildroot}%{_datadir}/%{name}-%{version}/{BUGS,COPYRIGHT,INSTALL,README,cha %changelog +* Fri Jul 22 2011 Jens Petersen - 1.8.1.2-2 +- rebuild for highlighting-kate-0.2.10 + * Thu Jul 21 2011 Jens Petersen - 1.8.1.2-1 - update to 1.8.1.2 From 6cc081794ebbf891f9d20bc842ff13b5f49b36d5 Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Wed, 27 Jul 2011 15:03:30 +0530 Subject: [PATCH 016/165] rebuild --- pandoc.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pandoc.spec b/pandoc.spec index 3d2b4c6..b2494ac 100644 --- a/pandoc.spec +++ b/pandoc.spec @@ -10,7 +10,7 @@ MediaWiki, groff man pages, EPUB, and S5 and Slidy HTML slide shows. Name: %{pkg_name} Version: 1.8.1.2 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Markup conversion tool for markdown Group: Applications/Publishing @@ -56,6 +56,9 @@ rm %{buildroot}%{_datadir}/%{name}-%{version}/{BUGS,COPYRIGHT,INSTALL,README,cha %changelog +* Wed Jul 27 2011 Jens Petersen - 1.8.1.2-3 +- rebuild for xml-1.3.9 + * Fri Jul 22 2011 Jens Petersen - 1.8.1.2-2 - rebuild for highlighting-kate-0.2.10 From 23a38f67abe5c79aa5bc1f0f455048ad64c9e95f Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Thu, 4 Aug 2011 16:13:30 +0900 Subject: [PATCH 017/165] update to 1.8.2.1 --- .gitignore | 1 + pandoc.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index b6cd958..1762885 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ /pandoc-1.6.0.1.tar.gz /pandoc-1.8.1.1.tar.gz /pandoc-1.8.1.2.tar.gz +/pandoc-1.8.2.1.tar.gz diff --git a/pandoc.spec b/pandoc.spec index b2494ac..d03b6fc 100644 --- a/pandoc.spec +++ b/pandoc.spec @@ -9,8 +9,8 @@ reStructuredText, HTML, LaTeX, ConTeXt, Docbook, OpenDocument, ODT, RTF,\ MediaWiki, groff man pages, EPUB, and S5 and Slidy HTML slide shows. Name: %{pkg_name} -Version: 1.8.1.2 -Release: 3%{?dist} +Version: 1.8.2.1 +Release: 1%{?dist} Summary: Markup conversion tool for markdown Group: Applications/Publishing @@ -56,6 +56,9 @@ rm %{buildroot}%{_datadir}/%{name}-%{version}/{BUGS,COPYRIGHT,INSTALL,README,cha %changelog +* Thu Aug 4 2011 Jens Petersen - 1.8.2.1-1 +- update to 1.8.2.1 + * Wed Jul 27 2011 Jens Petersen - 1.8.1.2-3 - rebuild for xml-1.3.9 diff --git a/sources b/sources index 12958c0..4b2ddc5 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -0de71332fcc1ec4b9807d387a6c98301 pandoc-1.8.1.2.tar.gz +14ee1d068ca6b6b9f57c12bb45ba42db pandoc-1.8.2.1.tar.gz From 8d44381b40a79b1d8a78765882c0e91a246b6b88 Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Thu, 4 Aug 2011 17:02:30 +0900 Subject: [PATCH 018/165] depends on base64-bytestring --- pandoc.spec | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pandoc.spec b/pandoc.spec index d03b6fc..d18b559 100644 --- a/pandoc.spec +++ b/pandoc.spec @@ -21,7 +21,7 @@ ExclusiveArch: %{ghc_arches} BuildRequires: ghc-Cabal-devel BuildRequires: ghc-rpm-macros BuildRequires: hscolour -BuildRequires: ghc-citeproc-hs-prof, ghc-dlist-prof, ghc-highlighting-kate-prof, ghc-HTTP-prof, ghc-json-prof, ghc-mtl-prof, ghc-network-prof, ghc-pandoc-types-prof, ghc-parsec-prof, ghc-tagsoup-prof, ghc-texmath-prof, ghc-utf8-string-prof, ghc-xhtml-prof, ghc-xml-prof, ghc-zip-archive-prof, ghc-extensible-exceptions-prof, ghc-random-prof +BuildRequires: ghc-base64-bytestring-prof, ghc-citeproc-hs-prof, ghc-dlist-prof, ghc-highlighting-kate-prof, ghc-HTTP-prof, ghc-json-prof, ghc-mtl-prof, ghc-network-prof, ghc-pandoc-types-prof, ghc-parsec-prof, ghc-tagsoup-prof, ghc-texmath-prof, ghc-utf8-string-prof, ghc-xhtml-prof, ghc-xml-prof, ghc-zip-archive-prof, ghc-extensible-exceptions-prof, ghc-random-prof %description %{common_description} @@ -58,6 +58,7 @@ rm %{buildroot}%{_datadir}/%{name}-%{version}/{BUGS,COPYRIGHT,INSTALL,README,cha %changelog * Thu Aug 4 2011 Jens Petersen - 1.8.2.1-1 - update to 1.8.2.1 +- depends on base64-bytestring * Wed Jul 27 2011 Jens Petersen - 1.8.1.2-3 - rebuild for xml-1.3.9 From 3de66f1c1637169c8ee77f5e824e162a80f7ed76 Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Mon, 3 Oct 2011 16:00:50 +0900 Subject: [PATCH 019/165] rebuild against newer dependencies --- pandoc.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pandoc.spec b/pandoc.spec index d18b559..99ad9e9 100644 --- a/pandoc.spec +++ b/pandoc.spec @@ -10,7 +10,7 @@ MediaWiki, groff man pages, EPUB, and S5 and Slidy HTML slide shows. Name: %{pkg_name} Version: 1.8.2.1 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Markup conversion tool for markdown Group: Applications/Publishing @@ -56,6 +56,9 @@ rm %{buildroot}%{_datadir}/%{name}-%{version}/{BUGS,COPYRIGHT,INSTALL,README,cha %changelog +* Mon Oct 3 2011 Jens Petersen - 1.8.2.1-2 +- rebuild against newer dependencies + * Thu Aug 4 2011 Jens Petersen - 1.8.2.1-1 - update to 1.8.2.1 - depends on base64-bytestring From bd81052a915854c8ee4d600062f98d46366eddbb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marcela=20Ma=C5=A1l=C3=A1=C5=88ov=C3=A1?= Date: Wed, 12 Oct 2011 05:38:39 +0200 Subject: [PATCH 020/165] rebuild with new gmp --- pandoc.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pandoc.spec b/pandoc.spec index 99ad9e9..ade8f5a 100644 --- a/pandoc.spec +++ b/pandoc.spec @@ -10,7 +10,7 @@ MediaWiki, groff man pages, EPUB, and S5 and Slidy HTML slide shows. Name: %{pkg_name} Version: 1.8.2.1 -Release: 2%{?dist} +Release: 2%{?dist}.1 Summary: Markup conversion tool for markdown Group: Applications/Publishing @@ -56,6 +56,9 @@ rm %{buildroot}%{_datadir}/%{name}-%{version}/{BUGS,COPYRIGHT,INSTALL,README,cha %changelog +* Wed Oct 12 2011 Peter Schiffer - 1.8.2.1-2.1 +- rebuild with new gmp + * Mon Oct 3 2011 Jens Petersen - 1.8.2.1-2 - rebuild against newer dependencies From 688ad7f601ab4430621b486fa0fe8969a1e1075e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marcela=20Ma=C5=A1l=C3=A1=C5=88ov=C3=A1?= Date: Wed, 26 Oct 2011 13:24:33 +0200 Subject: [PATCH 021/165] rebuild with new gmp without compat lib --- pandoc.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pandoc.spec b/pandoc.spec index ade8f5a..c2d2368 100644 --- a/pandoc.spec +++ b/pandoc.spec @@ -10,7 +10,7 @@ MediaWiki, groff man pages, EPUB, and S5 and Slidy HTML slide shows. Name: %{pkg_name} Version: 1.8.2.1 -Release: 2%{?dist}.1 +Release: 2%{?dist}.2 Summary: Markup conversion tool for markdown Group: Applications/Publishing @@ -56,6 +56,9 @@ rm %{buildroot}%{_datadir}/%{name}-%{version}/{BUGS,COPYRIGHT,INSTALL,README,cha %changelog +* Wed Oct 26 2011 Marcela Mašláňová - 1.8.2.1-2.2 +- rebuild with new gmp without compat lib + * Wed Oct 12 2011 Peter Schiffer - 1.8.2.1-2.1 - rebuild with new gmp From 61055747ce73077d56a8b72b8c445ba9ca65764b Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Thu, 17 Nov 2011 18:38:03 +0900 Subject: [PATCH 022/165] disable ifluatex in default.latex for texlive-2007 and subpackage markdown2pdf --- pandoc-1.8.2.1-use-iftex.patch | 26 ++++++++++++++++++ pandoc.spec | 50 ++++++++++++++++++++++++++++++---- 2 files changed, 71 insertions(+), 5 deletions(-) create mode 100644 pandoc-1.8.2.1-use-iftex.patch diff --git a/pandoc-1.8.2.1-use-iftex.patch b/pandoc-1.8.2.1-use-iftex.patch new file mode 100644 index 0000000..b5015da --- /dev/null +++ b/pandoc-1.8.2.1-use-iftex.patch @@ -0,0 +1,26 @@ +--- pandoc-1.8.2.1/templates/default.latex.orig 2011-08-02 03:02:52.000000000 +0900 ++++ pandoc-1.8.2.1/templates/default.latex 2011-11-17 17:57:27.933740728 +0900 +@@ -1,16 +1,17 @@ + \documentclass$if(fontsize)$[$fontsize$]$endif${article} + \usepackage{amssymb,amsmath} +-\usepackage{ifxetex,ifluatex} ++%\usepackage{ifxetex,ifluatex} ++\usepackage{ifxetex} + \ifxetex + \usepackage{fontspec,xltxtra,xunicode} + \defaultfontfeatures{Mapping=tex-text,Scale=MatchLowercase} + \else +- \ifluatex +- \usepackage{fontspec} +- \defaultfontfeatures{Mapping=tex-text,Scale=MatchLowercase} +- \else ++% \ifluatex ++% \usepackage{fontspec} ++% \defaultfontfeatures{Mapping=tex-text,Scale=MatchLowercase} ++% \else + \usepackage[utf8]{inputenc} +- \fi ++% \fi + \fi + $if(natbib)$ + \usepackage{natbib} diff --git a/pandoc.spec b/pandoc.spec index c2d2368..95e6d44 100644 --- a/pandoc.spec +++ b/pandoc.spec @@ -10,25 +10,58 @@ MediaWiki, groff man pages, EPUB, and S5 and Slidy HTML slide shows. Name: %{pkg_name} Version: 1.8.2.1 -Release: 2%{?dist}.2 +Release: 3%{?dist} Summary: Markup conversion tool for markdown Group: Applications/Publishing License: GPLv2+ +# BEGIN cabal2spec URL: http://hackage.haskell.org/package/%{name} Source0: http://hackage.haskell.org/packages/archive/%{name}/%{version}/%{name}-%{version}.tar.gz ExclusiveArch: %{ghc_arches} BuildRequires: ghc-Cabal-devel BuildRequires: ghc-rpm-macros BuildRequires: hscolour -BuildRequires: ghc-base64-bytestring-prof, ghc-citeproc-hs-prof, ghc-dlist-prof, ghc-highlighting-kate-prof, ghc-HTTP-prof, ghc-json-prof, ghc-mtl-prof, ghc-network-prof, ghc-pandoc-types-prof, ghc-parsec-prof, ghc-tagsoup-prof, ghc-texmath-prof, ghc-utf8-string-prof, ghc-xhtml-prof, ghc-xml-prof, ghc-zip-archive-prof, ghc-extensible-exceptions-prof, ghc-random-prof +# END cabal2spec +BuildRequires: ghc-base64-bytestring-prof +BuildRequires: ghc-citeproc-hs-prof +BuildRequires: ghc-dlist-prof +BuildRequires: ghc-highlighting-kate-prof +BuildRequires: ghc-HTTP-prof +BuildRequires: ghc-json-prof +BuildRequires: ghc-mtl-prof +BuildRequires: ghc-network-prof +BuildRequires: ghc-pandoc-types-prof +BuildRequires: ghc-parsec-prof +BuildRequires: ghc-tagsoup-prof +BuildRequires: ghc-texmath-prof +BuildRequires: ghc-utf8-string-prof +BuildRequires: ghc-xhtml-prof +BuildRequires: ghc-xml-prof +BuildRequires: ghc-zip-archive-prof +BuildRequires: ghc-extensible-exceptions-prof +BuildRequires: ghc-random-prof +Patch1: pandoc-1.8.2.1-use-iftex.patch %description %{common_description} +%package markdown2pdf +Summary: Convert markdown to PDF via LaTeX +Group: Applications/Publishing +Requires: pandoc = %{version}-%{release} +Requires: texlive-xetex + +%description markdown2pdf +%{common_description} + +This package provides pandoc's markdown2pdf convertion tool. + + %prep %setup -q +%patch1 -p1 -b .orig %build @@ -46,16 +79,23 @@ rm %{buildroot}%{_datadir}/%{name}-%{version}/{BUGS,COPYRIGHT,INSTALL,README,cha %files -%defattr(-,root,root,-) %doc BUGS COPYING COPYRIGHT README %attr(755,root,root) %{_bindir}/%{name} -%attr(755,root,root) %{_bindir}/markdown2pdf %{_datadir}/%{name}-%{version} -%attr(644,root,root) %{_mandir}/man1/* +%attr(644,root,root) %{_mandir}/man1/pandoc.1* %attr(644,root,root) %{_mandir}/man5/* +%files markdown2pdf +%attr(755,root,root) %{_bindir}/markdown2pdf +%attr(644,root,root) %{_mandir}/man1/markdown2pdf.1* + + %changelog +* Thu Nov 17 2011 Jens Petersen - 1.8.2.1-3 +- disable ifluatex in default.latex for texlive-2007 (Luis Villa, #752621) +- subpackage markdown2pdf and make it require texlive-xetex + * Wed Oct 26 2011 Marcela Mašláňová - 1.8.2.1-2.2 - rebuild with new gmp without compat lib From eb78ac7074624a63b9f49b5338fb8f78e8226d73 Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Wed, 30 Nov 2011 19:10:50 +0900 Subject: [PATCH 023/165] add missing requires for pdflatex --- pandoc.spec | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/pandoc.spec b/pandoc.spec index 95e6d44..35eab3f 100644 --- a/pandoc.spec +++ b/pandoc.spec @@ -10,7 +10,7 @@ MediaWiki, groff man pages, EPUB, and S5 and Slidy HTML slide shows. Name: %{pkg_name} Version: 1.8.2.1 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Markup conversion tool for markdown Group: Applications/Publishing @@ -46,12 +46,15 @@ Patch1: pandoc-1.8.2.1-use-iftex.patch %description %{common_description} +The pandoc-markdown2pdf subpackage provides markdown2pdf. + %package markdown2pdf Summary: Convert markdown to PDF via LaTeX Group: Applications/Publishing Requires: pandoc = %{version}-%{release} -Requires: texlive-xetex +# for pdflatex and xelatex +Requires: texlive-latex, texlive-xetex %description markdown2pdf %{common_description} @@ -92,6 +95,9 @@ rm %{buildroot}%{_datadir}/%{name}-%{version}/{BUGS,COPYRIGHT,INSTALL,README,cha %changelog +* Wed Nov 30 2011 Jens Petersen - 1.8.2.1-4 +- add missing requires for pdflatex + * Thu Nov 17 2011 Jens Petersen - 1.8.2.1-3 - disable ifluatex in default.latex for texlive-2007 (Luis Villa, #752621) - subpackage markdown2pdf and make it require texlive-xetex From d98536feb93d1404d5b6e5a395eabe3086a18446 Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Thu, 22 Dec 2011 17:08:01 +0900 Subject: [PATCH 024/165] markdown2pdf: require texlive-latex instead of xetex; workaround xelatex writing to cwd --- ...-1.8.2.1-texlive2007-xelatex-outputdir.patch | 17 +++++++++++++++++ pandoc.spec | 12 +++++++++--- 2 files changed, 26 insertions(+), 3 deletions(-) create mode 100644 pandoc-1.8.2.1-texlive2007-xelatex-outputdir.patch diff --git a/pandoc-1.8.2.1-texlive2007-xelatex-outputdir.patch b/pandoc-1.8.2.1-texlive2007-xelatex-outputdir.patch new file mode 100644 index 0000000..151c576 --- /dev/null +++ b/pandoc-1.8.2.1-texlive2007-xelatex-outputdir.patch @@ -0,0 +1,17 @@ +--- pandoc-1.8.2.1/src/markdown2pdf.hs~ 2011-08-02 03:02:52.000000000 +0900 ++++ pandoc-1.8.2.1/src/markdown2pdf.hs 2011-12-22 12:08:02.528735085 +0900 +@@ -173,8 +173,12 @@ + + saveOutput :: FilePath -> FilePath -> IO () + saveOutput input output = do +- copyFile (encodeString input) (encodeString output) +- UTF8.hPutStrLn stderr $! "Created " ++ output ++ inExists <- doesFileExist (encodeString input) ++ when inExists $ ++ copyFile (encodeString input) (encodeString output) ++ outExists <- doesFileExist (encodeString input) ++ when outExists $ ++ UTF8.hPutStrLn stderr $! "Created " ++ output + + main :: IO () + main = bracket diff --git a/pandoc.spec b/pandoc.spec index 35eab3f..8632f8c 100644 --- a/pandoc.spec +++ b/pandoc.spec @@ -10,7 +10,7 @@ MediaWiki, groff man pages, EPUB, and S5 and Slidy HTML slide shows. Name: %{pkg_name} Version: 1.8.2.1 -Release: 4%{?dist} +Release: 5%{?dist} Summary: Markup conversion tool for markdown Group: Applications/Publishing @@ -42,6 +42,7 @@ BuildRequires: ghc-zip-archive-prof BuildRequires: ghc-extensible-exceptions-prof BuildRequires: ghc-random-prof Patch1: pandoc-1.8.2.1-use-iftex.patch +Patch2: pandoc-1.8.2.1-texlive2007-xelatex-outputdir.patch %description %{common_description} @@ -53,8 +54,8 @@ The pandoc-markdown2pdf subpackage provides markdown2pdf. Summary: Convert markdown to PDF via LaTeX Group: Applications/Publishing Requires: pandoc = %{version}-%{release} -# for pdflatex and xelatex -Requires: texlive-latex, texlive-xetex +# for pdflatex +Requires: texlive-latex %description markdown2pdf %{common_description} @@ -65,6 +66,7 @@ This package provides pandoc's markdown2pdf convertion tool. %prep %setup -q %patch1 -p1 -b .orig +%patch2 -p1 -b .orig %build @@ -95,6 +97,10 @@ rm %{buildroot}%{_datadir}/%{name}-%{version}/{BUGS,COPYRIGHT,INSTALL,README,cha %changelog +* Thu Dec 22 2011 Jens Petersen - 1.8.2.1-5 +- only require pdflatex not xelatex by default +- workaround texlive-2007 xelatex outputting to current dir + * Wed Nov 30 2011 Jens Petersen - 1.8.2.1-4 - add missing requires for pdflatex From ef97f340c25f83a9fa21c838df4575e97a7f1b5f Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Thu, 22 Dec 2011 17:55:16 +0900 Subject: [PATCH 025/165] need texlive-xetex for ifxetex.sty --- pandoc.spec | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/pandoc.spec b/pandoc.spec index 8632f8c..7f4a057 100644 --- a/pandoc.spec +++ b/pandoc.spec @@ -54,8 +54,8 @@ The pandoc-markdown2pdf subpackage provides markdown2pdf. Summary: Convert markdown to PDF via LaTeX Group: Applications/Publishing Requires: pandoc = %{version}-%{release} -# for pdflatex -Requires: texlive-latex +# for pdflatex and xelatex +Requires: texlive-latex, texlive-xetex %description markdown2pdf %{common_description} @@ -98,7 +98,6 @@ rm %{buildroot}%{_datadir}/%{name}-%{version}/{BUGS,COPYRIGHT,INSTALL,README,cha %changelog * Thu Dec 22 2011 Jens Petersen - 1.8.2.1-5 -- only require pdflatex not xelatex by default - workaround texlive-2007 xelatex outputting to current dir * Wed Nov 30 2011 Jens Petersen - 1.8.2.1-4 From 01c66f3f5df2d15228e8b31b91ebb5058fc56e5a Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Fri, 6 Jan 2012 21:26:23 +0900 Subject: [PATCH 026/165] update to cabal2spec-0.25.2 --- pandoc.spec | 27 +++++++++++++++++++++++---- 1 file changed, 23 insertions(+), 4 deletions(-) diff --git a/pandoc.spec b/pandoc.spec index 7f4a057..0d03c86 100644 --- a/pandoc.spec +++ b/pandoc.spec @@ -1,3 +1,7 @@ +# cabal2spec-0.25.2 +# https://fedoraproject.org/wiki/Packaging:Haskell +# https://fedoraproject.org/wiki/PackagingDrafts/Haskell + %global pkg_name pandoc %global common_summary Haskell %{pkg_name} library @@ -10,7 +14,7 @@ MediaWiki, groff man pages, EPUB, and S5 and Slidy HTML slide shows. Name: %{pkg_name} Version: 1.8.2.1 -Release: 5%{?dist} +Release: 6%{?dist} Summary: Markup conversion tool for markdown Group: Applications/Publishing @@ -20,8 +24,7 @@ URL: http://hackage.haskell.org/package/%{name} Source0: http://hackage.haskell.org/packages/archive/%{name}/%{version}/%{name}-%{version}.tar.gz ExclusiveArch: %{ghc_arches} BuildRequires: ghc-Cabal-devel -BuildRequires: ghc-rpm-macros -BuildRequires: hscolour +BuildRequires: ghc-rpm-macros %{!?without_hscolour:hscolour} # END cabal2spec BuildRequires: ghc-base64-bytestring-prof BuildRequires: ghc-citeproc-hs-prof @@ -41,6 +44,7 @@ BuildRequires: ghc-xml-prof BuildRequires: ghc-zip-archive-prof BuildRequires: ghc-extensible-exceptions-prof BuildRequires: ghc-random-prof +# these two patches should be removed when texlive gets updated Patch1: pandoc-1.8.2.1-use-iftex.patch Patch2: pandoc-1.8.2.1-texlive2007-xelatex-outputdir.patch @@ -79,8 +83,17 @@ This package provides pandoc's markdown2pdf convertion tool. rm %{buildroot}%{_datadir}/%{name}-%{version}/{BUGS,COPYRIGHT,INSTALL,README,changelog} +%ghc_package + +%ghc_description + + +%ghc_devel_package + +%ghc_devel_description -%ghc_binlib_package + +%ghc_devel_post_postun %files @@ -96,7 +109,13 @@ rm %{buildroot}%{_datadir}/%{name}-%{version}/{BUGS,COPYRIGHT,INSTALL,README,cha %attr(644,root,root) %{_mandir}/man1/markdown2pdf.1* +%ghc_files + + %changelog +* Fri Jan 6 2012 Jens Petersen - 1.8.2.1-6 +- update to cabal2spec-0.25.2 + * Thu Dec 22 2011 Jens Petersen - 1.8.2.1-5 - workaround texlive-2007 xelatex outputting to current dir From d6e818dcde73e67809a5f62467caddc6d1f253d9 Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Thu, 26 Jan 2012 11:51:04 +0900 Subject: [PATCH 027/165] set highlighting build flag by patching instead to help dependency tracking --- pandoc-enable-highlighting-flag.patch | 11 +++++++++++ pandoc.spec | 8 ++++++-- 2 files changed, 17 insertions(+), 2 deletions(-) create mode 100644 pandoc-enable-highlighting-flag.patch diff --git a/pandoc-enable-highlighting-flag.patch b/pandoc-enable-highlighting-flag.patch new file mode 100644 index 0000000..e152ee7 --- /dev/null +++ b/pandoc-enable-highlighting-flag.patch @@ -0,0 +1,11 @@ +--- pandoc-1.8.2.1/pandoc.cabal~ 2011-08-02 03:02:52.000000000 +0900 ++++ pandoc-1.8.2.1/pandoc.cabal 2012-01-26 11:44:45.097493599 +0900 +@@ -168,7 +168,7 @@ + Default: True + Flag highlighting + Description: Compile in support for syntax highlighting of code blocks. +- Default: False ++ Default: True + Flag executable + Description: Build the pandoc executable. + Default: True diff --git a/pandoc.spec b/pandoc.spec index 0d03c86..2d12e7a 100644 --- a/pandoc.spec +++ b/pandoc.spec @@ -14,7 +14,7 @@ MediaWiki, groff man pages, EPUB, and S5 and Slidy HTML slide shows. Name: %{pkg_name} Version: 1.8.2.1 -Release: 6%{?dist} +Release: 7%{?dist} Summary: Markup conversion tool for markdown Group: Applications/Publishing @@ -44,6 +44,7 @@ BuildRequires: ghc-xml-prof BuildRequires: ghc-zip-archive-prof BuildRequires: ghc-extensible-exceptions-prof BuildRequires: ghc-random-prof +Patch0: pandoc-enable-highlighting-flag.patch # these two patches should be removed when texlive gets updated Patch1: pandoc-1.8.2.1-use-iftex.patch Patch2: pandoc-1.8.2.1-texlive2007-xelatex-outputdir.patch @@ -69,12 +70,12 @@ This package provides pandoc's markdown2pdf convertion tool. %prep %setup -q +%patch0 -p1 -b .orig %patch1 -p1 -b .orig %patch2 -p1 -b .orig %build -%define cabal_configure_options -f highlighting %ghc_lib_build @@ -113,6 +114,9 @@ rm %{buildroot}%{_datadir}/%{name}-%{version}/{BUGS,COPYRIGHT,INSTALL,README,cha %changelog +* Thu Jan 26 2012 Jens Petersen - 1.8.2.1-7 +- set highlighting build flag by patching instead to help dependency tracking + * Fri Jan 6 2012 Jens Petersen - 1.8.2.1-6 - update to cabal2spec-0.25.2 From 0fd9fee01dd3f8968f533cf2dd691cb30a64a14c Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Wed, 8 Feb 2012 01:26:13 +0900 Subject: [PATCH 028/165] bump for rebuild --- pandoc.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pandoc.spec b/pandoc.spec index 2d12e7a..db96dd5 100644 --- a/pandoc.spec +++ b/pandoc.spec @@ -14,7 +14,7 @@ MediaWiki, groff man pages, EPUB, and S5 and Slidy HTML slide shows. Name: %{pkg_name} Version: 1.8.2.1 -Release: 7%{?dist} +Release: 8%{?dist} Summary: Markup conversion tool for markdown Group: Applications/Publishing @@ -114,6 +114,9 @@ rm %{buildroot}%{_datadir}/%{name}-%{version}/{BUGS,COPYRIGHT,INSTALL,README,cha %changelog +* Tue Feb 7 2012 Jens Petersen - 1.8.2.1-8 +- rebuild + * Thu Jan 26 2012 Jens Petersen - 1.8.2.1-7 - set highlighting build flag by patching instead to help dependency tracking From 8913e308407d1077f3ae77bf67d0764e1ce2bec9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Petr=20P=C3=ADsa=C5=99?= Date: Fri, 10 Feb 2012 14:58:23 +0100 Subject: [PATCH 029/165] Rebuild against PCRE 8.30 --- pandoc.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pandoc.spec b/pandoc.spec index db96dd5..8ba976a 100644 --- a/pandoc.spec +++ b/pandoc.spec @@ -14,7 +14,7 @@ MediaWiki, groff man pages, EPUB, and S5 and Slidy HTML slide shows. Name: %{pkg_name} Version: 1.8.2.1 -Release: 8%{?dist} +Release: 9%{?dist} Summary: Markup conversion tool for markdown Group: Applications/Publishing @@ -114,6 +114,9 @@ rm %{buildroot}%{_datadir}/%{name}-%{version}/{BUGS,COPYRIGHT,INSTALL,README,cha %changelog +* Fri Feb 10 2012 Petr Pisar - 1.8.2.1-9 +- Rebuild against PCRE 8.30 + * Tue Feb 7 2012 Jens Petersen - 1.8.2.1-8 - rebuild From e8d9c550adceb7f8f66eb0705839b174325812f6 Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Mon, 13 Feb 2012 13:36:04 +0900 Subject: [PATCH 030/165] update to 1.9.1.1 (no longer separate markdown2pdf) --- .gitignore | 1 + README.fedora | 5 +++ ...ch => pandoc-default.latex-no-luatex.patch | 6 +-- pandoc.spec | 42 +++++++------------ sources | 2 +- 5 files changed, 24 insertions(+), 32 deletions(-) create mode 100644 README.fedora rename pandoc-1.8.2.1-use-iftex.patch => pandoc-default.latex-no-luatex.patch (71%) diff --git a/.gitignore b/.gitignore index 1762885..8037b6f 100644 --- a/.gitignore +++ b/.gitignore @@ -2,3 +2,4 @@ /pandoc-1.8.1.1.tar.gz /pandoc-1.8.1.2.tar.gz /pandoc-1.8.2.1.tar.gz +/pandoc-1.9.1.1.tar.gz diff --git a/README.fedora b/README.fedora new file mode 100644 index 0000000..e4c3b72 --- /dev/null +++ b/README.fedora @@ -0,0 +1,5 @@ +PDF output requires texlive: + + $ sudo yum install texlive-latex texlive-xetex + : + $ pandoc -o output.pdf ... diff --git a/pandoc-1.8.2.1-use-iftex.patch b/pandoc-default.latex-no-luatex.patch similarity index 71% rename from pandoc-1.8.2.1-use-iftex.patch rename to pandoc-default.latex-no-luatex.patch index b5015da..f4f4ff6 100644 --- a/pandoc-1.8.2.1-use-iftex.patch +++ b/pandoc-default.latex-no-luatex.patch @@ -1,7 +1,7 @@ ---- pandoc-1.8.2.1/templates/default.latex.orig 2011-08-02 03:02:52.000000000 +0900 -+++ pandoc-1.8.2.1/templates/default.latex 2011-11-17 17:57:27.933740728 +0900 +--- pandoc-1.9.1.1/templates/default.latex~ 2012-02-12 10:08:47.000000000 +0900 ++++ pandoc-1.9.1.1/templates/default.latex 2012-02-13 13:19:32.020231122 +0900 @@ -1,16 +1,17 @@ - \documentclass$if(fontsize)$[$fontsize$]$endif${article} + \documentclass[$if(fontsize)$$fontsize$,$endif$]{$documentclass$} \usepackage{amssymb,amsmath} -\usepackage{ifxetex,ifluatex} +%\usepackage{ifxetex,ifluatex} diff --git a/pandoc.spec b/pandoc.spec index 8ba976a..2f01736 100644 --- a/pandoc.spec +++ b/pandoc.spec @@ -13,8 +13,8 @@ reStructuredText, HTML, LaTeX, ConTeXt, Docbook, OpenDocument, ODT, RTF,\ MediaWiki, groff man pages, EPUB, and S5 and Slidy HTML slide shows. Name: %{pkg_name} -Version: 1.8.2.1 -Release: 9%{?dist} +Version: 1.9.1.1 +Release: 1%{?dist} Summary: Markup conversion tool for markdown Group: Applications/Publishing @@ -44,35 +44,19 @@ BuildRequires: ghc-xml-prof BuildRequires: ghc-zip-archive-prof BuildRequires: ghc-extensible-exceptions-prof BuildRequires: ghc-random-prof -Patch0: pandoc-enable-highlighting-flag.patch +Obsoletes: pandoc-markdown2pdf < %{version}-%{release} # these two patches should be removed when texlive gets updated -Patch1: pandoc-1.8.2.1-use-iftex.patch -Patch2: pandoc-1.8.2.1-texlive2007-xelatex-outputdir.patch +Patch1: pandoc-default.latex-no-luatex.patch +#Patch2: pandoc-1.8.2.1-texlive2007-xelatex-outputdir.patch %description %{common_description} -The pandoc-markdown2pdf subpackage provides markdown2pdf. - - -%package markdown2pdf -Summary: Convert markdown to PDF via LaTeX -Group: Applications/Publishing -Requires: pandoc = %{version}-%{release} -# for pdflatex and xelatex -Requires: texlive-latex, texlive-xetex - -%description markdown2pdf -%{common_description} - -This package provides pandoc's markdown2pdf convertion tool. - %prep %setup -q -%patch0 -p1 -b .orig %patch1 -p1 -b .orig -%patch2 -p1 -b .orig +#%%patch2 -p1 -b .orig %build @@ -98,22 +82,24 @@ rm %{buildroot}%{_datadir}/%{name}-%{version}/{BUGS,COPYRIGHT,INSTALL,README,cha %files -%doc BUGS COPYING COPYRIGHT README +%doc BUGS COPYING COPYRIGHT README* changelog %attr(755,root,root) %{_bindir}/%{name} %{_datadir}/%{name}-%{version} %attr(644,root,root) %{_mandir}/man1/pandoc.1* %attr(644,root,root) %{_mandir}/man5/* -%files markdown2pdf -%attr(755,root,root) %{_bindir}/markdown2pdf -%attr(644,root,root) %{_mandir}/man1/markdown2pdf.1* - - %ghc_files %changelog +* Mon Feb 13 2012 Jens Petersen - 1.9.1.1-1 +- update to 1.9.1.1 + http://johnmacfarlane.net/pandoc/releases.html#pandoc-1.9.1.1-2012-02-11 +- markdown2pdf is now handled by pandoc itself: + add README.fedora file documenting required texlive packages +- add changelog file + * Fri Feb 10 2012 Petr Pisar - 1.8.2.1-9 - Rebuild against PCRE 8.30 diff --git a/sources b/sources index 4b2ddc5..2a0f550 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -14ee1d068ca6b6b9f57c12bb45ba42db pandoc-1.8.2.1.tar.gz +8e596946c1c8982c1b5a6bdc4d13b5a0 pandoc-1.9.1.1.tar.gz From 46cdf55c5522eaa569c6b94faea82bec44f4f68e Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Mon, 13 Feb 2012 14:19:53 +0900 Subject: [PATCH 031/165] new depends on blaze-html, temporary, zlib --- pandoc.spec | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/pandoc.spec b/pandoc.spec index 2f01736..91a1548 100644 --- a/pandoc.spec +++ b/pandoc.spec @@ -27,8 +27,9 @@ BuildRequires: ghc-Cabal-devel BuildRequires: ghc-rpm-macros %{!?without_hscolour:hscolour} # END cabal2spec BuildRequires: ghc-base64-bytestring-prof +BuildRequires: ghc-blaze-html-prof BuildRequires: ghc-citeproc-hs-prof -BuildRequires: ghc-dlist-prof +BuildRequires: ghc-extensible-exceptions-prof BuildRequires: ghc-highlighting-kate-prof BuildRequires: ghc-HTTP-prof BuildRequires: ghc-json-prof @@ -36,14 +37,15 @@ BuildRequires: ghc-mtl-prof BuildRequires: ghc-network-prof BuildRequires: ghc-pandoc-types-prof BuildRequires: ghc-parsec-prof +BuildRequires: ghc-random-prof BuildRequires: ghc-tagsoup-prof +BuildRequires: ghc-temporary-prof BuildRequires: ghc-texmath-prof BuildRequires: ghc-utf8-string-prof BuildRequires: ghc-xhtml-prof BuildRequires: ghc-xml-prof BuildRequires: ghc-zip-archive-prof -BuildRequires: ghc-extensible-exceptions-prof -BuildRequires: ghc-random-prof +BuildRequires: ghc-zlib-prof Obsoletes: pandoc-markdown2pdf < %{version}-%{release} # these two patches should be removed when texlive gets updated Patch1: pandoc-default.latex-no-luatex.patch @@ -95,7 +97,8 @@ rm %{buildroot}%{_datadir}/%{name}-%{version}/{BUGS,COPYRIGHT,INSTALL,README,cha %changelog * Mon Feb 13 2012 Jens Petersen - 1.9.1.1-1 - update to 1.9.1.1 - http://johnmacfarlane.net/pandoc/releases.html#pandoc-1.9.1.1-2012-02-11 + http://johnmacfarlane.net/pandoc/releases.html#pandoc-1.9-2012-02-05 +- new depends on blaze-html, temporary, zlib - markdown2pdf is now handled by pandoc itself: add README.fedora file documenting required texlive packages - add changelog file From 78a5b88d2c105b4d1e0a5f1b40e4320c3d2118fb Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Wed, 7 Mar 2012 18:32:55 +0900 Subject: [PATCH 032/165] rebuild --- pandoc.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pandoc.spec b/pandoc.spec index 91a1548..92c0076 100644 --- a/pandoc.spec +++ b/pandoc.spec @@ -14,7 +14,7 @@ MediaWiki, groff man pages, EPUB, and S5 and Slidy HTML slide shows. Name: %{pkg_name} Version: 1.9.1.1 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Markup conversion tool for markdown Group: Applications/Publishing @@ -95,6 +95,9 @@ rm %{buildroot}%{_datadir}/%{name}-%{version}/{BUGS,COPYRIGHT,INSTALL,README,cha %changelog +* Wed Mar 7 2012 Jens Petersen - 1.9.1.1-2 +- rebuild + * Mon Feb 13 2012 Jens Petersen - 1.9.1.1-1 - update to 1.9.1.1 http://johnmacfarlane.net/pandoc/releases.html#pandoc-1.9-2012-02-05 From e668c888049d09500e786c2ddaea75b859870a2f Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Wed, 21 Mar 2012 17:31:46 +0900 Subject: [PATCH 033/165] update to 1.9.1.2 --- .gitignore | 1 + pandoc.spec | 9 ++++++--- sources | 2 +- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index 8037b6f..bcf8491 100644 --- a/.gitignore +++ b/.gitignore @@ -3,3 +3,4 @@ /pandoc-1.8.1.2.tar.gz /pandoc-1.8.2.1.tar.gz /pandoc-1.9.1.1.tar.gz +/pandoc-1.9.1.2.tar.gz diff --git a/pandoc.spec b/pandoc.spec index 92c0076..82e7141 100644 --- a/pandoc.spec +++ b/pandoc.spec @@ -13,8 +13,8 @@ reStructuredText, HTML, LaTeX, ConTeXt, Docbook, OpenDocument, ODT, RTF,\ MediaWiki, groff man pages, EPUB, and S5 and Slidy HTML slide shows. Name: %{pkg_name} -Version: 1.9.1.1 -Release: 2%{?dist} +Version: 1.9.1.2 +Release: 1%{?dist} Summary: Markup conversion tool for markdown Group: Applications/Publishing @@ -91,10 +91,13 @@ rm %{buildroot}%{_datadir}/%{name}-%{version}/{BUGS,COPYRIGHT,INSTALL,README,cha %attr(644,root,root) %{_mandir}/man5/* -%ghc_files +%ghc_files COPYRIGHT %changelog +* Wed Mar 21 2012 Jens Petersen - 1.9.1.2-1 +- update to 1.9.1.2 + * Wed Mar 7 2012 Jens Petersen - 1.9.1.1-2 - rebuild diff --git a/sources b/sources index 2a0f550..e923128 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -8e596946c1c8982c1b5a6bdc4d13b5a0 pandoc-1.9.1.1.tar.gz +e37b043379147c7fe4d6b51486e02f77 pandoc-1.9.1.2.tar.gz From 37c08b0fdb75708427b967e7e157169a2ab31eaa Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Fri, 23 Mar 2012 18:20:47 +0900 Subject: [PATCH 034/165] update pandoc-default.latex-no-luatex.patch for 1.9.1.2 --- pandoc-default.latex-no-luatex.patch | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/pandoc-default.latex-no-luatex.patch b/pandoc-default.latex-no-luatex.patch index f4f4ff6..0c728a8 100644 --- a/pandoc-default.latex-no-luatex.patch +++ b/pandoc-default.latex-no-luatex.patch @@ -1,7 +1,8 @@ ---- pandoc-1.9.1.1/templates/default.latex~ 2012-02-12 10:08:47.000000000 +0900 -+++ pandoc-1.9.1.1/templates/default.latex 2012-02-13 13:19:32.020231122 +0900 -@@ -1,16 +1,17 @@ - \documentclass[$if(fontsize)$$fontsize$,$endif$]{$documentclass$} +diff -u pandoc-1.9.1.2/templates/default.latex\~ pandoc-1.9.1.2/templates/default.latex +--- pandoc-1.9.1.2/templates/default.latex~ 2012-03-10 07:53:17.000000000 +0900 ++++ pandoc-1.9.1.2/templates/default.latex 2012-03-23 18:18:31.619693151 +0900 +@@ -1,19 +1,20 @@ + \documentclass[$if(fontsize)$$fontsize$,$endif$$if(lang)$$lang$,$endif$]{$documentclass$} \usepackage{amssymb,amsmath} -\usepackage{ifxetex,ifluatex} +%\usepackage{ifxetex,ifluatex} @@ -9,16 +10,20 @@ \ifxetex \usepackage{fontspec,xltxtra,xunicode} \defaultfontfeatures{Mapping=tex-text,Scale=MatchLowercase} + \newcommand{\euro}{€} \else - \ifluatex - \usepackage{fontspec} - \defaultfontfeatures{Mapping=tex-text,Scale=MatchLowercase} +- \newcommand{\euro}{€} - \else +% \ifluatex +% \usepackage{fontspec} +% \defaultfontfeatures{Mapping=tex-text,Scale=MatchLowercase} ++% \newcommand{\euro}{€} +% \else \usepackage[utf8]{inputenc} + \usepackage{eurosym} - \fi +% \fi \fi From f5bcec70e07ad0fdc83a50ee8561de40f0131fe1 Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Fri, 23 Mar 2012 20:20:51 +0900 Subject: [PATCH 035/165] .chains-deps: update deps --- .chain-deps | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.chain-deps b/.chain-deps index 490264a..52c3d29 100644 --- a/.chain-deps +++ b/.chain-deps @@ -1 +1 @@ -ghc-digest ghc-dlist ghc-json ghc-pandoc-types ghc-tagsoup ghc-xml : ghc-citeproc-hs ghc-texmath ghc-zip-archive : +ghc-base64-bytestring ghc-digest ghc-dlist ghc-json ghc-pandoc-types ghc-pcre-light ghc-temporary ghc-tagsoup ghc-xml : ghc-citeproc-hs ghc-texmath ghc-zip-archive highlighting-kate : From 1135c7111cac0628e0bf7f9434e8d38623ea11ad Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Wed, 25 Apr 2012 13:03:30 +0900 Subject: [PATCH 036/165] update to 1.9.2 --- .gitignore | 1 + pandoc.spec | 5 ++++- sources | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index bcf8491..1bd0241 100644 --- a/.gitignore +++ b/.gitignore @@ -4,3 +4,4 @@ /pandoc-1.8.2.1.tar.gz /pandoc-1.9.1.1.tar.gz /pandoc-1.9.1.2.tar.gz +/pandoc-1.9.2.tar.gz diff --git a/pandoc.spec b/pandoc.spec index 82e7141..6d8795e 100644 --- a/pandoc.spec +++ b/pandoc.spec @@ -13,7 +13,7 @@ reStructuredText, HTML, LaTeX, ConTeXt, Docbook, OpenDocument, ODT, RTF,\ MediaWiki, groff man pages, EPUB, and S5 and Slidy HTML slide shows. Name: %{pkg_name} -Version: 1.9.1.2 +Version: 1.9.2 Release: 1%{?dist} Summary: Markup conversion tool for markdown @@ -95,6 +95,9 @@ rm %{buildroot}%{_datadir}/%{name}-%{version}/{BUGS,COPYRIGHT,INSTALL,README,cha %changelog +* Wed Apr 25 2012 Jens Petersen - 1.9.2-1 +- update to 1.9.2 + * Wed Mar 21 2012 Jens Petersen - 1.9.1.2-1 - update to 1.9.1.2 diff --git a/sources b/sources index e923128..9608653 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -e37b043379147c7fe4d6b51486e02f77 pandoc-1.9.1.2.tar.gz +ce0a11806df3e99ecb46a36ba00bfd59 pandoc-1.9.2.tar.gz From f7bb2efe53f4c2380853407ce0d2bd6b95cb50c1 Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Wed, 25 Apr 2012 13:21:49 +0900 Subject: [PATCH 037/165] update pandoc-default.latex-no-luatex.patch for 1.9.2 --- pandoc-default.latex-no-luatex.patch | 42 +++++++++++++++++++++++----- 1 file changed, 35 insertions(+), 7 deletions(-) diff --git a/pandoc-default.latex-no-luatex.patch b/pandoc-default.latex-no-luatex.patch index 0c728a8..a299375 100644 --- a/pandoc-default.latex-no-luatex.patch +++ b/pandoc-default.latex-no-luatex.patch @@ -1,7 +1,7 @@ -diff -u pandoc-1.9.1.2/templates/default.latex\~ pandoc-1.9.1.2/templates/default.latex ---- pandoc-1.9.1.2/templates/default.latex~ 2012-03-10 07:53:17.000000000 +0900 -+++ pandoc-1.9.1.2/templates/default.latex 2012-03-23 18:18:31.619693151 +0900 -@@ -1,19 +1,20 @@ +diff -u pandoc-1.9.2/templates/default.latex\~ pandoc-1.9.2/templates/default.latex +--- pandoc-1.9.2/templates/default.latex~ 2012-04-06 05:13:56.000000000 +0900 ++++ pandoc-1.9.2/templates/default.latex 2012-04-25 13:20:25.024947625 +0900 +@@ -1,6 +1,7 @@ \documentclass[$if(fontsize)$$fontsize$,$endif$$if(lang)$$lang$,$endif$]{$documentclass$} \usepackage{amssymb,amsmath} -\usepackage{ifxetex,ifluatex} @@ -10,22 +10,50 @@ diff -u pandoc-1.9.1.2/templates/default.latex\~ pandoc-1.9.1.2/templates/defaul \ifxetex \usepackage{fontspec,xltxtra,xunicode} \defaultfontfeatures{Mapping=tex-text,Scale=MatchLowercase} - \newcommand{\euro}{€} +@@ -18,28 +19,28 @@ + \setmathfont{$mathfont$} + $endif$ \else - \ifluatex - \usepackage{fontspec} - \defaultfontfeatures{Mapping=tex-text,Scale=MatchLowercase} - \newcommand{\euro}{€} +-$if(mainfont)$ +- \setmainfont{$mainfont$} +-$endif$ +-$if(sansfont)$ +- \setsansfont{$sansfont$} +-$endif$ +-$if(monofont)$ +- \setmonofont{$monofont$} +-$endif$ +-$if(mathfont)$ +- \setmathfont{$mathfont$} +-$endif$ - \else +% \ifluatex +% \usepackage{fontspec} +% \defaultfontfeatures{Mapping=tex-text,Scale=MatchLowercase} +% \newcommand{\euro}{€} ++%$if(mainfont)$ ++% \setmainfont{$mainfont$} ++%$endif$ ++%$if(sansfont)$ ++% \setsansfont{$sansfont$} ++%$endif$ ++%$if(monofont)$ ++% \setmonofont{$monofont$} ++%$endif$ ++%$if(mathfont)$ ++% \setmathfont{$mathfont$} ++%$endif$ +% \else \usepackage[utf8]{inputenc} + $if(euro)$ \usepackage{eurosym} + $endif$ - \fi +% \fi \fi - $if(natbib)$ - \usepackage{natbib} + $if(geometry)$ + \usepackage[$for(geometry)$$geometry$$sep$,$endfor$]{geometry} From 5a7c748db33287083002d0dc22d2bd2f49c3ccf6 Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Sun, 10 Jun 2012 10:33:53 +0900 Subject: [PATCH 038/165] update to 1.9.4.1 --- .gitignore | 1 + pandoc.spec | 5 ++++- sources | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 1bd0241..2e4d389 100644 --- a/.gitignore +++ b/.gitignore @@ -5,3 +5,4 @@ /pandoc-1.9.1.1.tar.gz /pandoc-1.9.1.2.tar.gz /pandoc-1.9.2.tar.gz +/pandoc-1.9.4.1.tar.gz diff --git a/pandoc.spec b/pandoc.spec index 6d8795e..1de7428 100644 --- a/pandoc.spec +++ b/pandoc.spec @@ -13,7 +13,7 @@ reStructuredText, HTML, LaTeX, ConTeXt, Docbook, OpenDocument, ODT, RTF,\ MediaWiki, groff man pages, EPUB, and S5 and Slidy HTML slide shows. Name: %{pkg_name} -Version: 1.9.2 +Version: 1.9.4.1 Release: 1%{?dist} Summary: Markup conversion tool for markdown @@ -95,6 +95,9 @@ rm %{buildroot}%{_datadir}/%{name}-%{version}/{BUGS,COPYRIGHT,INSTALL,README,cha %changelog +* Sun Jun 10 2012 Jens Petersen - 1.9.4.1-1 +- update to 1.9.4.1 + * Wed Apr 25 2012 Jens Petersen - 1.9.2-1 - update to 1.9.2 diff --git a/sources b/sources index 9608653..a55aed6 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -ce0a11806df3e99ecb46a36ba00bfd59 pandoc-1.9.2.tar.gz +53276e2a09933b4cce7dac0e736ad87d pandoc-1.9.4.1.tar.gz From f56aa4037b966b768e06d157d95da0c8213d9793 Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Sun, 10 Jun 2012 21:48:47 +0900 Subject: [PATCH 039/165] update pandoc-default.latex-no-luatex.patch remove a couple of old unused 1.8 patches --- ....8.2.1-texlive2007-xelatex-outputdir.patch | 17 ----- pandoc-default.latex-no-luatex.patch | 72 +++++-------------- pandoc-enable-highlighting-flag.patch | 11 --- pandoc.spec | 4 +- 4 files changed, 19 insertions(+), 85 deletions(-) delete mode 100644 pandoc-1.8.2.1-texlive2007-xelatex-outputdir.patch delete mode 100644 pandoc-enable-highlighting-flag.patch diff --git a/pandoc-1.8.2.1-texlive2007-xelatex-outputdir.patch b/pandoc-1.8.2.1-texlive2007-xelatex-outputdir.patch deleted file mode 100644 index 151c576..0000000 --- a/pandoc-1.8.2.1-texlive2007-xelatex-outputdir.patch +++ /dev/null @@ -1,17 +0,0 @@ ---- pandoc-1.8.2.1/src/markdown2pdf.hs~ 2011-08-02 03:02:52.000000000 +0900 -+++ pandoc-1.8.2.1/src/markdown2pdf.hs 2011-12-22 12:08:02.528735085 +0900 -@@ -173,8 +173,12 @@ - - saveOutput :: FilePath -> FilePath -> IO () - saveOutput input output = do -- copyFile (encodeString input) (encodeString output) -- UTF8.hPutStrLn stderr $! "Created " ++ output -+ inExists <- doesFileExist (encodeString input) -+ when inExists $ -+ copyFile (encodeString input) (encodeString output) -+ outExists <- doesFileExist (encodeString input) -+ when outExists $ -+ UTF8.hPutStrLn stderr $! "Created " ++ output - - main :: IO () - main = bracket diff --git a/pandoc-default.latex-no-luatex.patch b/pandoc-default.latex-no-luatex.patch index a299375..b72c6c8 100644 --- a/pandoc-default.latex-no-luatex.patch +++ b/pandoc-default.latex-no-luatex.patch @@ -1,59 +1,23 @@ -diff -u pandoc-1.9.2/templates/default.latex\~ pandoc-1.9.2/templates/default.latex ---- pandoc-1.9.2/templates/default.latex~ 2012-04-06 05:13:56.000000000 +0900 -+++ pandoc-1.9.2/templates/default.latex 2012-04-25 13:20:25.024947625 +0900 -@@ -1,6 +1,7 @@ - \documentclass[$if(fontsize)$$fontsize$,$endif$$if(lang)$$lang$,$endif$]{$documentclass$} +diff -u pandoc-1.9.4.1/templates/default.latex\~ pandoc-1.9.4.1/templates/default.latex +--- pandoc-1.9.4.1/templates/default.latex~ 2012-06-09 05:53:31.000000000 +0900 ++++ pandoc-1.9.4.1/templates/default.latex 2012-06-10 21:43:32.321646301 +0900 +@@ -2,16 +2,16 @@ + \usepackage[T1]{fontenc} + \usepackage{lmodern} \usepackage{amssymb,amsmath} -\usepackage{ifxetex,ifluatex} -+%\usepackage{ifxetex,ifluatex} +\usepackage{ifxetex} - \ifxetex - \usepackage{fontspec,xltxtra,xunicode} - \defaultfontfeatures{Mapping=tex-text,Scale=MatchLowercase} -@@ -18,28 +19,28 @@ - \setmathfont{$mathfont$} - $endif$ - \else -- \ifluatex -- \usepackage{fontspec} -- \defaultfontfeatures{Mapping=tex-text,Scale=MatchLowercase} -- \newcommand{\euro}{€} --$if(mainfont)$ -- \setmainfont{$mainfont$} --$endif$ --$if(sansfont)$ -- \setsansfont{$sansfont$} --$endif$ --$if(monofont)$ -- \setmonofont{$monofont$} --$endif$ --$if(mathfont)$ -- \setmathfont{$mathfont$} --$endif$ -- \else -+% \ifluatex -+% \usepackage{fontspec} -+% \defaultfontfeatures{Mapping=tex-text,Scale=MatchLowercase} -+% \newcommand{\euro}{€} -+%$if(mainfont)$ -+% \setmainfont{$mainfont$} -+%$endif$ -+%$if(sansfont)$ -+% \setsansfont{$sansfont$} -+%$endif$ -+%$if(monofont)$ -+% \setmonofont{$monofont$} -+%$endif$ -+%$if(mathfont)$ -+% \setmathfont{$mathfont$} -+%$endif$ -+% \else - \usepackage[utf8]{inputenc} + \usepackage{fixltx2e} % provides \textsubscript + % use microtype if available + \IfFileExists{microtype.sty}{\usepackage{microtype}}{} +-\ifnum 0\ifxetex 1\fi\ifluatex 1\fi=0 % if pdftex ++\ifnum 0\ifxetex 1\fi=0 % if pdftex + \usepackage[utf8]{inputenc} $if(euro)$ - \usepackage{eurosym} + \usepackage{eurosym} $endif$ -- \fi -+% \fi - \fi - $if(geometry)$ - \usepackage[$for(geometry)$$geometry$$sep$,$endfor$]{geometry} +-\else % if luatex or xelatex ++\else % if xelatex + \usepackage{fontspec} + \ifxetex + \usepackage{xltxtra,xunicode} diff --git a/pandoc-enable-highlighting-flag.patch b/pandoc-enable-highlighting-flag.patch deleted file mode 100644 index e152ee7..0000000 --- a/pandoc-enable-highlighting-flag.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- pandoc-1.8.2.1/pandoc.cabal~ 2011-08-02 03:02:52.000000000 +0900 -+++ pandoc-1.8.2.1/pandoc.cabal 2012-01-26 11:44:45.097493599 +0900 -@@ -168,7 +168,7 @@ - Default: True - Flag highlighting - Description: Compile in support for syntax highlighting of code blocks. -- Default: False -+ Default: True - Flag executable - Description: Build the pandoc executable. - Default: True diff --git a/pandoc.spec b/pandoc.spec index 1de7428..181c1e6 100644 --- a/pandoc.spec +++ b/pandoc.spec @@ -47,9 +47,8 @@ BuildRequires: ghc-xml-prof BuildRequires: ghc-zip-archive-prof BuildRequires: ghc-zlib-prof Obsoletes: pandoc-markdown2pdf < %{version}-%{release} -# these two patches should be removed when texlive gets updated +# this patch should be removed when texlive gets updated Patch1: pandoc-default.latex-no-luatex.patch -#Patch2: pandoc-1.8.2.1-texlive2007-xelatex-outputdir.patch %description %{common_description} @@ -58,7 +57,6 @@ Patch1: pandoc-default.latex-no-luatex.patch %prep %setup -q %patch1 -p1 -b .orig -#%%patch2 -p1 -b .orig %build From 5c14b088e7f547b733e5d0e1c462da1b1b3f73de Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Thu, 21 Jun 2012 18:41:18 +0900 Subject: [PATCH 040/165] rebuild --- pandoc.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pandoc.spec b/pandoc.spec index 181c1e6..2a18c94 100644 --- a/pandoc.spec +++ b/pandoc.spec @@ -14,7 +14,7 @@ MediaWiki, groff man pages, EPUB, and S5 and Slidy HTML slide shows. Name: %{pkg_name} Version: 1.9.4.1 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Markup conversion tool for markdown Group: Applications/Publishing @@ -93,6 +93,9 @@ rm %{buildroot}%{_datadir}/%{name}-%{version}/{BUGS,COPYRIGHT,INSTALL,README,cha %changelog +* Thu Jun 21 2012 Jens Petersen - 1.9.4.1-2 +- rebuild + * Sun Jun 10 2012 Jens Petersen - 1.9.4.1-1 - update to 1.9.4.1 From e37dab953129f345a6aad6a99add20894eaab1c1 Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Fri, 22 Jun 2012 19:52:07 +0900 Subject: [PATCH 041/165] .chain-deps: don't need dlist --- .chain-deps | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.chain-deps b/.chain-deps index 52c3d29..8398e54 100644 --- a/.chain-deps +++ b/.chain-deps @@ -1 +1 @@ -ghc-base64-bytestring ghc-digest ghc-dlist ghc-json ghc-pandoc-types ghc-pcre-light ghc-temporary ghc-tagsoup ghc-xml : ghc-citeproc-hs ghc-texmath ghc-zip-archive highlighting-kate : +ghc-base64-bytestring ghc-digest ghc-json ghc-pandoc-types ghc-pcre-light ghc-temporary ghc-tagsoup ghc-xml : ghc-citeproc-hs ghc-texmath ghc-zip-archive highlighting-kate : From 92b0272af04a7eff463057bc4f64aee6994b2f56 Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Sun, 15 Jul 2012 23:06:57 +0900 Subject: [PATCH 042/165] update to 1.9.4.2, add hsmarkdown symlink --- .gitignore | 1 + pandoc.spec | 53 +++++++++++++++++++++++++++++++---------------------- sources | 2 +- 3 files changed, 33 insertions(+), 23 deletions(-) diff --git a/.gitignore b/.gitignore index 2e4d389..6b1b7ba 100644 --- a/.gitignore +++ b/.gitignore @@ -6,3 +6,4 @@ /pandoc-1.9.1.2.tar.gz /pandoc-1.9.2.tar.gz /pandoc-1.9.4.1.tar.gz +/pandoc-1.9.4.2.tar.gz diff --git a/pandoc.spec b/pandoc.spec index 2a18c94..c369308 100644 --- a/pandoc.spec +++ b/pandoc.spec @@ -13,8 +13,8 @@ reStructuredText, HTML, LaTeX, ConTeXt, Docbook, OpenDocument, ODT, RTF,\ MediaWiki, groff man pages, EPUB, and S5 and Slidy HTML slide shows. Name: %{pkg_name} -Version: 1.9.4.1 -Release: 2%{?dist} +Version: 1.9.4.2 +Release: 1%{?dist} Summary: Markup conversion tool for markdown Group: Applications/Publishing @@ -26,26 +26,26 @@ ExclusiveArch: %{ghc_arches} BuildRequires: ghc-Cabal-devel BuildRequires: ghc-rpm-macros %{!?without_hscolour:hscolour} # END cabal2spec -BuildRequires: ghc-base64-bytestring-prof -BuildRequires: ghc-blaze-html-prof -BuildRequires: ghc-citeproc-hs-prof -BuildRequires: ghc-extensible-exceptions-prof -BuildRequires: ghc-highlighting-kate-prof -BuildRequires: ghc-HTTP-prof -BuildRequires: ghc-json-prof -BuildRequires: ghc-mtl-prof -BuildRequires: ghc-network-prof -BuildRequires: ghc-pandoc-types-prof -BuildRequires: ghc-parsec-prof -BuildRequires: ghc-random-prof -BuildRequires: ghc-tagsoup-prof -BuildRequires: ghc-temporary-prof -BuildRequires: ghc-texmath-prof -BuildRequires: ghc-utf8-string-prof -BuildRequires: ghc-xhtml-prof -BuildRequires: ghc-xml-prof -BuildRequires: ghc-zip-archive-prof -BuildRequires: ghc-zlib-prof +BuildRequires: ghc-base64-bytestring-devel +BuildRequires: ghc-blaze-html-devel +BuildRequires: ghc-citeproc-hs-devel +BuildRequires: ghc-extensible-exceptions-devel +BuildRequires: ghc-highlighting-kate-devel +BuildRequires: ghc-HTTP-devel +BuildRequires: ghc-json-devel +BuildRequires: ghc-mtl-devel +BuildRequires: ghc-network-devel +BuildRequires: ghc-pandoc-types-devel +BuildRequires: ghc-parsec-devel +BuildRequires: ghc-random-devel +BuildRequires: ghc-tagsoup-devel +BuildRequires: ghc-temporary-devel +BuildRequires: ghc-texmath-devel +BuildRequires: ghc-utf8-string-devel +BuildRequires: ghc-xhtml-devel +BuildRequires: ghc-xml-devel +BuildRequires: ghc-zip-archive-devel +BuildRequires: ghc-zlib-devel Obsoletes: pandoc-markdown2pdf < %{version}-%{release} # this patch should be removed when texlive gets updated Patch1: pandoc-default.latex-no-luatex.patch @@ -68,6 +68,9 @@ Patch1: pandoc-default.latex-no-luatex.patch rm %{buildroot}%{_datadir}/%{name}-%{version}/{BUGS,COPYRIGHT,INSTALL,README,changelog} +ln -s pandoc %{buildroot}%{_bindir}/hsmarkdown + + %ghc_package %ghc_description @@ -84,6 +87,7 @@ rm %{buildroot}%{_datadir}/%{name}-%{version}/{BUGS,COPYRIGHT,INSTALL,README,cha %files %doc BUGS COPYING COPYRIGHT README* changelog %attr(755,root,root) %{_bindir}/%{name} +%attr(-,root,root) %{_bindir}/hsmarkdown %{_datadir}/%{name}-%{version} %attr(644,root,root) %{_mandir}/man1/pandoc.1* %attr(644,root,root) %{_mandir}/man5/* @@ -93,6 +97,11 @@ rm %{buildroot}%{_datadir}/%{name}-%{version}/{BUGS,COPYRIGHT,INSTALL,README,cha %changelog +* Sun Jul 15 2012 Jens Petersen - 1.9.4.2-1 +- update to 1.9.4.2 +- add hsmarkdown symlink +- change prof BRs to devel + * Thu Jun 21 2012 Jens Petersen - 1.9.4.1-2 - rebuild diff --git a/sources b/sources index a55aed6..64807a8 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -53276e2a09933b4cce7dac0e736ad87d pandoc-1.9.4.1.tar.gz +c099360947d0cbb90608ce2f6a217071 pandoc-1.9.4.2.tar.gz From 9580b38564b9a6b7e088e53e51fcd926fe0b5b09 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Fri, 20 Jul 2012 03:10:40 -0500 Subject: [PATCH 043/165] - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild --- pandoc.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pandoc.spec b/pandoc.spec index c369308..6502768 100644 --- a/pandoc.spec +++ b/pandoc.spec @@ -14,7 +14,7 @@ MediaWiki, groff man pages, EPUB, and S5 and Slidy HTML slide shows. Name: %{pkg_name} Version: 1.9.4.2 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Markup conversion tool for markdown Group: Applications/Publishing @@ -97,6 +97,9 @@ ln -s pandoc %{buildroot}%{_bindir}/hsmarkdown %changelog +* Fri Jul 20 2012 Fedora Release Engineering - 1.9.4.2-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild + * Sun Jul 15 2012 Jens Petersen - 1.9.4.2-1 - update to 1.9.4.2 - add hsmarkdown symlink From 057736738fcc12b2ac01d586a40be0e80984d9ef Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Fri, 28 Sep 2012 17:05:35 +0900 Subject: [PATCH 044/165] disable luatex in default.beamer (#861300) reported by Shakthi Kannan --- pandoc-default.latex-no-luatex.patch | 23 ------------- pandoc-templates-disable-luatex.patch | 48 +++++++++++++++++++++++++++ pandoc.spec | 7 ++-- 3 files changed, 53 insertions(+), 25 deletions(-) delete mode 100644 pandoc-default.latex-no-luatex.patch create mode 100644 pandoc-templates-disable-luatex.patch diff --git a/pandoc-default.latex-no-luatex.patch b/pandoc-default.latex-no-luatex.patch deleted file mode 100644 index b72c6c8..0000000 --- a/pandoc-default.latex-no-luatex.patch +++ /dev/null @@ -1,23 +0,0 @@ -diff -u pandoc-1.9.4.1/templates/default.latex\~ pandoc-1.9.4.1/templates/default.latex ---- pandoc-1.9.4.1/templates/default.latex~ 2012-06-09 05:53:31.000000000 +0900 -+++ pandoc-1.9.4.1/templates/default.latex 2012-06-10 21:43:32.321646301 +0900 -@@ -2,16 +2,16 @@ - \usepackage[T1]{fontenc} - \usepackage{lmodern} - \usepackage{amssymb,amsmath} --\usepackage{ifxetex,ifluatex} -+\usepackage{ifxetex} - \usepackage{fixltx2e} % provides \textsubscript - % use microtype if available - \IfFileExists{microtype.sty}{\usepackage{microtype}}{} --\ifnum 0\ifxetex 1\fi\ifluatex 1\fi=0 % if pdftex -+\ifnum 0\ifxetex 1\fi=0 % if pdftex - \usepackage[utf8]{inputenc} - $if(euro)$ - \usepackage{eurosym} - $endif$ --\else % if luatex or xelatex -+\else % if xelatex - \usepackage{fontspec} - \ifxetex - \usepackage{xltxtra,xunicode} diff --git a/pandoc-templates-disable-luatex.patch b/pandoc-templates-disable-luatex.patch new file mode 100644 index 0000000..c3f08fa --- /dev/null +++ b/pandoc-templates-disable-luatex.patch @@ -0,0 +1,48 @@ +diff -up pandoc-1.9.4.2/templates/default.beamer~ pandoc-1.9.4.2/templates/default.beamer +--- pandoc-1.9.4.2/templates/default.beamer~ 2012-06-30 00:34:35.000000000 +0900 ++++ pandoc-1.9.4.2/templates/default.beamer 2012-09-28 16:47:50.937842182 +0900 +@@ -6,18 +6,19 @@ $if(colortheme)$ + \usecolortheme{$colortheme$} + $endif$ + \usepackage{amssymb,amsmath} +-\usepackage{ifxetex,ifluatex} ++%\usepackage{ifxetex,ifluatex} ++\usepackage{ifxetex} + \usepackage{fixltx2e} % provides \textsubscript + \ifxetex + \usepackage{fontspec,xltxtra,xunicode} + \defaultfontfeatures{Mapping=tex-text,Scale=MatchLowercase} + \else +- \ifluatex +- \usepackage{fontspec} +- \defaultfontfeatures{Mapping=tex-text,Scale=MatchLowercase} +- \else ++% \ifluatex ++% \usepackage{fontspec} ++% \defaultfontfeatures{Mapping=tex-text,Scale=MatchLowercase} ++% \else + \usepackage[utf8]{inputenc} +- \fi ++% \fi + \fi + $if(natbib)$ + \usepackage{natbib} +diff -up pandoc-1.9.4.2/templates/default.latex~ pandoc-1.9.4.2/templates/default.latex +--- pandoc-1.9.4.2/templates/default.latex~ 2012-06-30 00:34:35.000000000 +0900 ++++ pandoc-1.9.4.2/templates/default.latex 2012-09-28 16:56:13.949987292 +0900 +@@ -2,11 +2,13 @@ + \usepackage[T1]{fontenc} + \usepackage{lmodern} + \usepackage{amssymb,amsmath} +-\usepackage{ifxetex,ifluatex} ++%\usepackage{ifxetex,ifluatex} ++\usepackage{ifxetex} + \usepackage{fixltx2e} % provides \textsubscript + % use microtype if available + \IfFileExists{microtype.sty}{\usepackage{microtype}}{} +-\ifnum 0\ifxetex 1\fi\ifluatex 1\fi=0 % if pdftex ++%\ifnum 0\ifxetex 1\fi\ifluatex 1\fi=0 % if pdftex ++\ifnum 0\ifxetex 1\fi=0 % if pdftex + \usepackage[utf8]{inputenc} + $if(euro)$ + \usepackage{eurosym} diff --git a/pandoc.spec b/pandoc.spec index 6502768..a3a5254 100644 --- a/pandoc.spec +++ b/pandoc.spec @@ -14,7 +14,7 @@ MediaWiki, groff man pages, EPUB, and S5 and Slidy HTML slide shows. Name: %{pkg_name} Version: 1.9.4.2 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Markup conversion tool for markdown Group: Applications/Publishing @@ -48,7 +48,7 @@ BuildRequires: ghc-zip-archive-devel BuildRequires: ghc-zlib-devel Obsoletes: pandoc-markdown2pdf < %{version}-%{release} # this patch should be removed when texlive gets updated -Patch1: pandoc-default.latex-no-luatex.patch +Patch1: pandoc-templates-disable-luatex.patch %description %{common_description} @@ -97,6 +97,9 @@ ln -s pandoc %{buildroot}%{_bindir}/hsmarkdown %changelog +* Fri Sep 28 2012 Jens Petersen - 1.9.4.2-3 +- also disable luatex in the default.beamer template (#861300) + * Fri Jul 20 2012 Fedora Release Engineering - 1.9.4.2-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild From bec480deb204c6b73b1e7dffae8ee2108863290b Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Tue, 2 Oct 2012 12:14:10 +0900 Subject: [PATCH 045/165] add a pdf subpackage with texlive requires --- pandoc.spec | 24 ++++++++++++++++++++++-- 1 file changed, 22 insertions(+), 2 deletions(-) diff --git a/pandoc.spec b/pandoc.spec index a3a5254..5aeda7f 100644 --- a/pandoc.spec +++ b/pandoc.spec @@ -14,7 +14,7 @@ MediaWiki, groff man pages, EPUB, and S5 and Slidy HTML slide shows. Name: %{pkg_name} Version: 1.9.4.2 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Markup conversion tool for markdown Group: Applications/Publishing @@ -46,13 +46,30 @@ BuildRequires: ghc-xhtml-devel BuildRequires: ghc-xml-devel BuildRequires: ghc-zip-archive-devel BuildRequires: ghc-zlib-devel -Obsoletes: pandoc-markdown2pdf < %{version}-%{release} # this patch should be removed when texlive gets updated Patch1: pandoc-templates-disable-luatex.patch %description %{common_description} +For pdf output please also install pandoc-pdf. + + +%package pdf +Summary: Metapackage for pandoc xetex support +Requires: %{name} = %{version} +# for pdflatex +Requires: texlive-latex +# for xelatex and ifxetex.sty +Requires: texlive-xetex +Obsoletes: pandoc-markdown2pdf < %{version}-%{release} + +%description pdf +%{common_description} + +This package pulls in the texlive latex and xetex packages +needed by pandoc to generate pdf output. + %prep %setup -q @@ -97,6 +114,9 @@ ln -s pandoc %{buildroot}%{_bindir}/hsmarkdown %changelog +* Tue Oct 2 2012 Jens Petersen - 1.9.4.2-4 +- add a pdf meta-subpackage for the texlive packages needed for pdf output + * Fri Sep 28 2012 Jens Petersen - 1.9.4.2-3 - also disable luatex in the default.beamer template (#861300) From 763914a38b3137b8a5b92d595042b2ce5e980328 Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Tue, 2 Oct 2012 12:35:12 +0900 Subject: [PATCH 046/165] add files section for the pdf subpackage --- pandoc.spec | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/pandoc.spec b/pandoc.spec index 5aeda7f..369851e 100644 --- a/pandoc.spec +++ b/pandoc.spec @@ -14,7 +14,7 @@ MediaWiki, groff man pages, EPUB, and S5 and Slidy HTML slide shows. Name: %{pkg_name} Version: 1.9.4.2 -Release: 4%{?dist} +Release: 5%{?dist} Summary: Markup conversion tool for markdown Group: Applications/Publishing @@ -110,10 +110,16 @@ ln -s pandoc %{buildroot}%{_bindir}/hsmarkdown %attr(644,root,root) %{_mandir}/man5/* +%files pdf + + %ghc_files COPYRIGHT %changelog +* Tue Oct 2 2012 Jens Petersen - 1.9.4.2-5 +- add a files section for the pdf subpackage so it is actually created + * Tue Oct 2 2012 Jens Petersen - 1.9.4.2-4 - add a pdf meta-subpackage for the texlive packages needed for pdf output From 3bdd3fce00c523e8fab9fd3fcba012abe9f10327 Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Fri, 26 Oct 2012 16:18:12 +0900 Subject: [PATCH 047/165] disable threaded runtime also to allow building on all secondary archs --- pandoc-1.9.4-no-threaded-runtime.patch | 42 ++++++++++++++++++++++++++ pandoc.spec | 7 ++++- 2 files changed, 48 insertions(+), 1 deletion(-) create mode 100644 pandoc-1.9.4-no-threaded-runtime.patch diff --git a/pandoc-1.9.4-no-threaded-runtime.patch b/pandoc-1.9.4-no-threaded-runtime.patch new file mode 100644 index 0000000..72aa335 --- /dev/null +++ b/pandoc-1.9.4-no-threaded-runtime.patch @@ -0,0 +1,42 @@ +Description: Don't build with the threaded runtime. It causes build failures + and has a performance penalty. +Origin: upstream, commit:a5db4246656afae3541936269e727d9a9cc39795 +Forwarded: not-needed +Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=682433 + +Index: b/pandoc.cabal +=================================================================== +--- a/pandoc.cabal ++++ b/pandoc.cabal +@@ -344,12 +344,12 @@ + else + Build-depends: base >= 3 && < 4 + if impl(ghc >= 7.0.1) +- Ghc-Options: -O2 -rtsopts -threaded -Wall -fno-warn-unused-do-bind -dno-debug-output ++ Ghc-Options: -O2 -rtsopts -Wall -fno-warn-unused-do-bind -dno-debug-output + else + if impl(ghc >= 6.12) +- Ghc-Options: -O2 -Wall -threaded -fno-warn-unused-do-bind -dno-debug-output ++ Ghc-Options: -O2 -Wall -fno-warn-unused-do-bind -dno-debug-output + else +- Ghc-Options: -O2 -Wall -threaded ++ Ghc-Options: -O2 -Wall + if impl(ghc >= 7.0.1) + Ghc-Prof-Options: -auto-all -caf-all -rtsopts + else +@@ -411,12 +411,12 @@ + else + Build-depends: base >= 3 && < 4 + if impl(ghc >= 7.0.1) +- Ghc-Options: -O2 -rtsopts -threaded -Wall -fno-warn-unused-do-bind -dno-debug-output ++ Ghc-Options: -O2 -rtsopts -Wall -fno-warn-unused-do-bind -dno-debug-output + else + if impl(ghc >= 6.12) +- Ghc-Options: -O2 -Wall -threaded -fno-warn-unused-do-bind -dno-debug-output ++ Ghc-Options: -O2 -Wall -fno-warn-unused-do-bind -dno-debug-output + else +- Ghc-Options: -O2 -Wall -threaded ++ Ghc-Options: -O2 -Wall + if impl(ghc >= 7.0.1) + Ghc-Prof-Options: -auto-all -caf-all -rtsopts + else diff --git a/pandoc.spec b/pandoc.spec index 369851e..5748ccb 100644 --- a/pandoc.spec +++ b/pandoc.spec @@ -14,7 +14,7 @@ MediaWiki, groff man pages, EPUB, and S5 and Slidy HTML slide shows. Name: %{pkg_name} Version: 1.9.4.2 -Release: 5%{?dist} +Release: 6%{?dist} Summary: Markup conversion tool for markdown Group: Applications/Publishing @@ -48,6 +48,7 @@ BuildRequires: ghc-zip-archive-devel BuildRequires: ghc-zlib-devel # this patch should be removed when texlive gets updated Patch1: pandoc-templates-disable-luatex.patch +Patch2: pandoc-1.9.4-no-threaded-runtime.patch %description %{common_description} @@ -74,6 +75,7 @@ needed by pandoc to generate pdf output. %prep %setup -q %patch1 -p1 -b .orig +%patch2 -p1 -b .orig %build @@ -117,6 +119,9 @@ ln -s pandoc %{buildroot}%{_bindir}/hsmarkdown %changelog +* Fri Oct 26 2012 Jens Petersen - 1.9.4.2-6 +- disable threaded rts with upstream patch copied from Debian + * Tue Oct 2 2012 Jens Petersen - 1.9.4.2-5 - add a files section for the pdf subpackage so it is actually created From 7320d47dc32c724caa64042d8203533af34e50ff Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Fri, 26 Oct 2012 16:22:01 +0900 Subject: [PATCH 048/165] add bz reference for threaded rts issue (#862543) --- pandoc.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pandoc.spec b/pandoc.spec index 5748ccb..b9e096d 100644 --- a/pandoc.spec +++ b/pandoc.spec @@ -120,7 +120,7 @@ ln -s pandoc %{buildroot}%{_bindir}/hsmarkdown %changelog * Fri Oct 26 2012 Jens Petersen - 1.9.4.2-6 -- disable threaded rts with upstream patch copied from Debian +- disable threaded rts with upstream patch copied from Debian (#862543) * Tue Oct 2 2012 Jens Petersen - 1.9.4.2-5 - add a files section for the pdf subpackage so it is actually created From 9f4ea14bb02d69575d8f8cee1b47e381c053e21d Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Fri, 26 Oct 2012 16:38:15 +0900 Subject: [PATCH 049/165] simplify the common description --- pandoc.spec | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pandoc.spec b/pandoc.spec index b9e096d..8f1f11b 100644 --- a/pandoc.spec +++ b/pandoc.spec @@ -6,11 +6,11 @@ %global common_summary Haskell %{pkg_name} library -%global common_description Pandoc is a Haskell library for converting from one markup format to another,\ -and a command-line tool that uses this library. It can read markdown and\ -(subsets of) reStructuredText, HTML, and LaTeX, and it can write markdown,\ -reStructuredText, HTML, LaTeX, ConTeXt, Docbook, OpenDocument, ODT, RTF,\ -MediaWiki, groff man pages, EPUB, and S5 and Slidy HTML slide shows. +%global common_description Pandoc is a tool and Haskell library for converting markup formats.\ +It can read markdown and (subsets of) reStructuredText, HTML, and LaTeX,\ +and can write markdown, reStructuredText, HTML, LaTeX, ConTeXt, Docbook,\ +OpenDocument, ODT, RTF, MediaWiki, groff man pages, EPUB, and\ +S5 and Slidy HTML slideshows. Name: %{pkg_name} Version: 1.9.4.2 From d41017c1866125a87982b56d36af5933965a7199 Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Sat, 27 Oct 2012 21:49:32 +0900 Subject: [PATCH 050/165] update to 1.9.4.5 --- .gitignore | 1 + pandoc.spec | 43 +++++++++++++++++++++++++++++-------------- sources | 2 +- 3 files changed, 31 insertions(+), 15 deletions(-) diff --git a/.gitignore b/.gitignore index 6b1b7ba..a7be265 100644 --- a/.gitignore +++ b/.gitignore @@ -7,3 +7,4 @@ /pandoc-1.9.2.tar.gz /pandoc-1.9.4.1.tar.gz /pandoc-1.9.4.2.tar.gz +/pandoc-1.9.4.5.tar.gz diff --git a/pandoc.spec b/pandoc.spec index 8f1f11b..f8520b8 100644 --- a/pandoc.spec +++ b/pandoc.spec @@ -1,4 +1,3 @@ -# cabal2spec-0.25.2 # https://fedoraproject.org/wiki/Packaging:Haskell # https://fedoraproject.org/wiki/PackagingDrafts/Haskell @@ -7,45 +6,57 @@ %global common_summary Haskell %{pkg_name} library %global common_description Pandoc is a tool and Haskell library for converting markup formats.\ -It can read markdown and (subsets of) reStructuredText, HTML, and LaTeX,\ -and can write markdown, reStructuredText, HTML, LaTeX, ConTeXt, Docbook,\ -OpenDocument, ODT, RTF, MediaWiki, groff man pages, EPUB, and\ -S5 and Slidy HTML slideshows. +It can read markdown and (subsets of) HTML, reStructuredText, LaTeX, DocBook,\ +and Textile, and can write markdown, reStructuredText, HTML, LaTeX, ConTeXt,\ +Docbook, OpenDocument, ODT, Word docx, RTF, MediaWiki, Textile, groff man pages,\ +plain text, Emacs Org-Mode, AsciiDoc, EPUB, and S5, Slidy and Slideous HTML\ +slide-shows.\ +\ +Pandoc extends standard markdown syntax with footnotes, embedded LaTeX,\ +definition lists, tables, and other features. A compatibility mode is\ +provided for those who need a drop-in replacement for Markdown.pl. Name: %{pkg_name} -Version: 1.9.4.2 -Release: 6%{?dist} +Version: 1.9.4.5 +Release: 1%{?dist} Summary: Markup conversion tool for markdown -Group: Applications/Publishing License: GPLv2+ -# BEGIN cabal2spec URL: http://hackage.haskell.org/package/%{name} Source0: http://hackage.haskell.org/packages/archive/%{name}/%{version}/%{name}-%{version}.tar.gz -ExclusiveArch: %{ghc_arches} + BuildRequires: ghc-Cabal-devel -BuildRequires: ghc-rpm-macros %{!?without_hscolour:hscolour} -# END cabal2spec +BuildRequires: ghc-rpm-macros +# Begin cabal-rpm deps: +BuildRequires: ghc-HTTP-devel BuildRequires: ghc-base64-bytestring-devel BuildRequires: ghc-blaze-html-devel +BuildRequires: ghc-bytestring-devel BuildRequires: ghc-citeproc-hs-devel +BuildRequires: ghc-containers-devel +BuildRequires: ghc-directory-devel BuildRequires: ghc-extensible-exceptions-devel +BuildRequires: ghc-filepath-devel BuildRequires: ghc-highlighting-kate-devel -BuildRequires: ghc-HTTP-devel BuildRequires: ghc-json-devel BuildRequires: ghc-mtl-devel BuildRequires: ghc-network-devel +BuildRequires: ghc-old-locale-devel +BuildRequires: ghc-old-time-devel BuildRequires: ghc-pandoc-types-devel BuildRequires: ghc-parsec-devel +BuildRequires: ghc-process-devel BuildRequires: ghc-random-devel +BuildRequires: ghc-syb-devel BuildRequires: ghc-tagsoup-devel BuildRequires: ghc-temporary-devel BuildRequires: ghc-texmath-devel +BuildRequires: ghc-time-devel BuildRequires: ghc-utf8-string-devel -BuildRequires: ghc-xhtml-devel BuildRequires: ghc-xml-devel BuildRequires: ghc-zip-archive-devel BuildRequires: ghc-zlib-devel +# End cabal-rpm deps # this patch should be removed when texlive gets updated Patch1: pandoc-templates-disable-luatex.patch Patch2: pandoc-1.9.4-no-threaded-runtime.patch @@ -119,6 +130,10 @@ ln -s pandoc %{buildroot}%{_bindir}/hsmarkdown %changelog +* Fri Oct 26 2012 Jens Petersen - 1.9.4.5-1 +- update to 1.9.4.5 +- refresh with cabal-rpm + * Fri Oct 26 2012 Jens Petersen - 1.9.4.2-6 - disable threaded rts with upstream patch copied from Debian (#862543) diff --git a/sources b/sources index 64807a8..a8ef220 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -c099360947d0cbb90608ce2f6a217071 pandoc-1.9.4.2.tar.gz +9b37e70689a2e9f7ae65313b52481e4c pandoc-1.9.4.5.tar.gz From 9c77096c470a798aebbb9944247917b3039300cd Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Wed, 31 Oct 2012 14:18:40 +0900 Subject: [PATCH 051/165] drop the latex template patch for old TeXLive --- pandoc-templates-disable-luatex.patch | 48 --------------------------- pandoc.spec | 11 +++--- 2 files changed, 4 insertions(+), 55 deletions(-) delete mode 100644 pandoc-templates-disable-luatex.patch diff --git a/pandoc-templates-disable-luatex.patch b/pandoc-templates-disable-luatex.patch deleted file mode 100644 index c3f08fa..0000000 --- a/pandoc-templates-disable-luatex.patch +++ /dev/null @@ -1,48 +0,0 @@ -diff -up pandoc-1.9.4.2/templates/default.beamer~ pandoc-1.9.4.2/templates/default.beamer ---- pandoc-1.9.4.2/templates/default.beamer~ 2012-06-30 00:34:35.000000000 +0900 -+++ pandoc-1.9.4.2/templates/default.beamer 2012-09-28 16:47:50.937842182 +0900 -@@ -6,18 +6,19 @@ $if(colortheme)$ - \usecolortheme{$colortheme$} - $endif$ - \usepackage{amssymb,amsmath} --\usepackage{ifxetex,ifluatex} -+%\usepackage{ifxetex,ifluatex} -+\usepackage{ifxetex} - \usepackage{fixltx2e} % provides \textsubscript - \ifxetex - \usepackage{fontspec,xltxtra,xunicode} - \defaultfontfeatures{Mapping=tex-text,Scale=MatchLowercase} - \else -- \ifluatex -- \usepackage{fontspec} -- \defaultfontfeatures{Mapping=tex-text,Scale=MatchLowercase} -- \else -+% \ifluatex -+% \usepackage{fontspec} -+% \defaultfontfeatures{Mapping=tex-text,Scale=MatchLowercase} -+% \else - \usepackage[utf8]{inputenc} -- \fi -+% \fi - \fi - $if(natbib)$ - \usepackage{natbib} -diff -up pandoc-1.9.4.2/templates/default.latex~ pandoc-1.9.4.2/templates/default.latex ---- pandoc-1.9.4.2/templates/default.latex~ 2012-06-30 00:34:35.000000000 +0900 -+++ pandoc-1.9.4.2/templates/default.latex 2012-09-28 16:56:13.949987292 +0900 -@@ -2,11 +2,13 @@ - \usepackage[T1]{fontenc} - \usepackage{lmodern} - \usepackage{amssymb,amsmath} --\usepackage{ifxetex,ifluatex} -+%\usepackage{ifxetex,ifluatex} -+\usepackage{ifxetex} - \usepackage{fixltx2e} % provides \textsubscript - % use microtype if available - \IfFileExists{microtype.sty}{\usepackage{microtype}}{} --\ifnum 0\ifxetex 1\fi\ifluatex 1\fi=0 % if pdftex -+%\ifnum 0\ifxetex 1\fi\ifluatex 1\fi=0 % if pdftex -+\ifnum 0\ifxetex 1\fi=0 % if pdftex - \usepackage[utf8]{inputenc} - $if(euro)$ - \usepackage{eurosym} diff --git a/pandoc.spec b/pandoc.spec index f8520b8..5733881 100644 --- a/pandoc.spec +++ b/pandoc.spec @@ -18,7 +18,7 @@ provided for those who need a drop-in replacement for Markdown.pl. Name: %{pkg_name} Version: 1.9.4.5 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Markup conversion tool for markdown License: GPLv2+ @@ -57,8 +57,6 @@ BuildRequires: ghc-xml-devel BuildRequires: ghc-zip-archive-devel BuildRequires: ghc-zlib-devel # End cabal-rpm deps -# this patch should be removed when texlive gets updated -Patch1: pandoc-templates-disable-luatex.patch Patch2: pandoc-1.9.4-no-threaded-runtime.patch %description @@ -70,10 +68,7 @@ For pdf output please also install pandoc-pdf. %package pdf Summary: Metapackage for pandoc xetex support Requires: %{name} = %{version} -# for pdflatex Requires: texlive-latex -# for xelatex and ifxetex.sty -Requires: texlive-xetex Obsoletes: pandoc-markdown2pdf < %{version}-%{release} %description pdf @@ -85,7 +80,6 @@ needed by pandoc to generate pdf output. %prep %setup -q -%patch1 -p1 -b .orig %patch2 -p1 -b .orig @@ -130,6 +124,9 @@ ln -s pandoc %{buildroot}%{_bindir}/hsmarkdown %changelog +* Wed Oct 31 2012 Jens Petersen - 1.9.4.5-2 +- drop the latex template patch for old TeXLive + * Fri Oct 26 2012 Jens Petersen - 1.9.4.5-1 - update to 1.9.4.5 - refresh with cabal-rpm From b89b8f509a8c5e72fcba694fe940ac9f8ac22f7e Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Mon, 19 Nov 2012 21:43:59 +0900 Subject: [PATCH 052/165] rebuild --- pandoc.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pandoc.spec b/pandoc.spec index 5733881..1be1b4a 100644 --- a/pandoc.spec +++ b/pandoc.spec @@ -18,7 +18,7 @@ provided for those who need a drop-in replacement for Markdown.pl. Name: %{pkg_name} Version: 1.9.4.5 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Markup conversion tool for markdown License: GPLv2+ @@ -124,6 +124,9 @@ ln -s pandoc %{buildroot}%{_bindir}/hsmarkdown %changelog +* Mon Nov 19 2012 Jens Petersen - 1.9.4.5-3 +- rebuild + * Wed Oct 31 2012 Jens Petersen - 1.9.4.5-2 - drop the latex template patch for old TeXLive From d7e1fce6a5fbe401d6c85a9b8a92c89cef1c2889 Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Wed, 21 Nov 2012 15:36:16 +0900 Subject: [PATCH 053/165] rebuild --- pandoc.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pandoc.spec b/pandoc.spec index 1be1b4a..da3d80d 100644 --- a/pandoc.spec +++ b/pandoc.spec @@ -18,7 +18,7 @@ provided for those who need a drop-in replacement for Markdown.pl. Name: %{pkg_name} Version: 1.9.4.5 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Markup conversion tool for markdown License: GPLv2+ From 02962409f9a44ffb8ab3bf21959b0810b7c4ab28 Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Mon, 3 Dec 2012 18:09:54 +0900 Subject: [PATCH 054/165] add missing last changelog entry --- pandoc.spec | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pandoc.spec b/pandoc.spec index da3d80d..e774e69 100644 --- a/pandoc.spec +++ b/pandoc.spec @@ -124,6 +124,9 @@ ln -s pandoc %{buildroot}%{_bindir}/hsmarkdown %changelog +* Wed Nov 21 2012 Jens Petersen - 1.9.4.5-4 +- rebuild + * Mon Nov 19 2012 Jens Petersen - 1.9.4.5-3 - rebuild From 45f41ee03455355ed00549e49e1c4888bfdbdfc0 Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Tue, 4 Dec 2012 10:18:04 +0900 Subject: [PATCH 055/165] move patch before BRs --- pandoc.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pandoc.spec b/pandoc.spec index e774e69..a8008df 100644 --- a/pandoc.spec +++ b/pandoc.spec @@ -24,6 +24,7 @@ Summary: Markup conversion tool for markdown License: GPLv2+ URL: http://hackage.haskell.org/package/%{name} Source0: http://hackage.haskell.org/packages/archive/%{name}/%{version}/%{name}-%{version}.tar.gz +Patch2: pandoc-1.9.4-no-threaded-runtime.patch BuildRequires: ghc-Cabal-devel BuildRequires: ghc-rpm-macros @@ -57,7 +58,6 @@ BuildRequires: ghc-xml-devel BuildRequires: ghc-zip-archive-devel BuildRequires: ghc-zlib-devel # End cabal-rpm deps -Patch2: pandoc-1.9.4-no-threaded-runtime.patch %description %{common_description} From 1bfb5d55ba1207f04817a81b64261bdff69be32c Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Thu, 14 Feb 2013 03:47:12 -0600 Subject: [PATCH 056/165] - Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild --- pandoc.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pandoc.spec b/pandoc.spec index a8008df..538f789 100644 --- a/pandoc.spec +++ b/pandoc.spec @@ -18,7 +18,7 @@ provided for those who need a drop-in replacement for Markdown.pl. Name: %{pkg_name} Version: 1.9.4.5 -Release: 4%{?dist} +Release: 5%{?dist} Summary: Markup conversion tool for markdown License: GPLv2+ @@ -124,6 +124,9 @@ ln -s pandoc %{buildroot}%{_bindir}/hsmarkdown %changelog +* Thu Feb 14 2013 Fedora Release Engineering - 1.9.4.5-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild + * Wed Nov 21 2012 Jens Petersen - 1.9.4.5-4 - rebuild From cef03ddc96cfccde4d90073cb37cdf38f7efb931 Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Sun, 10 Mar 2013 18:30:32 +0900 Subject: [PATCH 057/165] update to 1.10.1 --- .gitignore | 1 + pandoc-1.9.4-no-threaded-runtime.patch | 42 -------------------------- pandoc.spec | 12 +++++--- sources | 2 +- 4 files changed, 10 insertions(+), 47 deletions(-) delete mode 100644 pandoc-1.9.4-no-threaded-runtime.patch diff --git a/.gitignore b/.gitignore index a7be265..32abb4e 100644 --- a/.gitignore +++ b/.gitignore @@ -8,3 +8,4 @@ /pandoc-1.9.4.1.tar.gz /pandoc-1.9.4.2.tar.gz /pandoc-1.9.4.5.tar.gz +/pandoc-1.10.1.tar.gz diff --git a/pandoc-1.9.4-no-threaded-runtime.patch b/pandoc-1.9.4-no-threaded-runtime.patch deleted file mode 100644 index 72aa335..0000000 --- a/pandoc-1.9.4-no-threaded-runtime.patch +++ /dev/null @@ -1,42 +0,0 @@ -Description: Don't build with the threaded runtime. It causes build failures - and has a performance penalty. -Origin: upstream, commit:a5db4246656afae3541936269e727d9a9cc39795 -Forwarded: not-needed -Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=682433 - -Index: b/pandoc.cabal -=================================================================== ---- a/pandoc.cabal -+++ b/pandoc.cabal -@@ -344,12 +344,12 @@ - else - Build-depends: base >= 3 && < 4 - if impl(ghc >= 7.0.1) -- Ghc-Options: -O2 -rtsopts -threaded -Wall -fno-warn-unused-do-bind -dno-debug-output -+ Ghc-Options: -O2 -rtsopts -Wall -fno-warn-unused-do-bind -dno-debug-output - else - if impl(ghc >= 6.12) -- Ghc-Options: -O2 -Wall -threaded -fno-warn-unused-do-bind -dno-debug-output -+ Ghc-Options: -O2 -Wall -fno-warn-unused-do-bind -dno-debug-output - else -- Ghc-Options: -O2 -Wall -threaded -+ Ghc-Options: -O2 -Wall - if impl(ghc >= 7.0.1) - Ghc-Prof-Options: -auto-all -caf-all -rtsopts - else -@@ -411,12 +411,12 @@ - else - Build-depends: base >= 3 && < 4 - if impl(ghc >= 7.0.1) -- Ghc-Options: -O2 -rtsopts -threaded -Wall -fno-warn-unused-do-bind -dno-debug-output -+ Ghc-Options: -O2 -rtsopts -Wall -fno-warn-unused-do-bind -dno-debug-output - else - if impl(ghc >= 6.12) -- Ghc-Options: -O2 -Wall -threaded -fno-warn-unused-do-bind -dno-debug-output -+ Ghc-Options: -O2 -Wall -fno-warn-unused-do-bind -dno-debug-output - else -- Ghc-Options: -O2 -Wall -threaded -+ Ghc-Options: -O2 -Wall - if impl(ghc >= 7.0.1) - Ghc-Prof-Options: -auto-all -caf-all -rtsopts - else diff --git a/pandoc.spec b/pandoc.spec index 538f789..e85d999 100644 --- a/pandoc.spec +++ b/pandoc.spec @@ -17,14 +17,13 @@ definition lists, tables, and other features. A compatibility mode is\ provided for those who need a drop-in replacement for Markdown.pl. Name: %{pkg_name} -Version: 1.9.4.5 -Release: 5%{?dist} +Version: 1.10.1 +Release: 1%{?dist} Summary: Markup conversion tool for markdown License: GPLv2+ URL: http://hackage.haskell.org/package/%{name} Source0: http://hackage.haskell.org/packages/archive/%{name}/%{version}/%{name}-%{version}.tar.gz -Patch2: pandoc-1.9.4-no-threaded-runtime.patch BuildRequires: ghc-Cabal-devel BuildRequires: ghc-rpm-macros @@ -58,6 +57,7 @@ BuildRequires: ghc-xml-devel BuildRequires: ghc-zip-archive-devel BuildRequires: ghc-zlib-devel # End cabal-rpm deps +BuildRequires: chrpath %description %{common_description} @@ -80,7 +80,6 @@ needed by pandoc to generate pdf output. %prep %setup -q -%patch2 -p1 -b .orig %build @@ -94,6 +93,8 @@ rm %{buildroot}%{_datadir}/%{name}-%{version}/{BUGS,COPYRIGHT,INSTALL,README,cha ln -s pandoc %{buildroot}%{_bindir}/hsmarkdown +%ghc_fix_dynamic_rpath pandoc + %ghc_package @@ -124,6 +125,9 @@ ln -s pandoc %{buildroot}%{_bindir}/hsmarkdown %changelog +* Sun Mar 10 2013 Jens Petersen - 1.10.1-1 +- update to 1.10.1 + * Thu Feb 14 2013 Fedora Release Engineering - 1.9.4.5-5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild diff --git a/sources b/sources index a8ef220..4339cdf 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -9b37e70689a2e9f7ae65313b52481e4c pandoc-1.9.4.5.tar.gz +ce6f193499e2e694c3df2290f03448ed pandoc-1.10.1.tar.gz From bfd6360175e75954fa0778dabb5b7c7a71e5fa43 Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Sun, 10 Mar 2013 18:49:01 +0900 Subject: [PATCH 058/165] update deps for 1.10 --- pandoc.spec | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pandoc.spec b/pandoc.spec index e85d999..ca502b0 100644 --- a/pandoc.spec +++ b/pandoc.spec @@ -34,6 +34,7 @@ BuildRequires: ghc-blaze-html-devel BuildRequires: ghc-bytestring-devel BuildRequires: ghc-citeproc-hs-devel BuildRequires: ghc-containers-devel +BuildRequires: ghc-data-default-devel BuildRequires: ghc-directory-devel BuildRequires: ghc-extensible-exceptions-devel BuildRequires: ghc-filepath-devel @@ -51,8 +52,8 @@ BuildRequires: ghc-syb-devel BuildRequires: ghc-tagsoup-devel BuildRequires: ghc-temporary-devel BuildRequires: ghc-texmath-devel +BuildRequires: ghc-text-devel BuildRequires: ghc-time-devel -BuildRequires: ghc-utf8-string-devel BuildRequires: ghc-xml-devel BuildRequires: ghc-zip-archive-devel BuildRequires: ghc-zlib-devel From 8db5960ecfa90d0652e86d708c2bd4a2a691b9e9 Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Tue, 19 Mar 2013 15:47:39 +0900 Subject: [PATCH 059/165] allow blaze-html-0.6 --- pandoc.spec | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pandoc.spec b/pandoc.spec index ca502b0..d79831e 100644 --- a/pandoc.spec +++ b/pandoc.spec @@ -81,6 +81,7 @@ needed by pandoc to generate pdf output. %prep %setup -q +cabal-tweak-dep-ver blaze-html "< 0.6" "< 0.7" %build @@ -128,6 +129,7 @@ ln -s pandoc %{buildroot}%{_bindir}/hsmarkdown %changelog * Sun Mar 10 2013 Jens Petersen - 1.10.1-1 - update to 1.10.1 +- allow blaze-html-0.6 * Thu Feb 14 2013 Fedora Release Engineering - 1.9.4.5-5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild From 0b7e52cc444d42126373d54ec7df8ae8d9ca30b8 Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Fri, 22 Mar 2013 18:36:20 +0900 Subject: [PATCH 060/165] update to 1.11.1 --- .gitignore | 1 + pandoc.spec | 6 ++++-- sources | 2 +- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 32abb4e..fce2263 100644 --- a/.gitignore +++ b/.gitignore @@ -9,3 +9,4 @@ /pandoc-1.9.4.2.tar.gz /pandoc-1.9.4.5.tar.gz /pandoc-1.10.1.tar.gz +/pandoc-1.11.1.tar.gz diff --git a/pandoc.spec b/pandoc.spec index d79831e..6ec4299 100644 --- a/pandoc.spec +++ b/pandoc.spec @@ -17,7 +17,7 @@ definition lists, tables, and other features. A compatibility mode is\ provided for those who need a drop-in replacement for Markdown.pl. Name: %{pkg_name} -Version: 1.10.1 +Version: 1.11.1 Release: 1%{?dist} Summary: Markup conversion tool for markdown @@ -81,7 +81,6 @@ needed by pandoc to generate pdf output. %prep %setup -q -cabal-tweak-dep-ver blaze-html "< 0.6" "< 0.7" %build @@ -127,6 +126,9 @@ ln -s pandoc %{buildroot}%{_bindir}/hsmarkdown %changelog +* Fri Mar 22 2013 Jens Petersen - 1.11.1-1 +- update to 1.11.1 + * Sun Mar 10 2013 Jens Petersen - 1.10.1-1 - update to 1.10.1 - allow blaze-html-0.6 diff --git a/sources b/sources index 4339cdf..546f704 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -ce6f193499e2e694c3df2290f03448ed pandoc-1.10.1.tar.gz +e895b22745affba37c0ba5e6e6d0f17c pandoc-1.11.1.tar.gz From cb0e1238d877550d4175ad2641dec457b415ead3 Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Wed, 1 May 2013 19:39:03 +0900 Subject: [PATCH 061/165] pandoc-pdf now requires texlive-collection-latex and texlive-ec Thanks to Erik Jacobs for reporting this --- pandoc.spec | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/pandoc.spec b/pandoc.spec index 6ec4299..dc131ec 100644 --- a/pandoc.spec +++ b/pandoc.spec @@ -18,7 +18,7 @@ provided for those who need a drop-in replacement for Markdown.pl. Name: %{pkg_name} Version: 1.11.1 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Markup conversion tool for markdown License: GPLv2+ @@ -69,7 +69,8 @@ For pdf output please also install pandoc-pdf. %package pdf Summary: Metapackage for pandoc xetex support Requires: %{name} = %{version} -Requires: texlive-latex +Requires: texlive-collection-latex +Requires: texlive-ec Obsoletes: pandoc-markdown2pdf < %{version}-%{release} %description pdf @@ -126,6 +127,9 @@ ln -s pandoc %{buildroot}%{_bindir}/hsmarkdown %changelog +* Wed May 1 2013 Jens Petersen - 1.11.1-2 +- pandoc-pdf now requires texlive-collection-latex and texlive-ec (#957876) + * Fri Mar 22 2013 Jens Petersen - 1.11.1-1 - update to 1.11.1 From 74b79f238436b3f187b20405258bf4b4e134bdd4 Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Wed, 1 May 2013 19:44:58 +0900 Subject: [PATCH 062/165] fix the pandoc-pdf summary and description just to talk about pdf not xetex --- pandoc.spec | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pandoc.spec b/pandoc.spec index dc131ec..91ea1c9 100644 --- a/pandoc.spec +++ b/pandoc.spec @@ -67,7 +67,7 @@ For pdf output please also install pandoc-pdf. %package pdf -Summary: Metapackage for pandoc xetex support +Summary: Metapackage for pandoc pdf support Requires: %{name} = %{version} Requires: texlive-collection-latex Requires: texlive-ec @@ -76,8 +76,8 @@ Obsoletes: pandoc-markdown2pdf < %{version}-%{release} %description pdf %{common_description} -This package pulls in the texlive latex and xetex packages -needed by pandoc to generate pdf output. +This package pulls in the texlive latex package collection needed by +pandoc to generate pdf output. %prep From 57ec150667ea1ac6c6654f1763153e083b8530e6 Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Mon, 10 Jun 2013 16:57:21 +0900 Subject: [PATCH 063/165] update to new simplified Haskell Packaging Guidelines --- pandoc.spec | 76 +++++++++++++++++++++++++++++++++-------------------- 1 file changed, 47 insertions(+), 29 deletions(-) diff --git a/pandoc.spec b/pandoc.spec index 91ea1c9..1df9af5 100644 --- a/pandoc.spec +++ b/pandoc.spec @@ -1,24 +1,10 @@ # https://fedoraproject.org/wiki/Packaging:Haskell -# https://fedoraproject.org/wiki/PackagingDrafts/Haskell %global pkg_name pandoc -%global common_summary Haskell %{pkg_name} library - -%global common_description Pandoc is a tool and Haskell library for converting markup formats.\ -It can read markdown and (subsets of) HTML, reStructuredText, LaTeX, DocBook,\ -and Textile, and can write markdown, reStructuredText, HTML, LaTeX, ConTeXt,\ -Docbook, OpenDocument, ODT, Word docx, RTF, MediaWiki, Textile, groff man pages,\ -plain text, Emacs Org-Mode, AsciiDoc, EPUB, and S5, Slidy and Slideous HTML\ -slide-shows.\ -\ -Pandoc extends standard markdown syntax with footnotes, embedded LaTeX,\ -definition lists, tables, and other features. A compatibility mode is\ -provided for those who need a drop-in replacement for Markdown.pl. - Name: %{pkg_name} Version: 1.11.1 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Markup conversion tool for markdown License: GPLv2+ @@ -31,6 +17,7 @@ BuildRequires: ghc-rpm-macros BuildRequires: ghc-HTTP-devel BuildRequires: ghc-base64-bytestring-devel BuildRequires: ghc-blaze-html-devel +BuildRequires: ghc-blaze-markup-devel BuildRequires: ghc-bytestring-devel BuildRequires: ghc-citeproc-hs-devel BuildRequires: ghc-containers-devel @@ -61,23 +48,52 @@ BuildRequires: ghc-zlib-devel BuildRequires: chrpath %description -%{common_description} +Pandoc is a tool and Haskell library for converting markup formats. +It can read markdown and (subsets of) HTML, reStructuredText, LaTeX, DocBook, +MediaWiki markup, and Textile, and can write markdown, reStructuredText, HTML, +LaTeX, ConTeXt, Docbook, OpenDocument, ODT, Word docx, RTF, MediaWiki, Textile, +groff man pages, plain text, Emacs Org-Mode, AsciiDoc, EPUB, FictionBook2, and +S5, Slidy and Slideous HTML slide-shows. + +Pandoc extends standard markdown syntax with footnotes, embedded LaTeX, +definition lists, tables, and other features. A compatibility mode is +provided for those who need a drop-in replacement for Markdown.pl. For pdf output please also install pandoc-pdf. +%package -n ghc-%{name} +Summary: Haskell %{name} library + +%description -n ghc-%{name} +This package provides the Haskell %{name} shared library. + + +%package -n ghc-%{name}-devel +Summary: Haskell %{name} library development files +Requires: ghc-compiler = %{ghc_version} +Requires(post): ghc-compiler = %{ghc_version} +Requires(postun): ghc-compiler = %{ghc_version} +Requires: ghc-%{name} = %{version}-%{release} + +%description -n ghc-%{name}-devel +This package provides the Haskell %{name} library development files. + + %package pdf Summary: Metapackage for pandoc pdf support Requires: %{name} = %{version} Requires: texlive-collection-latex Requires: texlive-ec Obsoletes: pandoc-markdown2pdf < %{version}-%{release} +Obsoletes: pandoc-pdf < %{version}-%{release} %description pdf -%{common_description} +This package pulls in the TeXLive latex package collection needed by +pandoc to generate pdf output using pdflatex. -This package pulls in the texlive latex package collection needed by -pandoc to generate pdf output. +To use --latex-engine=xelatex or lualatex, install texlive-collection-xetex +or texlive-collection-luatex respectively. %prep @@ -98,17 +114,12 @@ ln -s pandoc %{buildroot}%{_bindir}/hsmarkdown %ghc_fix_dynamic_rpath pandoc -%ghc_package - -%ghc_description - - -%ghc_devel_package +%post -n ghc-%{name}-devel +%ghc_pkg_recache -%ghc_devel_description - -%ghc_devel_post_postun +%postun -n ghc-%{name}-devel +%ghc_pkg_recache %files @@ -123,10 +134,17 @@ ln -s pandoc %{buildroot}%{_bindir}/hsmarkdown %files pdf -%ghc_files COPYRIGHT +%files -n ghc-%{name} -f ghc-%{name}.files +%doc COPYING COPYRIGHT + + +%files -n ghc-%{name}-devel -f ghc-%{name}-devel.files %changelog +* Mon Jun 10 2013 Jens Petersen +- update to new simplified Haskell Packaging Guidelines + * Wed May 1 2013 Jens Petersen - 1.11.1-2 - pandoc-pdf now requires texlive-collection-latex and texlive-ec (#957876) From 9c1430823a35a0ee633bc4fc86eb93f4ceaeb114 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Sat, 3 Aug 2013 11:28:15 -0500 Subject: [PATCH 064/165] - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild --- pandoc.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pandoc.spec b/pandoc.spec index 1df9af5..d18a6d4 100644 --- a/pandoc.spec +++ b/pandoc.spec @@ -4,7 +4,7 @@ Name: %{pkg_name} Version: 1.11.1 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Markup conversion tool for markdown License: GPLv2+ @@ -142,6 +142,9 @@ ln -s pandoc %{buildroot}%{_bindir}/hsmarkdown %changelog +* Sat Aug 03 2013 Fedora Release Engineering - 1.11.1-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild + * Mon Jun 10 2013 Jens Petersen - update to new simplified Haskell Packaging Guidelines From 4ee16b93262665a89ba3aab71c9a9f20450a7160 Mon Sep 17 00:00:00 2001 From: Adam Williamson Date: Tue, 6 Aug 2013 11:44:19 -0700 Subject: [PATCH 065/165] rebuild for new libbibutils --- pandoc.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pandoc.spec b/pandoc.spec index d18a6d4..9728d1e 100644 --- a/pandoc.spec +++ b/pandoc.spec @@ -4,7 +4,7 @@ Name: %{pkg_name} Version: 1.11.1 -Release: 4%{?dist} +Release: 5%{?dist} Summary: Markup conversion tool for markdown License: GPLv2+ @@ -142,6 +142,9 @@ ln -s pandoc %{buildroot}%{_bindir}/hsmarkdown %changelog +* Tue Aug 06 2013 Adam Williamson - 1.11.1-5 +- rebuild for new libbibutils + * Sat Aug 03 2013 Fedora Release Engineering - 1.11.1-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild From e31d84c337596a7a90a2294734bde76f55d87c2a Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Wed, 28 Aug 2013 19:11:30 +0900 Subject: [PATCH 066/165] temporarily exclude armv7hl since build hangs mysteriously with ghc-7.6.3 and llvm-3.3 hanging (#992430) I hope that ghc-7.8 will fix this at least --- .chain-deps | 1 - pandoc.spec | 7 ++++++- 2 files changed, 6 insertions(+), 2 deletions(-) delete mode 100644 .chain-deps diff --git a/.chain-deps b/.chain-deps deleted file mode 100644 index 8398e54..0000000 --- a/.chain-deps +++ /dev/null @@ -1 +0,0 @@ -ghc-base64-bytestring ghc-digest ghc-json ghc-pandoc-types ghc-pcre-light ghc-temporary ghc-tagsoup ghc-xml : ghc-citeproc-hs ghc-texmath ghc-zip-archive highlighting-kate : diff --git a/pandoc.spec b/pandoc.spec index 9728d1e..b2deba1 100644 --- a/pandoc.spec +++ b/pandoc.spec @@ -4,7 +4,7 @@ Name: %{pkg_name} Version: 1.11.1 -Release: 5%{?dist} +Release: 6%{?dist} Summary: Markup conversion tool for markdown License: GPLv2+ @@ -46,6 +46,7 @@ BuildRequires: ghc-zip-archive-devel BuildRequires: ghc-zlib-devel # End cabal-rpm deps BuildRequires: chrpath +ExcludeArch: armv7hl %description Pandoc is a tool and Haskell library for converting markup formats. @@ -142,6 +143,10 @@ ln -s pandoc %{buildroot}%{_bindir}/hsmarkdown %changelog +* Wed Aug 28 2013 Jens Petersen - 1.11.1-6 +- temporarily exclude armv7hl since build with ghc-7.6.3 and llvm-3.3 hanging + mysteriously (#992430) + * Tue Aug 06 2013 Adam Williamson - 1.11.1-5 - rebuild for new libbibutils From cec7b881ac54a0f2efd9a867f34b1acfa1988227 Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Wed, 22 Jan 2014 18:35:22 +0900 Subject: [PATCH 067/165] update to 1.12.3.1 --- .gitignore | 1 + pandoc.spec | 47 ++++++++++++++++++++++++++++++++--------------- sources | 2 +- 3 files changed, 34 insertions(+), 16 deletions(-) diff --git a/.gitignore b/.gitignore index fce2263..94588f0 100644 --- a/.gitignore +++ b/.gitignore @@ -10,3 +10,4 @@ /pandoc-1.9.4.5.tar.gz /pandoc-1.10.1.tar.gz /pandoc-1.11.1.tar.gz +/pandoc-1.12.3.1.tar.gz diff --git a/pandoc.spec b/pandoc.spec index b2deba1..eee3230 100644 --- a/pandoc.spec +++ b/pandoc.spec @@ -3,9 +3,9 @@ %global pkg_name pandoc Name: %{pkg_name} -Version: 1.11.1 -Release: 6%{?dist} -Summary: Markup conversion tool for markdown +Version: 1.12.3.1 +Release: 1%{?dist} +Summary: Conversion between markup formats License: GPLv2+ URL: http://hackage.haskell.org/package/%{name} @@ -14,19 +14,25 @@ Source0: http://hackage.haskell.org/packages/archive/%{name}/%{version}/% BuildRequires: ghc-Cabal-devel BuildRequires: ghc-rpm-macros # Begin cabal-rpm deps: +BuildRequires: alex +BuildRequires: chrpath BuildRequires: ghc-HTTP-devel +BuildRequires: ghc-aeson-devel +BuildRequires: ghc-array-devel +BuildRequires: ghc-attoparsec-devel BuildRequires: ghc-base64-bytestring-devel +BuildRequires: ghc-binary-devel BuildRequires: ghc-blaze-html-devel BuildRequires: ghc-blaze-markup-devel BuildRequires: ghc-bytestring-devel -BuildRequires: ghc-citeproc-hs-devel BuildRequires: ghc-containers-devel BuildRequires: ghc-data-default-devel BuildRequires: ghc-directory-devel BuildRequires: ghc-extensible-exceptions-devel BuildRequires: ghc-filepath-devel BuildRequires: ghc-highlighting-kate-devel -BuildRequires: ghc-json-devel +BuildRequires: ghc-hslua-devel +BuildRequires: ghc-http-types-devel BuildRequires: ghc-mtl-devel BuildRequires: ghc-network-devel BuildRequires: ghc-old-locale-devel @@ -41,24 +47,29 @@ BuildRequires: ghc-temporary-devel BuildRequires: ghc-texmath-devel BuildRequires: ghc-text-devel BuildRequires: ghc-time-devel +BuildRequires: ghc-unordered-containers-devel +BuildRequires: ghc-vector-devel BuildRequires: ghc-xml-devel +BuildRequires: ghc-yaml-devel BuildRequires: ghc-zip-archive-devel BuildRequires: ghc-zlib-devel +BuildRequires: happy # End cabal-rpm deps -BuildRequires: chrpath ExcludeArch: armv7hl %description -Pandoc is a tool and Haskell library for converting markup formats. -It can read markdown and (subsets of) HTML, reStructuredText, LaTeX, DocBook, -MediaWiki markup, and Textile, and can write markdown, reStructuredText, HTML, -LaTeX, ConTeXt, Docbook, OpenDocument, ODT, Word docx, RTF, MediaWiki, Textile, -groff man pages, plain text, Emacs Org-Mode, AsciiDoc, EPUB, FictionBook2, and -S5, Slidy and Slideous HTML slide-shows. +Pandoc is a Haskell library for converting from one markup format to another, +and a command-line tool that uses this library. It can read markdown and +(subsets of) HTML, reStructuredText, LaTeX, DocBook, MediaWiki markup, Haddock +markup, OPML, and Textile, and it can write markdown, reStructuredText, HTML, +LaTeX, ConTeXt, Docbook, OPML, OpenDocument, ODT, Word docx, RTF, MediaWiki, +Textile, groff man pages, plain text, Emacs Org-Mode, AsciiDoc, EPUB (v2 and +v3), FictionBook2, and several kinds of HTML/javascript slide shows (S5, Slidy, +Slideous, DZSlides, reveal.js). Pandoc extends standard markdown syntax with footnotes, embedded LaTeX, -definition lists, tables, and other features. A compatibility mode is -provided for those who need a drop-in replacement for Markdown.pl. +definition lists, tables, and other features. A compatibility mode is provided +for those who need a drop-in replacement for Markdown.pl. For pdf output please also install pandoc-pdf. @@ -72,10 +83,11 @@ This package provides the Haskell %{name} shared library. %package -n ghc-%{name}-devel Summary: Haskell %{name} library development files +Provides: ghc-%{name}-static = %{version}-%{release} Requires: ghc-compiler = %{ghc_version} Requires(post): ghc-compiler = %{ghc_version} Requires(postun): ghc-compiler = %{ghc_version} -Requires: ghc-%{name} = %{version}-%{release} +Requires: ghc-%{name}%{?_isa} = %{version}-%{release} %description -n ghc-%{name}-devel This package provides the Haskell %{name} library development files. @@ -99,6 +111,7 @@ or texlive-collection-luatex respectively. %prep %setup -q +cabal-tweak-flag http-conduit False %build @@ -143,6 +156,10 @@ ln -s pandoc %{buildroot}%{_bindir}/hsmarkdown %changelog +* Wed Jan 22 2014 Jens Petersen - 1.12.3.1-1 +- update to 1.12.3.1 +- disable http-conduit + * Wed Aug 28 2013 Jens Petersen - 1.11.1-6 - temporarily exclude armv7hl since build with ghc-7.6.3 and llvm-3.3 hanging mysteriously (#992430) diff --git a/sources b/sources index 546f704..e51dcdf 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -e895b22745affba37c0ba5e6e6d0f17c pandoc-1.11.1.tar.gz +caa764a0e69aeb8101c3b8293a00cee8 pandoc-1.12.3.1.tar.gz From f7570b0e0ee00838443ddbf7b8cdc2b8e16feefa Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Thu, 8 May 2014 12:18:25 +0900 Subject: [PATCH 068/165] update to 1.12.3.3 --- .gitignore | 1 + pandoc.spec | 8 +++++--- sources | 2 +- 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index 94588f0..1cceb12 100644 --- a/.gitignore +++ b/.gitignore @@ -11,3 +11,4 @@ /pandoc-1.10.1.tar.gz /pandoc-1.11.1.tar.gz /pandoc-1.12.3.1.tar.gz +/pandoc-1.12.3.3.tar.gz diff --git a/pandoc.spec b/pandoc.spec index eee3230..7080d9a 100644 --- a/pandoc.spec +++ b/pandoc.spec @@ -3,13 +3,13 @@ %global pkg_name pandoc Name: %{pkg_name} -Version: 1.12.3.1 +Version: 1.12.3.3 Release: 1%{?dist} Summary: Conversion between markup formats License: GPLv2+ URL: http://hackage.haskell.org/package/%{name} -Source0: http://hackage.haskell.org/packages/archive/%{name}/%{version}/%{name}-%{version}.tar.gz +Source0: http://hackage.haskell.org/package/%{name}-%{version}/%{name}-%{version}.tar.gz BuildRequires: ghc-Cabal-devel BuildRequires: ghc-rpm-macros @@ -32,7 +32,6 @@ BuildRequires: ghc-extensible-exceptions-devel BuildRequires: ghc-filepath-devel BuildRequires: ghc-highlighting-kate-devel BuildRequires: ghc-hslua-devel -BuildRequires: ghc-http-types-devel BuildRequires: ghc-mtl-devel BuildRequires: ghc-network-devel BuildRequires: ghc-old-locale-devel @@ -156,6 +155,9 @@ ln -s pandoc %{buildroot}%{_bindir}/hsmarkdown %changelog +* Thu May 08 2014 Jens Petersen - 1.12.3.3-1 +- update to 1.12.3.3 + * Wed Jan 22 2014 Jens Petersen - 1.12.3.1-1 - update to 1.12.3.1 - disable http-conduit diff --git a/sources b/sources index e51dcdf..5068c0d 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -caa764a0e69aeb8101c3b8293a00cee8 pandoc-1.12.3.1.tar.gz +906e6d1435cb8175853db834d12a4cc3 pandoc-1.12.3.3.tar.gz From e5ad6e055d6b50dadff718a97d2b82973019d01a Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Fri, 9 May 2014 16:49:03 +0900 Subject: [PATCH 069/165] reenable ARM --- pandoc.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pandoc.spec b/pandoc.spec index 7080d9a..eea90f8 100644 --- a/pandoc.spec +++ b/pandoc.spec @@ -54,7 +54,6 @@ BuildRequires: ghc-zip-archive-devel BuildRequires: ghc-zlib-devel BuildRequires: happy # End cabal-rpm deps -ExcludeArch: armv7hl %description Pandoc is a Haskell library for converting from one markup format to another, @@ -157,6 +156,7 @@ ln -s pandoc %{buildroot}%{_bindir}/hsmarkdown %changelog * Thu May 08 2014 Jens Petersen - 1.12.3.3-1 - update to 1.12.3.3 +- reenable ARM * Wed Jan 22 2014 Jens Petersen - 1.12.3.1-1 - update to 1.12.3.1 From 9138a487ef5ac57954ae401ecd90bcbb98db9252 Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Fri, 9 May 2014 18:43:59 +0900 Subject: [PATCH 070/165] Revert "reenable ARM" This reverts commit e5ad6e055d6b50dadff718a97d2b82973019d01a. build still hangs on arm on Pretty :-( --- pandoc.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pandoc.spec b/pandoc.spec index eea90f8..7080d9a 100644 --- a/pandoc.spec +++ b/pandoc.spec @@ -54,6 +54,7 @@ BuildRequires: ghc-zip-archive-devel BuildRequires: ghc-zlib-devel BuildRequires: happy # End cabal-rpm deps +ExcludeArch: armv7hl %description Pandoc is a Haskell library for converting from one markup format to another, @@ -156,7 +157,6 @@ ln -s pandoc %{buildroot}%{_bindir}/hsmarkdown %changelog * Thu May 08 2014 Jens Petersen - 1.12.3.3-1 - update to 1.12.3.3 -- reenable ARM * Wed Jan 22 2014 Jens Petersen - 1.12.3.1-1 - update to 1.12.3.1 From 1b3993adac2ca54de0c26194ddc72c5ba7d608c8 Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Tue, 13 May 2014 18:59:58 +0900 Subject: [PATCH 071/165] fix building on ARM (llvm) by using -O1 (#992430) This is a known problem with ghc-7.6 -O2 with llvm. Should be fixed with ghc-7.8. Might be better actually to using -O1 only on ARM for now? --- pandoc.spec | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/pandoc.spec b/pandoc.spec index 7080d9a..ad33de0 100644 --- a/pandoc.spec +++ b/pandoc.spec @@ -4,7 +4,7 @@ Name: %{pkg_name} Version: 1.12.3.3 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Conversion between markup formats License: GPLv2+ @@ -54,7 +54,6 @@ BuildRequires: ghc-zip-archive-devel BuildRequires: ghc-zlib-devel BuildRequires: happy # End cabal-rpm deps -ExcludeArch: armv7hl %description Pandoc is a Haskell library for converting from one markup format to another, @@ -114,6 +113,11 @@ cabal-tweak-flag http-conduit False %build +# llvm opt hangs on Pretty with -O2 with ghc-7.6! (#992430) +# remove for ghc-7.8 +%ifarch armv7hl +cabal_configure_extra_options=--ghc-option="-O1" +%endif %ghc_lib_build @@ -155,6 +159,9 @@ ln -s pandoc %{buildroot}%{_bindir}/hsmarkdown %changelog +* Tue May 13 2014 Jens Petersen - 1.12.3.3-2 +- fix building on ARM (llvm) by using -O1 (#992430) + * Thu May 08 2014 Jens Petersen - 1.12.3.3-1 - update to 1.12.3.3 From ff57645e10930f385cfe366a692ab4925923466c Mon Sep 17 00:00:00 2001 From: Adam Williamson Date: Mon, 26 May 2014 12:12:18 -0700 Subject: [PATCH 072/165] rebuild for new ghc-scientific --- pandoc.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pandoc.spec b/pandoc.spec index ad33de0..be0ed5c 100644 --- a/pandoc.spec +++ b/pandoc.spec @@ -4,7 +4,7 @@ Name: %{pkg_name} Version: 1.12.3.3 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Conversion between markup formats License: GPLv2+ @@ -159,6 +159,9 @@ ln -s pandoc %{buildroot}%{_bindir}/hsmarkdown %changelog +* Mon May 26 2014 Adam Williamson - 1.12.3.3-3 +- rebuild for new ghc-scientific + * Tue May 13 2014 Jens Petersen - 1.12.3.3-2 - fix building on ARM (llvm) by using -O1 (#992430) From 8465e8f6f5440f15e540e9a83e9e359c496b4bcb Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Mon, 2 Jun 2014 10:16:26 +0900 Subject: [PATCH 073/165] remove redundant self-obsoletes from pandoc-pdf --- pandoc.spec | 1 - 1 file changed, 1 deletion(-) diff --git a/pandoc.spec b/pandoc.spec index be0ed5c..f84f44e 100644 --- a/pandoc.spec +++ b/pandoc.spec @@ -97,7 +97,6 @@ Requires: %{name} = %{version} Requires: texlive-collection-latex Requires: texlive-ec Obsoletes: pandoc-markdown2pdf < %{version}-%{release} -Obsoletes: pandoc-pdf < %{version}-%{release} %description pdf This package pulls in the TeXLive latex package collection needed by From d0b81daca5e7cec19903ab17d8d960a0e76e015e Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Fri, 6 Jun 2014 18:36:05 -0500 Subject: [PATCH 074/165] - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild --- pandoc.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pandoc.spec b/pandoc.spec index f84f44e..7299443 100644 --- a/pandoc.spec +++ b/pandoc.spec @@ -4,7 +4,7 @@ Name: %{pkg_name} Version: 1.12.3.3 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Conversion between markup formats License: GPLv2+ @@ -158,6 +158,9 @@ ln -s pandoc %{buildroot}%{_bindir}/hsmarkdown %changelog +* Fri Jun 06 2014 Fedora Release Engineering - 1.12.3.3-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild + * Mon May 26 2014 Adam Williamson - 1.12.3.3-3 - rebuild for new ghc-scientific From 60937716f9f394a8f11297bcdb2b0f1a698b85c9 Mon Sep 17 00:00:00 2001 From: Peter Robinson Date: Sun, 17 Aug 2014 14:44:57 +0000 Subject: [PATCH 075/165] - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild --- pandoc.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pandoc.spec b/pandoc.spec index 7299443..4003782 100644 --- a/pandoc.spec +++ b/pandoc.spec @@ -4,7 +4,7 @@ Name: %{pkg_name} Version: 1.12.3.3 -Release: 4%{?dist} +Release: 5%{?dist} Summary: Conversion between markup formats License: GPLv2+ @@ -158,6 +158,9 @@ ln -s pandoc %{buildroot}%{_bindir}/hsmarkdown %changelog +* Sun Aug 17 2014 Fedora Release Engineering - 1.12.3.3-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild + * Fri Jun 06 2014 Fedora Release Engineering - 1.12.3.3-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild From e922f2f705a1df670ab962b67603eeb47876e34f Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Thu, 11 Dec 2014 18:53:50 +0900 Subject: [PATCH 076/165] add a static alternative subpackage and a common subpackage --- pandoc.spec | 121 +++++++++++++++++++++++++++++++++++++++++++++++----- 1 file changed, 111 insertions(+), 10 deletions(-) diff --git a/pandoc.spec b/pandoc.spec index 4003782..3cd9b3c 100644 --- a/pandoc.spec +++ b/pandoc.spec @@ -1,10 +1,12 @@ # https://fedoraproject.org/wiki/Packaging:Haskell +%bcond_without static + %global pkg_name pandoc Name: %{pkg_name} Version: 1.12.3.3 -Release: 5%{?dist} +Release: 6%{?dist} Summary: Conversion between markup formats License: GPLv2+ @@ -54,15 +56,20 @@ BuildRequires: ghc-zip-archive-devel BuildRequires: ghc-zlib-devel BuildRequires: happy # End cabal-rpm deps +%if %{with static} +Requires: %{name}-common = %{version}-%{release} +Requires(post): %{_sbindir}/update-alternatives +Requires(postun): %{_sbindir}/update-alternatives +%endif %description -Pandoc is a Haskell library for converting from one markup format to another, -and a command-line tool that uses this library. It can read markdown and -(subsets of) HTML, reStructuredText, LaTeX, DocBook, MediaWiki markup, Haddock -markup, OPML, and Textile, and it can write markdown, reStructuredText, HTML, -LaTeX, ConTeXt, Docbook, OPML, OpenDocument, ODT, Word docx, RTF, MediaWiki, -Textile, groff man pages, plain text, Emacs Org-Mode, AsciiDoc, EPUB (v2 and -v3), FictionBook2, and several kinds of HTML/javascript slide shows (S5, Slidy, +Pandoc is a command-line tool and also a Haskell library for converting +from one markup format to another. It can read markdown and(subsets of) HTML, +reStructuredText, LaTeX, DocBook, MediaWiki markup, Haddock markup, OPML, +and Textile, and it can write markdown, reStructuredText, HTML, LaTeX, ConTeXt, +Docbook, OPML, OpenDocument, ODT, Word docx, RTF, MediaWiki, Textile, +groff man pages, plain text, Emacs Org-Mode, AsciiDoc, EPUB (v2 and v3), +FictionBook2, and several kinds of HTML/javascript slide shows (S5, Slidy, Slideous, DZSlides, reveal.js). Pandoc extends standard markdown syntax with footnotes, embedded LaTeX, @@ -72,8 +79,30 @@ for those who need a drop-in replacement for Markdown.pl. For pdf output please also install pandoc-pdf. +%if %{with static} +%package common +Summary: Common files for %{name} + +%description common +This provides the common files for %{name}. + + +%package static +Summary: Static Haskell build +Requires: %{name}-common = %{version}-%{release} +Requires(post): %{_sbindir}/update-alternatives +Requires(postun): %{_sbindir}/update-alternatives + +%description static +This provides a build with Haskell libraries statically linked. +%endif + + %package -n ghc-%{name} Summary: Haskell %{name} library +%if %{with static} +Requires: %{name}-common = %{version}-%{release} +%endif %description -n ghc-%{name} This package provides the Haskell %{name} shared library. @@ -117,17 +146,70 @@ cabal-tweak-flag http-conduit False %ifarch armv7hl cabal_configure_extra_options=--ghc-option="-O1" %endif +%if %{with static} +%define ghc_without_dynamic 1 +%ghc_bin_build +mv dist/build/%{name}/%{name}{,.static} +%undefine ghc_without_dynamic +%endif %ghc_lib_build %install %ghc_lib_install +%ghc_fix_dynamic_rpath pandoc +%if %{with static} +mv %{buildroot}%{_bindir}/%{name}{,.dynamic} +install dist/build/%{name}/%{name}.static %{buildroot}%{_bindir} +touch %{buildroot}%{_bindir}/%{name} +rm %{buildroot}%{_pkgdocdir}/COPYING +%endif rm %{buildroot}%{_datadir}/%{name}-%{version}/{BUGS,COPYRIGHT,INSTALL,README,changelog} ln -s pandoc %{buildroot}%{_bindir}/hsmarkdown -%ghc_fix_dynamic_rpath pandoc + +%if %{with static} +# avoid rpm ghost keeping pre-alternatives binary around +%pre +if [ $1 -gt 1 ] ; then + if [ -f %{_bindir}/%{name} -a ! -L %{_bindir}/%{name} ]; then + rm %{_bindir}/%{name} + fi +fi + + +%post +%{_sbindir}/update-alternatives --install %{_bindir}/%{name} \ + %{name} %{_bindir}/%{name}.dynamic 70 + + +%postun +if [ $1 -eq 0 ] ; then + %{_sbindir}/update-alternatives --remove %{name} %{_bindir}/%{name}.dynamic +fi + + +# avoid rpm ghost keeping pre-alternatives binary around +%pre static +if [ $1 -gt 1 ] ; then + if [ -f %{_bindir}/%{name} -a ! -L %{_bindir}/%{name} ]; then + rm %{_bindir}/%{name} + fi +fi + + +%post static +%{_sbindir}/update-alternatives --install %{_bindir}/%{name} \ + %{name} %{_bindir}/%{name}.static 30 + + +%postun static +if [ $1 -eq 0 ] ; then + %{_sbindir}/update-alternatives --remove %{name} %{_bindir}/%{name}.static +fi +%endif %post -n ghc-%{name}-devel @@ -139,15 +221,31 @@ ln -s pandoc %{buildroot}%{_bindir}/hsmarkdown %files +%if %{with static} +%ghost %{_bindir}/%{name} +%{_bindir}/%{name}.dynamic +%else %doc BUGS COPYING COPYRIGHT README* changelog %attr(755,root,root) %{_bindir}/%{name} +%endif + + +%files pdf + + +%if %{with static} +%files common +%doc BUGS COPYING COPYRIGHT README* changelog %attr(-,root,root) %{_bindir}/hsmarkdown %{_datadir}/%{name}-%{version} %attr(644,root,root) %{_mandir}/man1/pandoc.1* %attr(644,root,root) %{_mandir}/man5/* -%files pdf +%files static +%ghost %{_bindir}/%{name} +%{_bindir}/%{name}.static +%endif %files -n ghc-%{name} -f ghc-%{name}.files @@ -158,6 +256,9 @@ ln -s pandoc %{buildroot}%{_bindir}/hsmarkdown %changelog +* Thu Dec 11 2014 Jens Petersen - 1.12.3.3-6 +- add a static alternative subpackage and a common subpackage + * Sun Aug 17 2014 Fedora Release Engineering - 1.12.3.3-5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild From 0443c657f3ff0cd78dd1a052dfd07513acd28a6a Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Mon, 26 Jan 2015 11:10:56 +0900 Subject: [PATCH 077/165] update to 1.13.2 --- .gitignore | 1 + pandoc.spec | 69 +++++++++++++++++++++++++++++++++++++---------------- sources | 2 +- 3 files changed, 50 insertions(+), 22 deletions(-) diff --git a/.gitignore b/.gitignore index 1cceb12..efa4b46 100644 --- a/.gitignore +++ b/.gitignore @@ -12,3 +12,4 @@ /pandoc-1.11.1.tar.gz /pandoc-1.12.3.1.tar.gz /pandoc-1.12.3.3.tar.gz +/pandoc-1.13.2.tar.gz diff --git a/pandoc.spec b/pandoc.spec index 3cd9b3c..691d0a5 100644 --- a/pandoc.spec +++ b/pandoc.spec @@ -4,24 +4,26 @@ %global pkg_name pandoc +%bcond_with tests + Name: %{pkg_name} -Version: 1.12.3.3 -Release: 6%{?dist} +Version: 1.13.2 +Release: 1%{?dist} Summary: Conversion between markup formats License: GPLv2+ -URL: http://hackage.haskell.org/package/%{name} -Source0: http://hackage.haskell.org/package/%{name}-%{version}/%{name}-%{version}.tar.gz +Url: https://hackage.haskell.org/package/%{name} +Source0: https://hackage.haskell.org/package/%{name}-%{version}/%{name}-%{version}.tar.gz BuildRequires: ghc-Cabal-devel BuildRequires: ghc-rpm-macros # Begin cabal-rpm deps: -BuildRequires: alex BuildRequires: chrpath BuildRequires: ghc-HTTP-devel +BuildRequires: ghc-JuicyPixels-devel +BuildRequires: ghc-SHA-devel BuildRequires: ghc-aeson-devel BuildRequires: ghc-array-devel -BuildRequires: ghc-attoparsec-devel BuildRequires: ghc-base64-bytestring-devel BuildRequires: ghc-binary-devel BuildRequires: ghc-blaze-html-devel @@ -29,9 +31,11 @@ BuildRequires: ghc-blaze-markup-devel BuildRequires: ghc-bytestring-devel BuildRequires: ghc-containers-devel BuildRequires: ghc-data-default-devel +BuildRequires: ghc-deepseq-generics-devel BuildRequires: ghc-directory-devel BuildRequires: ghc-extensible-exceptions-devel BuildRequires: ghc-filepath-devel +BuildRequires: ghc-haddock-library-devel BuildRequires: ghc-highlighting-kate-devel BuildRequires: ghc-hslua-devel BuildRequires: ghc-mtl-devel @@ -42,6 +46,7 @@ BuildRequires: ghc-pandoc-types-devel BuildRequires: ghc-parsec-devel BuildRequires: ghc-process-devel BuildRequires: ghc-random-devel +BuildRequires: ghc-scientific-devel BuildRequires: ghc-syb-devel BuildRequires: ghc-tagsoup-devel BuildRequires: ghc-temporary-devel @@ -54,7 +59,16 @@ BuildRequires: ghc-xml-devel BuildRequires: ghc-yaml-devel BuildRequires: ghc-zip-archive-devel BuildRequires: ghc-zlib-devel -BuildRequires: happy +%if %{with tests} +BuildRequires: ghc-Diff-devel +BuildRequires: ghc-HUnit-devel +BuildRequires: ghc-QuickCheck-devel +BuildRequires: ghc-ansi-terminal-devel +BuildRequires: ghc-executable-path-devel +BuildRequires: ghc-test-framework-devel +BuildRequires: ghc-test-framework-hunit-devel +BuildRequires: ghc-test-framework-quickcheck2-devel +%endif # End cabal-rpm deps %if %{with static} Requires: %{name}-common = %{version}-%{release} @@ -63,19 +77,27 @@ Requires(postun): %{_sbindir}/update-alternatives %endif %description -Pandoc is a command-line tool and also a Haskell library for converting -from one markup format to another. It can read markdown and(subsets of) HTML, -reStructuredText, LaTeX, DocBook, MediaWiki markup, Haddock markup, OPML, -and Textile, and it can write markdown, reStructuredText, HTML, LaTeX, ConTeXt, -Docbook, OPML, OpenDocument, ODT, Word docx, RTF, MediaWiki, Textile, -groff man pages, plain text, Emacs Org-Mode, AsciiDoc, EPUB (v2 and v3), -FictionBook2, and several kinds of HTML/javascript slide shows (S5, Slidy, -Slideous, DZSlides, reveal.js). +Pandoc is a Haskell library for converting from one markup format to another, +and a command-line tool that uses this library. It can read markdown and +(subsets of) HTML, reStructuredText, LaTeX, DocBook, MediaWiki markup, TWiki +markup, Haddock markup, OPML, Emacs Org-Mode, txt2tags and Textile, and it can +write markdown, reStructuredText, XHTML, HTML 5, LaTeX, ConTeXt, DocBook, OPML, +OpenDocument, ODT, Word docx, RTF, MediaWiki, DokuWiki, Textile, groff man +pages, plain text, Emacs Org-Mode, AsciiDoc, Haddock markup, EPUB (v2 and v3), +FictionBook2, InDesign ICML, and several kinds of HTML/javascript slide shows +(S5, Slidy, Slideous, DZSlides, reveal.js). Pandoc extends standard markdown syntax with footnotes, embedded LaTeX, definition lists, tables, and other features. A compatibility mode is provided for those who need a drop-in replacement for Markdown.pl. +In contrast to existing tools for converting markdown to HTML, which use regex +substitutions, pandoc has a modular design: it consists of a set of readers, +which parse text in a given format and produce a native representation of the +document, and a set of writers, which convert this native representation into a +target format. Thus, adding an input or output format requires only adding a +reader or writer. + For pdf output please also install pandoc-pdf. @@ -137,15 +159,11 @@ or texlive-collection-luatex respectively. %prep %setup -q -cabal-tweak-flag http-conduit False +cabal-tweak-flag https False +cabal-tweak-flag network-uri False %build -# llvm opt hangs on Pretty with -O2 with ghc-7.6! (#992430) -# remove for ghc-7.8 -%ifarch armv7hl -cabal_configure_extra_options=--ghc-option="-O1" -%endif %if %{with static} %define ghc_without_dynamic 1 %ghc_bin_build @@ -170,6 +188,12 @@ rm %{buildroot}%{_datadir}/%{name}-%{version}/{BUGS,COPYRIGHT,INSTALL,README,cha ln -s pandoc %{buildroot}%{_bindir}/hsmarkdown +%check +%if %{with tests} +%cabal test +%endif + + %if %{with static} # avoid rpm ghost keeping pre-alternatives binary around %pre @@ -256,6 +280,9 @@ fi %changelog +* Mon Jan 26 2015 Jens Petersen - 1.13.2-1 +- update to 1.13.2 + * Thu Dec 11 2014 Jens Petersen - 1.12.3.3-6 - add a static alternative subpackage and a common subpackage diff --git a/sources b/sources index 5068c0d..8b4bf2d 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -906e6d1435cb8175853db834d12a4cc3 pandoc-1.12.3.3.tar.gz +74eeee9e7478b69601f2dd565959a77d pandoc-1.13.2.tar.gz From 313eee0fc157777fbd7375974996f689126f5a82 Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Mon, 26 Jan 2015 16:25:56 +0900 Subject: [PATCH 078/165] install manpages by hand; less datadir doc files to be removed --- pandoc.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pandoc.spec b/pandoc.spec index 691d0a5..678d3d4 100644 --- a/pandoc.spec +++ b/pandoc.spec @@ -183,10 +183,13 @@ touch %{buildroot}%{_bindir}/%{name} rm %{buildroot}%{_pkgdocdir}/COPYING %endif -rm %{buildroot}%{_datadir}/%{name}-%{version}/{BUGS,COPYRIGHT,INSTALL,README,changelog} +rm %{buildroot}%{_datadir}/%{name}-%{version}/{COPYRIGHT,README} ln -s pandoc %{buildroot}%{_bindir}/hsmarkdown +install -m 0644 -p -D man/man1/pandoc.1 %{buildroot}%{_mandir}/man1/pandoc.1 +install -m 0644 -p -D man/man5/pandoc_markdown.5 %{buildroot}%{_mandir}/man5/pandoc_markdown.5 + %check %if %{with tests} From 2212994fb9520c42f79c3d53413f9d67ce29f049 Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Wed, 4 Mar 2015 01:05:23 +0900 Subject: [PATCH 079/165] rebuild --- pandoc.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pandoc.spec b/pandoc.spec index 678d3d4..857200a 100644 --- a/pandoc.spec +++ b/pandoc.spec @@ -8,7 +8,7 @@ Name: %{pkg_name} Version: 1.13.2 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Conversion between markup formats License: GPLv2+ @@ -283,6 +283,9 @@ fi %changelog +* Wed Mar 4 2015 Jens Petersen - 1.13.2-2 +- rebuild + * Mon Jan 26 2015 Jens Petersen - 1.13.2-1 - update to 1.13.2 From 88cbea0a1e1d5548e1e6bc17f69ca897726445b0 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Thu, 18 Jun 2015 00:41:03 +0000 Subject: [PATCH 080/165] - Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild --- pandoc.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pandoc.spec b/pandoc.spec index 857200a..eee9d8a 100644 --- a/pandoc.spec +++ b/pandoc.spec @@ -8,7 +8,7 @@ Name: %{pkg_name} Version: 1.13.2 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Conversion between markup formats License: GPLv2+ @@ -283,6 +283,9 @@ fi %changelog +* Thu Jun 18 2015 Fedora Release Engineering - 1.13.2-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild + * Wed Mar 4 2015 Jens Petersen - 1.13.2-2 - rebuild From c300cc807e9453818d0cf7a1249760118fdba283 Mon Sep 17 00:00:00 2001 From: Peter Robinson Date: Mon, 31 Aug 2015 23:17:00 +0100 Subject: [PATCH 081/165] Rebuild (aarch64 vector hashes) --- pandoc.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pandoc.spec b/pandoc.spec index eee9d8a..214493b 100644 --- a/pandoc.spec +++ b/pandoc.spec @@ -8,7 +8,7 @@ Name: %{pkg_name} Version: 1.13.2 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Conversion between markup formats License: GPLv2+ @@ -283,6 +283,9 @@ fi %changelog +* Mon Aug 31 2015 Peter Robinson 1.13.2-4 +- Rebuild (aarch64 vector hashes) + * Thu Jun 18 2015 Fedora Release Engineering - 1.13.2-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild From 65e42bdbf554bace2b225313864a2d7fd59468ab Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Fri, 18 Sep 2015 14:19:12 +0900 Subject: [PATCH 082/165] update to 1.15.0.6 --- .gitignore | 1 + pandoc.spec | 24 ++++++++++++++++-------- sources | 2 +- 3 files changed, 18 insertions(+), 9 deletions(-) diff --git a/.gitignore b/.gitignore index efa4b46..785682f 100644 --- a/.gitignore +++ b/.gitignore @@ -13,3 +13,4 @@ /pandoc-1.12.3.1.tar.gz /pandoc-1.12.3.3.tar.gz /pandoc-1.13.2.tar.gz +/pandoc-1.15.0.6.tar.gz diff --git a/pandoc.spec b/pandoc.spec index 214493b..c7626ca 100644 --- a/pandoc.spec +++ b/pandoc.spec @@ -7,8 +7,8 @@ %bcond_with tests Name: %{pkg_name} -Version: 1.13.2 -Release: 4%{?dist} +Version: 1.15.0.6 +Release: 1%{?dist} Summary: Conversion between markup formats License: GPLv2+ @@ -29,17 +29,20 @@ BuildRequires: ghc-binary-devel BuildRequires: ghc-blaze-html-devel BuildRequires: ghc-blaze-markup-devel BuildRequires: ghc-bytestring-devel +BuildRequires: ghc-cmark-devel BuildRequires: ghc-containers-devel BuildRequires: ghc-data-default-devel BuildRequires: ghc-deepseq-generics-devel BuildRequires: ghc-directory-devel BuildRequires: ghc-extensible-exceptions-devel +BuildRequires: ghc-filemanip-devel BuildRequires: ghc-filepath-devel BuildRequires: ghc-haddock-library-devel BuildRequires: ghc-highlighting-kate-devel BuildRequires: ghc-hslua-devel BuildRequires: ghc-mtl-devel BuildRequires: ghc-network-devel +BuildRequires: ghc-network-uri-devel BuildRequires: ghc-old-locale-devel BuildRequires: ghc-old-time-devel BuildRequires: ghc-pandoc-types-devel @@ -160,7 +163,6 @@ or texlive-collection-luatex respectively. %prep %setup -q cabal-tweak-flag https False -cabal-tweak-flag network-uri False %build @@ -175,14 +177,15 @@ mv dist/build/%{name}/%{name}{,.static} %install %ghc_lib_install -%ghc_fix_dynamic_rpath pandoc + +%ghc_fix_dynamic_rpath %{pkg_name} %if %{with static} mv %{buildroot}%{_bindir}/%{name}{,.dynamic} install dist/build/%{name}/%{name}.static %{buildroot}%{_bindir} touch %{buildroot}%{_bindir}/%{name} -rm %{buildroot}%{_pkgdocdir}/COPYING %endif +rm %{buildroot}%{ghc_pkgdocdir}/COPYING rm %{buildroot}%{_datadir}/%{name}-%{version}/{COPYRIGHT,README} ln -s pandoc %{buildroot}%{_bindir}/hsmarkdown @@ -252,7 +255,8 @@ fi %ghost %{_bindir}/%{name} %{_bindir}/%{name}.dynamic %else -%doc BUGS COPYING COPYRIGHT README* changelog +%license COPYING COPYRIGHT +%doc BUGS README* changelog %attr(755,root,root) %{_bindir}/%{name} %endif @@ -262,7 +266,8 @@ fi %if %{with static} %files common -%doc BUGS COPYING COPYRIGHT README* changelog +%license COPYING COPYRIGHT +%doc BUGS README* changelog %attr(-,root,root) %{_bindir}/hsmarkdown %{_datadir}/%{name}-%{version} %attr(644,root,root) %{_mandir}/man1/pandoc.1* @@ -276,13 +281,16 @@ fi %files -n ghc-%{name} -f ghc-%{name}.files -%doc COPYING COPYRIGHT +%license COPYING COPYRIGHT %files -n ghc-%{name}-devel -f ghc-%{name}-devel.files %changelog +* Fri Sep 18 2015 Jens Petersen - 1.15.0.6-1 +- update to 1.15.0.6 + * Mon Aug 31 2015 Peter Robinson 1.13.2-4 - Rebuild (aarch64 vector hashes) diff --git a/sources b/sources index 8b4bf2d..ac58152 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -74eeee9e7478b69601f2dd565959a77d pandoc-1.13.2.tar.gz +dc3d1d5b1bc23a3de1915614cafd06f9 pandoc-1.15.0.6.tar.gz From c8d04e89b8714349603d601cd5db0b75a60a9b60 Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Fri, 18 Sep 2015 14:24:46 +0900 Subject: [PATCH 083/165] fix build without https --- pandoc-1.15.0.6-zip-archive-import.patch | 19 +++++++++++++++++++ pandoc.spec | 3 +++ 2 files changed, 22 insertions(+) create mode 100644 pandoc-1.15.0.6-zip-archive-import.patch diff --git a/pandoc-1.15.0.6-zip-archive-import.patch b/pandoc-1.15.0.6-zip-archive-import.patch new file mode 100644 index 0000000..1b928cf --- /dev/null +++ b/pandoc-1.15.0.6-zip-archive-import.patch @@ -0,0 +1,19 @@ +--- pandoc-1.15.0.6/src/Text/Pandoc/Shared.hs~ 2015-07-16 02:05:34.000000000 +0900 ++++ pandoc-1.15.0.6/src/Text/Pandoc/Shared.hs 2015-09-18 14:22:00.106132376 +0900 +@@ -150,7 +150,6 @@ + import System.Environment (getEnv) + import Network.HTTP.Types.Header ( hContentType) + import Network (withSocketsDo) +-import Codec.Archive.Zip + #else + import Network.URI (parseURI) + import Network.HTTP (findHeader, rspBody, +@@ -158,6 +157,8 @@ + import Network.Browser (browse, setAllowRedirects, setOutHandler, request) + #endif + ++import Codec.Archive.Zip ++ + -- + -- List processing + -- diff --git a/pandoc.spec b/pandoc.spec index c7626ca..704add9 100644 --- a/pandoc.spec +++ b/pandoc.spec @@ -14,6 +14,7 @@ Summary: Conversion between markup formats License: GPLv2+ Url: https://hackage.haskell.org/package/%{name} Source0: https://hackage.haskell.org/package/%{name}-%{version}/%{name}-%{version}.tar.gz +Patch1: pandoc-1.15.0.6-zip-archive-import.patch BuildRequires: ghc-Cabal-devel BuildRequires: ghc-rpm-macros @@ -162,6 +163,7 @@ or texlive-collection-luatex respectively. %prep %setup -q +%patch1 -p1 -b .orig cabal-tweak-flag https False @@ -290,6 +292,7 @@ fi %changelog * Fri Sep 18 2015 Jens Petersen - 1.15.0.6-1 - update to 1.15.0.6 +- fix build without https * Mon Aug 31 2015 Peter Robinson 1.13.2-4 - Rebuild (aarch64 vector hashes) From 6a34a02fece6788dd313461fd4657751cbd2f099 Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Fri, 18 Sep 2015 14:36:01 +0900 Subject: [PATCH 084/165] manpages changes --- pandoc.spec | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/pandoc.spec b/pandoc.spec index 704add9..96cb271 100644 --- a/pandoc.spec +++ b/pandoc.spec @@ -192,8 +192,7 @@ rm %{buildroot}%{_datadir}/%{name}-%{version}/{COPYRIGHT,README} ln -s pandoc %{buildroot}%{_bindir}/hsmarkdown -install -m 0644 -p -D man/man1/pandoc.1 %{buildroot}%{_mandir}/man1/pandoc.1 -install -m 0644 -p -D man/man5/pandoc_markdown.5 %{buildroot}%{_mandir}/man5/pandoc_markdown.5 +install -m 0644 -p -D man/pandoc.1 %{buildroot}%{_mandir}/man1/pandoc.1 %check @@ -273,7 +272,6 @@ fi %attr(-,root,root) %{_bindir}/hsmarkdown %{_datadir}/%{name}-%{version} %attr(644,root,root) %{_mandir}/man1/pandoc.1* -%attr(644,root,root) %{_mandir}/man5/* %files static @@ -293,6 +291,7 @@ fi * Fri Sep 18 2015 Jens Petersen - 1.15.0.6-1 - update to 1.15.0.6 - fix build without https +- manpages changes * Mon Aug 31 2015 Peter Robinson 1.13.2-4 - Rebuild (aarch64 vector hashes) From 97d4608f757d784c38e39a433a2886d66c5110c8 Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Tue, 6 Oct 2015 01:16:46 +0900 Subject: [PATCH 085/165] move hsmarkdown and manpage to base package --- pandoc.spec | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pandoc.spec b/pandoc.spec index 96cb271..cd035a6 100644 --- a/pandoc.spec +++ b/pandoc.spec @@ -260,6 +260,8 @@ fi %doc BUGS README* changelog %attr(755,root,root) %{_bindir}/%{name} %endif +%attr(-,root,root) %{_bindir}/hsmarkdown +%attr(644,root,root) %{_mandir}/man1/pandoc.1* %files pdf @@ -269,9 +271,7 @@ fi %files common %license COPYING COPYRIGHT %doc BUGS README* changelog -%attr(-,root,root) %{_bindir}/hsmarkdown %{_datadir}/%{name}-%{version} -%attr(644,root,root) %{_mandir}/man1/pandoc.1* %files static @@ -292,6 +292,7 @@ fi - update to 1.15.0.6 - fix build without https - manpages changes +- move hsmarkdown and manpage to base package * Mon Aug 31 2015 Peter Robinson 1.13.2-4 - Rebuild (aarch64 vector hashes) From b273e2b1d0f683f3e4e906b9ee33d92b6cb4f849 Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Tue, 2 Feb 2016 01:07:44 +0900 Subject: [PATCH 086/165] Revert "update to 1.15.0.6" This reverts commit 65e42bdbf554bace2b225313864a2d7fd59468ab. --- .gitignore | 1 - pandoc-1.15.0.6-zip-archive-import.patch | 19 ------------ pandoc.spec | 37 +++++++++--------------- sources | 2 +- 4 files changed, 14 insertions(+), 45 deletions(-) delete mode 100644 pandoc-1.15.0.6-zip-archive-import.patch diff --git a/.gitignore b/.gitignore index 785682f..efa4b46 100644 --- a/.gitignore +++ b/.gitignore @@ -13,4 +13,3 @@ /pandoc-1.12.3.1.tar.gz /pandoc-1.12.3.3.tar.gz /pandoc-1.13.2.tar.gz -/pandoc-1.15.0.6.tar.gz diff --git a/pandoc-1.15.0.6-zip-archive-import.patch b/pandoc-1.15.0.6-zip-archive-import.patch deleted file mode 100644 index 1b928cf..0000000 --- a/pandoc-1.15.0.6-zip-archive-import.patch +++ /dev/null @@ -1,19 +0,0 @@ ---- pandoc-1.15.0.6/src/Text/Pandoc/Shared.hs~ 2015-07-16 02:05:34.000000000 +0900 -+++ pandoc-1.15.0.6/src/Text/Pandoc/Shared.hs 2015-09-18 14:22:00.106132376 +0900 -@@ -150,7 +150,6 @@ - import System.Environment (getEnv) - import Network.HTTP.Types.Header ( hContentType) - import Network (withSocketsDo) --import Codec.Archive.Zip - #else - import Network.URI (parseURI) - import Network.HTTP (findHeader, rspBody, -@@ -158,6 +157,8 @@ - import Network.Browser (browse, setAllowRedirects, setOutHandler, request) - #endif - -+import Codec.Archive.Zip -+ - -- - -- List processing - -- diff --git a/pandoc.spec b/pandoc.spec index cd035a6..214493b 100644 --- a/pandoc.spec +++ b/pandoc.spec @@ -7,14 +7,13 @@ %bcond_with tests Name: %{pkg_name} -Version: 1.15.0.6 -Release: 1%{?dist} +Version: 1.13.2 +Release: 4%{?dist} Summary: Conversion between markup formats License: GPLv2+ Url: https://hackage.haskell.org/package/%{name} Source0: https://hackage.haskell.org/package/%{name}-%{version}/%{name}-%{version}.tar.gz -Patch1: pandoc-1.15.0.6-zip-archive-import.patch BuildRequires: ghc-Cabal-devel BuildRequires: ghc-rpm-macros @@ -30,20 +29,17 @@ BuildRequires: ghc-binary-devel BuildRequires: ghc-blaze-html-devel BuildRequires: ghc-blaze-markup-devel BuildRequires: ghc-bytestring-devel -BuildRequires: ghc-cmark-devel BuildRequires: ghc-containers-devel BuildRequires: ghc-data-default-devel BuildRequires: ghc-deepseq-generics-devel BuildRequires: ghc-directory-devel BuildRequires: ghc-extensible-exceptions-devel -BuildRequires: ghc-filemanip-devel BuildRequires: ghc-filepath-devel BuildRequires: ghc-haddock-library-devel BuildRequires: ghc-highlighting-kate-devel BuildRequires: ghc-hslua-devel BuildRequires: ghc-mtl-devel BuildRequires: ghc-network-devel -BuildRequires: ghc-network-uri-devel BuildRequires: ghc-old-locale-devel BuildRequires: ghc-old-time-devel BuildRequires: ghc-pandoc-types-devel @@ -163,8 +159,8 @@ or texlive-collection-luatex respectively. %prep %setup -q -%patch1 -p1 -b .orig cabal-tweak-flag https False +cabal-tweak-flag network-uri False %build @@ -179,20 +175,20 @@ mv dist/build/%{name}/%{name}{,.static} %install %ghc_lib_install - -%ghc_fix_dynamic_rpath %{pkg_name} +%ghc_fix_dynamic_rpath pandoc %if %{with static} mv %{buildroot}%{_bindir}/%{name}{,.dynamic} install dist/build/%{name}/%{name}.static %{buildroot}%{_bindir} touch %{buildroot}%{_bindir}/%{name} +rm %{buildroot}%{_pkgdocdir}/COPYING %endif -rm %{buildroot}%{ghc_pkgdocdir}/COPYING rm %{buildroot}%{_datadir}/%{name}-%{version}/{COPYRIGHT,README} ln -s pandoc %{buildroot}%{_bindir}/hsmarkdown -install -m 0644 -p -D man/pandoc.1 %{buildroot}%{_mandir}/man1/pandoc.1 +install -m 0644 -p -D man/man1/pandoc.1 %{buildroot}%{_mandir}/man1/pandoc.1 +install -m 0644 -p -D man/man5/pandoc_markdown.5 %{buildroot}%{_mandir}/man5/pandoc_markdown.5 %check @@ -256,12 +252,9 @@ fi %ghost %{_bindir}/%{name} %{_bindir}/%{name}.dynamic %else -%license COPYING COPYRIGHT -%doc BUGS README* changelog +%doc BUGS COPYING COPYRIGHT README* changelog %attr(755,root,root) %{_bindir}/%{name} %endif -%attr(-,root,root) %{_bindir}/hsmarkdown -%attr(644,root,root) %{_mandir}/man1/pandoc.1* %files pdf @@ -269,9 +262,11 @@ fi %if %{with static} %files common -%license COPYING COPYRIGHT -%doc BUGS README* changelog +%doc BUGS COPYING COPYRIGHT README* changelog +%attr(-,root,root) %{_bindir}/hsmarkdown %{_datadir}/%{name}-%{version} +%attr(644,root,root) %{_mandir}/man1/pandoc.1* +%attr(644,root,root) %{_mandir}/man5/* %files static @@ -281,19 +276,13 @@ fi %files -n ghc-%{name} -f ghc-%{name}.files -%license COPYING COPYRIGHT +%doc COPYING COPYRIGHT %files -n ghc-%{name}-devel -f ghc-%{name}-devel.files %changelog -* Fri Sep 18 2015 Jens Petersen - 1.15.0.6-1 -- update to 1.15.0.6 -- fix build without https -- manpages changes -- move hsmarkdown and manpage to base package - * Mon Aug 31 2015 Peter Robinson 1.13.2-4 - Rebuild (aarch64 vector hashes) diff --git a/sources b/sources index ac58152..8b4bf2d 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -dc3d1d5b1bc23a3de1915614cafd06f9 pandoc-1.15.0.6.tar.gz +74eeee9e7478b69601f2dd565959a77d pandoc-1.13.2.tar.gz From 8781174d9854311f9a0e504f8dab14673b1633c9 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 4 Feb 2016 11:53:35 +0000 Subject: [PATCH 087/165] - Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild --- pandoc.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pandoc.spec b/pandoc.spec index 214493b..22343df 100644 --- a/pandoc.spec +++ b/pandoc.spec @@ -8,7 +8,7 @@ Name: %{pkg_name} Version: 1.13.2 -Release: 4%{?dist} +Release: 5%{?dist} Summary: Conversion between markup formats License: GPLv2+ @@ -283,6 +283,9 @@ fi %changelog +* Thu Feb 04 2016 Fedora Release Engineering - 1.13.2-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild + * Mon Aug 31 2015 Peter Robinson 1.13.2-4 - Rebuild (aarch64 vector hashes) From bcf657b00f7933e1ee3a59cfd7c61b694a47fc8a Mon Sep 17 00:00:00 2001 From: Adam Williamson Date: Thu, 3 Mar 2016 09:47:58 -0800 Subject: [PATCH 088/165] rebuild for new ghc-haddock --- pandoc.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pandoc.spec b/pandoc.spec index 22343df..3eb889e 100644 --- a/pandoc.spec +++ b/pandoc.spec @@ -8,7 +8,7 @@ Name: %{pkg_name} Version: 1.13.2 -Release: 5%{?dist} +Release: 6%{?dist} Summary: Conversion between markup formats License: GPLv2+ @@ -283,6 +283,9 @@ fi %changelog +* Thu Mar 03 2016 Adam Williamson - 1.13.2-6 +- rebuild for new ghc-haddock + * Thu Feb 04 2016 Fedora Release Engineering - 1.13.2-5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild From b7d3d3c91861bbc7db9a1ef087ecd94265fa6142 Mon Sep 17 00:00:00 2001 From: Adam Williamson Date: Thu, 3 Mar 2016 11:48:55 -0800 Subject: [PATCH 089/165] backport patch to build with newer haddock for now update to latest pandoc is waiting on ghc-cmark review, so do this to get it built and installable for F25 and F24 for now. --- ...bf3c2bd0e401a0fd61c31796940763331cef.patch | 22 ++++++++++++ ...9abb184c3d37864114f93d90a82c60f9ad0b.patch | 34 +++++++++++++++++++ pandoc.spec | 6 ++++ 3 files changed, 62 insertions(+) create mode 100644 4c9ebf3c2bd0e401a0fd61c31796940763331cef.patch create mode 100644 693f9abb184c3d37864114f93d90a82c60f9ad0b.patch diff --git a/4c9ebf3c2bd0e401a0fd61c31796940763331cef.patch b/4c9ebf3c2bd0e401a0fd61c31796940763331cef.patch new file mode 100644 index 0000000..472b1b6 --- /dev/null +++ b/4c9ebf3c2bd0e401a0fd61c31796940763331cef.patch @@ -0,0 +1,22 @@ +From 4c9ebf3c2bd0e401a0fd61c31796940763331cef Mon Sep 17 00:00:00 2001 +From: Mark Wright +Date: Mon, 5 Jan 2015 14:13:21 +1100 +Subject: [PATCH] Allow haddock-library 1.2 + +--- + pandoc.cabal | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/pandoc.cabal b/pandoc.cabal +index 005f723..a788a1c 100644 +--- a/pandoc.cabal ++++ b/pandoc.cabal +@@ -250,7 +250,7 @@ Library + hslua >= 0.3 && < 0.4, + binary >= 0.5 && < 0.8, + SHA >= 1.6 && < 1.7, +- haddock-library >= 1.1 && < 1.2, ++ haddock-library >= 1.1 && < 1.3, + old-time, + deepseq-generics >= 0.1 && < 0.2, + JuicyPixels >= 3.1.6.1 && < 3.3 diff --git a/693f9abb184c3d37864114f93d90a82c60f9ad0b.patch b/693f9abb184c3d37864114f93d90a82c60f9ad0b.patch new file mode 100644 index 0000000..1dfa679 --- /dev/null +++ b/693f9abb184c3d37864114f93d90a82c60f9ad0b.patch @@ -0,0 +1,34 @@ +From 693f9abb184c3d37864114f93d90a82c60f9ad0b Mon Sep 17 00:00:00 2001 +From: Mark Wright +Date: Mon, 5 Jan 2015 14:35:31 +1100 +Subject: [PATCH] Allow haddock-library 1.2, by calling the + Documentation.Haddock.Types.MetaDoc record accessor function _doc :: MetaDoc + mod id -> DocH mod id + +--- + src/Text/Pandoc/Readers/Haddock.hs | 8 +++++++- + 1 file changed, 7 insertions(+), 1 deletion(-) + +diff --git a/src/Text/Pandoc/Readers/Haddock.hs b/src/Text/Pandoc/Readers/Haddock.hs +index 4b46c86..c03382c 100644 +--- a/src/Text/Pandoc/Readers/Haddock.hs ++++ b/src/Text/Pandoc/Readers/Haddock.hs +@@ -1,3 +1,4 @@ ++{-# LANGUAGE CPP #-} + {- | + Module : Text.Pandoc.Readers.Haddock + Copyright : Copyright (C) 2013 David Lazar +@@ -29,7 +30,12 @@ import Debug.Trace (trace) + readHaddock :: ReaderOptions -- ^ Reader options + -> String -- ^ String to parse + -> Pandoc +-readHaddock opts = B.doc . docHToBlocks . trace' . parseParas ++readHaddock opts = ++#if MIN_VERSION_haddock_library(1,2,0) ++ B.doc . docHToBlocks . trace' . _doc . parseParas ++#else ++ B.doc . docHToBlocks . trace' . parseParas ++#endif + where trace' x = if readerTrace opts + then trace (show x) x + else x diff --git a/pandoc.spec b/pandoc.spec index 3eb889e..256fa8d 100644 --- a/pandoc.spec +++ b/pandoc.spec @@ -14,6 +14,9 @@ Summary: Conversion between markup formats License: GPLv2+ Url: https://hackage.haskell.org/package/%{name} Source0: https://hackage.haskell.org/package/%{name}-%{version}/%{name}-%{version}.tar.gz +# Backport: upstream changes to work with haddock-library 1.2 +Patch0: https://github.com/jgm/pandoc/commit/693f9abb184c3d37864114f93d90a82c60f9ad0b.patch +Patch1: https://github.com/jgm/pandoc/commit/4c9ebf3c2bd0e401a0fd61c31796940763331cef.patch BuildRequires: ghc-Cabal-devel BuildRequires: ghc-rpm-macros @@ -159,6 +162,8 @@ or texlive-collection-luatex respectively. %prep %setup -q +%patch0 -p1 +%patch1 -p1 cabal-tweak-flag https False cabal-tweak-flag network-uri False @@ -284,6 +289,7 @@ fi %changelog * Thu Mar 03 2016 Adam Williamson - 1.13.2-6 +- backport patches to allow build with newer haddock - rebuild for new ghc-haddock * Thu Feb 04 2016 Fedora Release Engineering - 1.13.2-5 From 8e947a51ba7792e13df02d1eaae2384ef9d6f1ca Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Sun, 6 Mar 2016 00:13:56 +0900 Subject: [PATCH 090/165] update to 1.16.0.2 --- .gitignore | 1 + ...bf3c2bd0e401a0fd61c31796940763331cef.patch | 22 ------- ...9abb184c3d37864114f93d90a82c60f9ad0b.patch | 34 ---------- pandoc.spec | 63 +++++++++---------- sources | 2 +- 5 files changed, 31 insertions(+), 91 deletions(-) delete mode 100644 4c9ebf3c2bd0e401a0fd61c31796940763331cef.patch delete mode 100644 693f9abb184c3d37864114f93d90a82c60f9ad0b.patch diff --git a/.gitignore b/.gitignore index efa4b46..46977bb 100644 --- a/.gitignore +++ b/.gitignore @@ -13,3 +13,4 @@ /pandoc-1.12.3.1.tar.gz /pandoc-1.12.3.3.tar.gz /pandoc-1.13.2.tar.gz +/pandoc-1.16.0.2.tar.gz diff --git a/4c9ebf3c2bd0e401a0fd61c31796940763331cef.patch b/4c9ebf3c2bd0e401a0fd61c31796940763331cef.patch deleted file mode 100644 index 472b1b6..0000000 --- a/4c9ebf3c2bd0e401a0fd61c31796940763331cef.patch +++ /dev/null @@ -1,22 +0,0 @@ -From 4c9ebf3c2bd0e401a0fd61c31796940763331cef Mon Sep 17 00:00:00 2001 -From: Mark Wright -Date: Mon, 5 Jan 2015 14:13:21 +1100 -Subject: [PATCH] Allow haddock-library 1.2 - ---- - pandoc.cabal | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/pandoc.cabal b/pandoc.cabal -index 005f723..a788a1c 100644 ---- a/pandoc.cabal -+++ b/pandoc.cabal -@@ -250,7 +250,7 @@ Library - hslua >= 0.3 && < 0.4, - binary >= 0.5 && < 0.8, - SHA >= 1.6 && < 1.7, -- haddock-library >= 1.1 && < 1.2, -+ haddock-library >= 1.1 && < 1.3, - old-time, - deepseq-generics >= 0.1 && < 0.2, - JuicyPixels >= 3.1.6.1 && < 3.3 diff --git a/693f9abb184c3d37864114f93d90a82c60f9ad0b.patch b/693f9abb184c3d37864114f93d90a82c60f9ad0b.patch deleted file mode 100644 index 1dfa679..0000000 --- a/693f9abb184c3d37864114f93d90a82c60f9ad0b.patch +++ /dev/null @@ -1,34 +0,0 @@ -From 693f9abb184c3d37864114f93d90a82c60f9ad0b Mon Sep 17 00:00:00 2001 -From: Mark Wright -Date: Mon, 5 Jan 2015 14:35:31 +1100 -Subject: [PATCH] Allow haddock-library 1.2, by calling the - Documentation.Haddock.Types.MetaDoc record accessor function _doc :: MetaDoc - mod id -> DocH mod id - ---- - src/Text/Pandoc/Readers/Haddock.hs | 8 +++++++- - 1 file changed, 7 insertions(+), 1 deletion(-) - -diff --git a/src/Text/Pandoc/Readers/Haddock.hs b/src/Text/Pandoc/Readers/Haddock.hs -index 4b46c86..c03382c 100644 ---- a/src/Text/Pandoc/Readers/Haddock.hs -+++ b/src/Text/Pandoc/Readers/Haddock.hs -@@ -1,3 +1,4 @@ -+{-# LANGUAGE CPP #-} - {- | - Module : Text.Pandoc.Readers.Haddock - Copyright : Copyright (C) 2013 David Lazar -@@ -29,7 +30,12 @@ import Debug.Trace (trace) - readHaddock :: ReaderOptions -- ^ Reader options - -> String -- ^ String to parse - -> Pandoc --readHaddock opts = B.doc . docHToBlocks . trace' . parseParas -+readHaddock opts = -+#if MIN_VERSION_haddock_library(1,2,0) -+ B.doc . docHToBlocks . trace' . _doc . parseParas -+#else -+ B.doc . docHToBlocks . trace' . parseParas -+#endif - where trace' x = if readerTrace opts - then trace (show x) x - else x diff --git a/pandoc.spec b/pandoc.spec index 256fa8d..0eb9d28 100644 --- a/pandoc.spec +++ b/pandoc.spec @@ -7,16 +7,13 @@ %bcond_with tests Name: %{pkg_name} -Version: 1.13.2 -Release: 6%{?dist} +Version: 1.16.0.2 +Release: 1%{?dist} Summary: Conversion between markup formats License: GPLv2+ Url: https://hackage.haskell.org/package/%{name} Source0: https://hackage.haskell.org/package/%{name}-%{version}/%{name}-%{version}.tar.gz -# Backport: upstream changes to work with haddock-library 1.2 -Patch0: https://github.com/jgm/pandoc/commit/693f9abb184c3d37864114f93d90a82c60f9ad0b.patch -Patch1: https://github.com/jgm/pandoc/commit/4c9ebf3c2bd0e401a0fd61c31796940763331cef.patch BuildRequires: ghc-Cabal-devel BuildRequires: ghc-rpm-macros @@ -32,18 +29,19 @@ BuildRequires: ghc-binary-devel BuildRequires: ghc-blaze-html-devel BuildRequires: ghc-blaze-markup-devel BuildRequires: ghc-bytestring-devel +BuildRequires: ghc-cmark-devel BuildRequires: ghc-containers-devel BuildRequires: ghc-data-default-devel -BuildRequires: ghc-deepseq-generics-devel +BuildRequires: ghc-deepseq-devel BuildRequires: ghc-directory-devel BuildRequires: ghc-extensible-exceptions-devel +BuildRequires: ghc-filemanip-devel BuildRequires: ghc-filepath-devel BuildRequires: ghc-haddock-library-devel BuildRequires: ghc-highlighting-kate-devel BuildRequires: ghc-hslua-devel BuildRequires: ghc-mtl-devel BuildRequires: ghc-network-devel -BuildRequires: ghc-old-locale-devel BuildRequires: ghc-old-time-devel BuildRequires: ghc-pandoc-types-devel BuildRequires: ghc-parsec-devel @@ -81,25 +79,21 @@ Requires(postun): %{_sbindir}/update-alternatives %description Pandoc is a Haskell library for converting from one markup format to another, -and a command-line tool that uses this library. It can read markdown and -(subsets of) HTML, reStructuredText, LaTeX, DocBook, MediaWiki markup, TWiki -markup, Haddock markup, OPML, Emacs Org-Mode, txt2tags and Textile, and it can -write markdown, reStructuredText, XHTML, HTML 5, LaTeX, ConTeXt, DocBook, OPML, -OpenDocument, ODT, Word docx, RTF, MediaWiki, DokuWiki, Textile, groff man -pages, plain text, Emacs Org-Mode, AsciiDoc, Haddock markup, EPUB (v2 and v3), -FictionBook2, InDesign ICML, and several kinds of HTML/javascript slide shows -(S5, Slidy, Slideous, DZSlides, reveal.js). - -Pandoc extends standard markdown syntax with footnotes, embedded LaTeX, -definition lists, tables, and other features. A compatibility mode is provided -for those who need a drop-in replacement for Markdown.pl. - -In contrast to existing tools for converting markdown to HTML, which use regex -substitutions, pandoc has a modular design: it consists of a set of readers, -which parse text in a given format and produce a native representation of the -document, and a set of writers, which convert this native representation into a -target format. Thus, adding an input or output format requires only adding a -reader or writer. +and a command-line tool that uses this library. It can read several dialects of +Markdown and (subsets of) HTML, reStructuredText, LaTeX, DocBook, MediaWiki +markup, TWiki markup, Haddock markup, OPML, Emacs Org-Mode, txt2tags, Word +Docx, ODT, and Textile, and it can write Markdown, reStructuredText, XHTML, +HTML 5, LaTeX, ConTeXt, DocBook, OPML, OpenDocument, ODT, Word docx, RTF, +MediaWiki, DokuWiki, Textile, groff man pages, plain text, Emacs Org-Mode, +AsciiDoc, Haddock markup, EPUB (v2 and v3), FictionBook2, InDesign ICML, and +several kinds of HTML/javascript slide shows (S5, Slidy, Slideous, DZSlides, +reveal.js). + +In contrast to most existing tools for converting Markdown to HTML, pandoc has +a modular design: it consists of a set of readers, which parse text in a given +format and produce a native representation of the document, and a set of +writers, which convert this native representation into a target format. +Thus, adding an input or output format requires only adding a reader or writer. For pdf output please also install pandoc-pdf. @@ -162,8 +156,6 @@ or texlive-collection-luatex respectively. %prep %setup -q -%patch0 -p1 -%patch1 -p1 cabal-tweak-flag https False cabal-tweak-flag network-uri False @@ -180,7 +172,7 @@ mv dist/build/%{name}/%{name}{,.static} %install %ghc_lib_install -%ghc_fix_dynamic_rpath pandoc +%ghc_fix_dynamic_rpath %{pkg_name} %if %{with static} mv %{buildroot}%{_bindir}/%{name}{,.dynamic} install dist/build/%{name}/%{name}.static %{buildroot}%{_bindir} @@ -192,8 +184,7 @@ rm %{buildroot}%{_datadir}/%{name}-%{version}/{COPYRIGHT,README} ln -s pandoc %{buildroot}%{_bindir}/hsmarkdown -install -m 0644 -p -D man/man1/pandoc.1 %{buildroot}%{_mandir}/man1/pandoc.1 -install -m 0644 -p -D man/man5/pandoc_markdown.5 %{buildroot}%{_mandir}/man5/pandoc_markdown.5 +install -m 0644 -p -D man/pandoc.1 %{buildroot}%{_mandir}/man1/pandoc.1 %check @@ -260,6 +251,8 @@ fi %doc BUGS COPYING COPYRIGHT README* changelog %attr(755,root,root) %{_bindir}/%{name} %endif +%attr(-,root,root) %{_bindir}/hsmarkdown +%attr(644,root,root) %{_mandir}/man1/pandoc.1* %files pdf @@ -268,10 +261,7 @@ fi %if %{with static} %files common %doc BUGS COPYING COPYRIGHT README* changelog -%attr(-,root,root) %{_bindir}/hsmarkdown %{_datadir}/%{name}-%{version} -%attr(644,root,root) %{_mandir}/man1/pandoc.1* -%attr(644,root,root) %{_mandir}/man5/* %files static @@ -288,6 +278,11 @@ fi %changelog +* Sat Mar 05 2016 Jens Petersen - 1.16.0.2-1 +- update to 1.16.0.2 +- patches no longer needed +- move hsmarkdown and pandoc.1 to base package + * Thu Mar 03 2016 Adam Williamson - 1.13.2-6 - backport patches to allow build with newer haddock - rebuild for new ghc-haddock diff --git a/sources b/sources index 8b4bf2d..6cd4835 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -74eeee9e7478b69601f2dd565959a77d pandoc-1.13.2.tar.gz +e8497a0db52756339db5ce96e9e5fe7e pandoc-1.16.0.2.tar.gz From f61781ddde9fd58dcf09d45e1bc135f33491d71c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= Date: Tue, 26 Apr 2016 16:28:47 -0400 Subject: [PATCH 091/165] Rebuild for updated ghc(tagsoup) --- pandoc.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pandoc.spec b/pandoc.spec index 0eb9d28..48de354 100644 --- a/pandoc.spec +++ b/pandoc.spec @@ -8,7 +8,7 @@ Name: %{pkg_name} Version: 1.16.0.2 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Conversion between markup formats License: GPLv2+ @@ -278,6 +278,9 @@ fi %changelog +* Tue Apr 26 2016 Zbigniew Jędrzejewski-Szmek - 1.16.0.2-2 +- Rebuild for ghc(tagsoup) + * Sat Mar 05 2016 Jens Petersen - 1.16.0.2-1 - update to 1.16.0.2 - patches no longer needed From b58b7657c34769603f5a176d0c4052da8ae4973a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= Date: Sun, 1 May 2016 21:18:34 -0400 Subject: [PATCH 092/165] Rebuild for cmark 0.25 --- pandoc.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pandoc.spec b/pandoc.spec index 48de354..edd61a9 100644 --- a/pandoc.spec +++ b/pandoc.spec @@ -8,7 +8,7 @@ Name: %{pkg_name} Version: 1.16.0.2 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Conversion between markup formats License: GPLv2+ @@ -278,6 +278,9 @@ fi %changelog +* Mon May 02 2016 Zbigniew Jędrzejewski-Szmek - 1.16.0.2-3 +- Rebuild for cmark 0.25 + * Tue Apr 26 2016 Zbigniew Jędrzejewski-Szmek - 1.16.0.2-2 - Rebuild for ghc(tagsoup) From f8303b38ed0e3c8223366d3729275a116d3c0fcc Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Thu, 16 Jun 2016 18:41:20 +0900 Subject: [PATCH 093/165] build with network-uri --- pandoc.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/pandoc.spec b/pandoc.spec index edd61a9..baacbb5 100644 --- a/pandoc.spec +++ b/pandoc.spec @@ -8,7 +8,7 @@ Name: %{pkg_name} Version: 1.16.0.2 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Conversion between markup formats License: GPLv2+ @@ -42,6 +42,7 @@ BuildRequires: ghc-highlighting-kate-devel BuildRequires: ghc-hslua-devel BuildRequires: ghc-mtl-devel BuildRequires: ghc-network-devel +BuildRequires: ghc-network-uri-devel BuildRequires: ghc-old-time-devel BuildRequires: ghc-pandoc-types-devel BuildRequires: ghc-parsec-devel @@ -157,7 +158,6 @@ or texlive-collection-luatex respectively. %prep %setup -q cabal-tweak-flag https False -cabal-tweak-flag network-uri False %build @@ -278,6 +278,9 @@ fi %changelog +* Thu Jun 16 2016 Jens Petersen - 1.16.0.2-4 +- build with network-uri + * Mon May 02 2016 Zbigniew Jędrzejewski-Szmek - 1.16.0.2-3 - Rebuild for cmark 0.25 From f11de49178c9c2f71eede943cc42219c54c3c068 Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Mon, 27 Jun 2016 10:13:18 +0900 Subject: [PATCH 094/165] update to 1.17.1 --- .gitignore | 1 + pandoc.spec | 9 ++++++--- sources | 2 +- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index 46977bb..c283e4f 100644 --- a/.gitignore +++ b/.gitignore @@ -14,3 +14,4 @@ /pandoc-1.12.3.3.tar.gz /pandoc-1.13.2.tar.gz /pandoc-1.16.0.2.tar.gz +/pandoc-1.17.1.tar.gz diff --git a/pandoc.spec b/pandoc.spec index baacbb5..b9e343e 100644 --- a/pandoc.spec +++ b/pandoc.spec @@ -7,8 +7,8 @@ %bcond_with tests Name: %{pkg_name} -Version: 1.16.0.2 -Release: 4%{?dist} +Version: 1.17.1 +Release: 1%{?dist} Summary: Conversion between markup formats License: GPLv2+ @@ -84,7 +84,7 @@ and a command-line tool that uses this library. It can read several dialects of Markdown and (subsets of) HTML, reStructuredText, LaTeX, DocBook, MediaWiki markup, TWiki markup, Haddock markup, OPML, Emacs Org-Mode, txt2tags, Word Docx, ODT, and Textile, and it can write Markdown, reStructuredText, XHTML, -HTML 5, LaTeX, ConTeXt, DocBook, OPML, OpenDocument, ODT, Word docx, RTF, +HTML 5, LaTeX, ConTeXt, DocBook, OPML, TEI, OpenDocument, ODT, Word docx, RTF, MediaWiki, DokuWiki, Textile, groff man pages, plain text, Emacs Org-Mode, AsciiDoc, Haddock markup, EPUB (v2 and v3), FictionBook2, InDesign ICML, and several kinds of HTML/javascript slide shows (S5, Slidy, Slideous, DZSlides, @@ -278,6 +278,9 @@ fi %changelog +* Mon Jun 27 2016 Jens Petersen - 1.17.1-1 +- update to 1.17.1 + * Thu Jun 16 2016 Jens Petersen - 1.16.0.2-4 - build with network-uri diff --git a/sources b/sources index 6cd4835..a77c370 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -e8497a0db52756339db5ce96e9e5fe7e pandoc-1.16.0.2.tar.gz +59150ca758994be29802939bfd075cbf pandoc-1.17.1.tar.gz From b554813e983bb2f0dc20371000c65aa2c1988532 Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Mon, 27 Jun 2016 13:02:33 +0900 Subject: [PATCH 095/165] downgrade to 1.17.0.3 1.17.1 needs newer highlighting-kate than we can build --- .gitignore | 1 + pandoc.spec | 6 +++--- sources | 2 +- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index c283e4f..91d983c 100644 --- a/.gitignore +++ b/.gitignore @@ -15,3 +15,4 @@ /pandoc-1.13.2.tar.gz /pandoc-1.16.0.2.tar.gz /pandoc-1.17.1.tar.gz +/pandoc-1.17.0.3.tar.gz diff --git a/pandoc.spec b/pandoc.spec index b9e343e..e728225 100644 --- a/pandoc.spec +++ b/pandoc.spec @@ -7,7 +7,7 @@ %bcond_with tests Name: %{pkg_name} -Version: 1.17.1 +Version: 1.17.0.3 Release: 1%{?dist} Summary: Conversion between markup formats @@ -278,8 +278,8 @@ fi %changelog -* Mon Jun 27 2016 Jens Petersen - 1.17.1-1 -- update to 1.17.1 +* Mon Jun 27 2016 Jens Petersen - 1.17.0.3-1 +- update to 1.17.0.3 * Thu Jun 16 2016 Jens Petersen - 1.16.0.2-4 - build with network-uri diff --git a/sources b/sources index a77c370..f152b5c 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -59150ca758994be29802939bfd075cbf pandoc-1.17.1.tar.gz +a4d9055e330ea4b573442442e7d411e4 pandoc-1.17.0.3.tar.gz From 42fba95f7b663c2ffa9a91bbb2c8f545a24846c7 Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Thu, 1 Sep 2016 15:52:19 +0900 Subject: [PATCH 096/165] no longer need to remove license from doc and cabal_test --- pandoc.spec | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/pandoc.spec b/pandoc.spec index e728225..cd7385a 100644 --- a/pandoc.spec +++ b/pandoc.spec @@ -177,7 +177,6 @@ mv dist/build/%{name}/%{name}{,.static} mv %{buildroot}%{_bindir}/%{name}{,.dynamic} install dist/build/%{name}/%{name}.static %{buildroot}%{_bindir} touch %{buildroot}%{_bindir}/%{name} -rm %{buildroot}%{_pkgdocdir}/COPYING %endif rm %{buildroot}%{_datadir}/%{name}-%{version}/{COPYRIGHT,README} @@ -188,9 +187,7 @@ install -m 0644 -p -D man/pandoc.1 %{buildroot}%{_mandir}/man1/pandoc.1 %check -%if %{with tests} -%cabal test -%endif +%cabal_test %if %{with static} From 5c30a900b6fe3f52234d37520e1d23c3582606cd Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Thu, 8 Sep 2016 13:30:51 +0900 Subject: [PATCH 097/165] rebuild --- pandoc.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pandoc.spec b/pandoc.spec index cd7385a..688be8d 100644 --- a/pandoc.spec +++ b/pandoc.spec @@ -8,7 +8,7 @@ Name: %{pkg_name} Version: 1.17.0.3 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Conversion between markup formats License: GPLv2+ @@ -275,6 +275,9 @@ fi %changelog +* Thu Sep 8 2016 Jens Petersen - 1.17.0.3-2 +- bump release + * Mon Jun 27 2016 Jens Petersen - 1.17.0.3-1 - update to 1.17.0.3 From 1875a568725acfb51152c8005ff2f289f99ce5fd Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Wed, 28 Sep 2016 12:50:46 +0900 Subject: [PATCH 098/165] use %license --- pandoc.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pandoc.spec b/pandoc.spec index 688be8d..8cb11e3 100644 --- a/pandoc.spec +++ b/pandoc.spec @@ -268,7 +268,7 @@ fi %files -n ghc-%{name} -f ghc-%{name}.files -%doc COPYING COPYRIGHT +%license COPYING COPYRIGHT %files -n ghc-%{name}-devel -f ghc-%{name}-devel.files From 0b102c4ee89c4060c5d8b4607c14bac1bde89460 Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Wed, 28 Sep 2016 12:53:14 +0900 Subject: [PATCH 099/165] add obsoletes for no static build --- pandoc.spec | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pandoc.spec b/pandoc.spec index 8cb11e3..34d87cf 100644 --- a/pandoc.spec +++ b/pandoc.spec @@ -76,6 +76,9 @@ BuildRequires: ghc-test-framework-quickcheck2-devel Requires: %{name}-common = %{version}-%{release} Requires(post): %{_sbindir}/update-alternatives Requires(postun): %{_sbindir}/update-alternatives +%else +Obsoletes: pandoc-common < %{version}-%{release} +Obsoletes: pandoc-static < %{version}-%{release} %endif %description From f551ee3b47a0a3ad5bb8bd9304f22ac485d015eb Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Wed, 28 Sep 2016 18:16:49 +0900 Subject: [PATCH 100/165] use %license --- pandoc.spec | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pandoc.spec b/pandoc.spec index 34d87cf..d551ef1 100644 --- a/pandoc.spec +++ b/pandoc.spec @@ -248,7 +248,8 @@ fi %ghost %{_bindir}/%{name} %{_bindir}/%{name}.dynamic %else -%doc BUGS COPYING COPYRIGHT README* changelog +%license COPYING COPYRIGHT +%doc BUGS README* changelog %attr(755,root,root) %{_bindir}/%{name} %endif %attr(-,root,root) %{_bindir}/hsmarkdown @@ -260,7 +261,8 @@ fi %if %{with static} %files common -%doc BUGS COPYING COPYRIGHT README* changelog +%license COPYING COPYRIGHT +%doc BUGS README* changelog %{_datadir}/%{name}-%{version} From 58bf7a782deb26ee1b50f2450a9a77beb6db0cbf Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Tue, 4 Oct 2016 17:13:44 +0900 Subject: [PATCH 101/165] static condition lib license files --- pandoc.spec | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pandoc.spec b/pandoc.spec index d551ef1..6f1b9e5 100644 --- a/pandoc.spec +++ b/pandoc.spec @@ -273,7 +273,9 @@ fi %files -n ghc-%{name} -f ghc-%{name}.files +%if %{without static} %license COPYING COPYRIGHT +%endif %files -n ghc-%{name}-devel -f ghc-%{name}-devel.files From 8ab236155f28202908377d916cf47b8e33948102 Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Tue, 4 Oct 2016 17:53:52 +0900 Subject: [PATCH 102/165] remove COPYING from pandoc licensedir --- pandoc.spec | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pandoc.spec b/pandoc.spec index 6f1b9e5..e8ff4c0 100644 --- a/pandoc.spec +++ b/pandoc.spec @@ -183,6 +183,10 @@ touch %{buildroot}%{_bindir}/%{name} %endif rm %{buildroot}%{_datadir}/%{name}-%{version}/{COPYRIGHT,README} +%if %{with static} +rm %{buildroot}%{_defaultlicensedir}/%{name}/COPYING +%endif + ln -s pandoc %{buildroot}%{_bindir}/hsmarkdown From faaae4df6ce2c43f421727479caa118b92a63d05 Mon Sep 17 00:00:00 2001 From: Adam Williamson Date: Sat, 7 Jan 2017 10:17:52 -0800 Subject: [PATCH 103/165] Rebuild for new ghc --- pandoc.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pandoc.spec b/pandoc.spec index e8ff4c0..e1c2641 100644 --- a/pandoc.spec +++ b/pandoc.spec @@ -8,7 +8,7 @@ Name: %{pkg_name} Version: 1.17.0.3 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Conversion between markup formats License: GPLv2+ @@ -286,6 +286,9 @@ fi %changelog +* Sat Jan 07 2017 Adam Williamson - 1.17.0.3-3 +- Rebuild for new ghc + * Thu Sep 8 2016 Jens Petersen - 1.17.0.3-2 - bump release From 866fdfa4882d0c89c72567f394560f2363dad4ca Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Thu, 19 Jan 2017 21:52:36 +0900 Subject: [PATCH 104/165] move licensedir to common --- pandoc.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pandoc.spec b/pandoc.spec index e1c2641..15d20af 100644 --- a/pandoc.spec +++ b/pandoc.spec @@ -184,7 +184,7 @@ touch %{buildroot}%{_bindir}/%{name} rm %{buildroot}%{_datadir}/%{name}-%{version}/{COPYRIGHT,README} %if %{with static} -rm %{buildroot}%{_defaultlicensedir}/%{name}/COPYING +mv %{buildroot}%{_defaultlicensedir}/%{name}{,-common} %endif From 6361bd7b55d8f668fce21363e2c9791c395eaab8 Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Wed, 8 Feb 2017 21:36:46 +0900 Subject: [PATCH 105/165] drop and obsolete static and common subpackages --- pandoc.spec | 114 +++------------------------------------------------- 1 file changed, 6 insertions(+), 108 deletions(-) diff --git a/pandoc.spec b/pandoc.spec index 15d20af..d6f1310 100644 --- a/pandoc.spec +++ b/pandoc.spec @@ -1,14 +1,12 @@ # https://fedoraproject.org/wiki/Packaging:Haskell -%bcond_without static - %global pkg_name pandoc %bcond_with tests Name: %{pkg_name} Version: 1.17.0.3 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Conversion between markup formats License: GPLv2+ @@ -72,14 +70,9 @@ BuildRequires: ghc-test-framework-hunit-devel BuildRequires: ghc-test-framework-quickcheck2-devel %endif # End cabal-rpm deps -%if %{with static} -Requires: %{name}-common = %{version}-%{release} -Requires(post): %{_sbindir}/update-alternatives -Requires(postun): %{_sbindir}/update-alternatives -%else +# added for F26 Obsoletes: pandoc-common < %{version}-%{release} Obsoletes: pandoc-static < %{version}-%{release} -%endif %description Pandoc is a Haskell library for converting from one markup format to another, @@ -102,30 +95,8 @@ Thus, adding an input or output format requires only adding a reader or writer. For pdf output please also install pandoc-pdf. -%if %{with static} -%package common -Summary: Common files for %{name} - -%description common -This provides the common files for %{name}. - - -%package static -Summary: Static Haskell build -Requires: %{name}-common = %{version}-%{release} -Requires(post): %{_sbindir}/update-alternatives -Requires(postun): %{_sbindir}/update-alternatives - -%description static -This provides a build with Haskell libraries statically linked. -%endif - - %package -n ghc-%{name} Summary: Haskell %{name} library -%if %{with static} -Requires: %{name}-common = %{version}-%{release} -%endif %description -n ghc-%{name} This package provides the Haskell %{name} shared library. @@ -164,29 +135,14 @@ cabal-tweak-flag https False %build -%if %{with static} -%define ghc_without_dynamic 1 -%ghc_bin_build -mv dist/build/%{name}/%{name}{,.static} -%undefine ghc_without_dynamic -%endif %ghc_lib_build %install %ghc_lib_install %ghc_fix_dynamic_rpath %{pkg_name} -%if %{with static} -mv %{buildroot}%{_bindir}/%{name}{,.dynamic} -install dist/build/%{name}/%{name}.static %{buildroot}%{_bindir} -touch %{buildroot}%{_bindir}/%{name} -%endif rm %{buildroot}%{_datadir}/%{name}-%{version}/{COPYRIGHT,README} -%if %{with static} -mv %{buildroot}%{_defaultlicensedir}/%{name}{,-common} -%endif - ln -s pandoc %{buildroot}%{_bindir}/hsmarkdown @@ -197,48 +153,6 @@ install -m 0644 -p -D man/pandoc.1 %{buildroot}%{_mandir}/man1/pandoc.1 %cabal_test -%if %{with static} -# avoid rpm ghost keeping pre-alternatives binary around -%pre -if [ $1 -gt 1 ] ; then - if [ -f %{_bindir}/%{name} -a ! -L %{_bindir}/%{name} ]; then - rm %{_bindir}/%{name} - fi -fi - - -%post -%{_sbindir}/update-alternatives --install %{_bindir}/%{name} \ - %{name} %{_bindir}/%{name}.dynamic 70 - - -%postun -if [ $1 -eq 0 ] ; then - %{_sbindir}/update-alternatives --remove %{name} %{_bindir}/%{name}.dynamic -fi - - -# avoid rpm ghost keeping pre-alternatives binary around -%pre static -if [ $1 -gt 1 ] ; then - if [ -f %{_bindir}/%{name} -a ! -L %{_bindir}/%{name} ]; then - rm %{_bindir}/%{name} - fi -fi - - -%post static -%{_sbindir}/update-alternatives --install %{_bindir}/%{name} \ - %{name} %{_bindir}/%{name}.static 30 - - -%postun static -if [ $1 -eq 0 ] ; then - %{_sbindir}/update-alternatives --remove %{name} %{_bindir}/%{name}.static -fi -%endif - - %post -n ghc-%{name}-devel %ghc_pkg_recache @@ -248,14 +162,9 @@ fi %files -%if %{with static} -%ghost %{_bindir}/%{name} -%{_bindir}/%{name}.dynamic -%else %license COPYING COPYRIGHT %doc BUGS README* changelog %attr(755,root,root) %{_bindir}/%{name} -%endif %attr(-,root,root) %{_bindir}/hsmarkdown %attr(644,root,root) %{_mandir}/man1/pandoc.1* @@ -263,29 +172,18 @@ fi %files pdf -%if %{with static} -%files common -%license COPYING COPYRIGHT -%doc BUGS README* changelog -%{_datadir}/%{name}-%{version} - - -%files static -%ghost %{_bindir}/%{name} -%{_bindir}/%{name}.static -%endif - - %files -n ghc-%{name} -f ghc-%{name}.files -%if %{without static} %license COPYING COPYRIGHT -%endif +%{_datadir}/%{name}-%{version} %files -n ghc-%{name}-devel -f ghc-%{name}-devel.files %changelog +* Wed Feb 8 2017 Jens Petersen - 1.17.0.3-4 +- drop the static and common subpackages + * Sat Jan 07 2017 Adam Williamson - 1.17.0.3-3 - Rebuild for new ghc From 275819efdcbfbc8b062e97b35001a37379a9bb54 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20Esser?= Date: Wed, 15 Feb 2017 21:12:25 +0100 Subject: [PATCH 106/165] Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild to get back in sync with Haskell so-names --- pandoc.spec | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/pandoc.spec b/pandoc.spec index d6f1310..28a1fd0 100644 --- a/pandoc.spec +++ b/pandoc.spec @@ -6,7 +6,7 @@ Name: %{pkg_name} Version: 1.17.0.3 -Release: 4%{?dist} +Release: 5%{?dist} Summary: Conversion between markup formats License: GPLv2+ @@ -181,6 +181,10 @@ install -m 0644 -p -D man/pandoc.1 %{buildroot}%{_mandir}/man1/pandoc.1 %changelog +* Wed Feb 15 2017 Björn Esser - 1.17.0.3-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild + to get back in sync with Haskell so-names + * Wed Feb 8 2017 Jens Petersen - 1.17.0.3-4 - drop the static and common subpackages From bb1b9eb152bb7b2df9b1940a0267748d77d24953 Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Wed, 22 Feb 2017 10:03:39 +0900 Subject: [PATCH 107/165] update to 1.19.1 --- .gitignore | 1 + pandoc.spec | 51 +++++++++++++++++++++++++++++++++++++++------------ sources | 2 +- 3 files changed, 41 insertions(+), 13 deletions(-) diff --git a/.gitignore b/.gitignore index 91d983c..b7da8e2 100644 --- a/.gitignore +++ b/.gitignore @@ -16,3 +16,4 @@ /pandoc-1.16.0.2.tar.gz /pandoc-1.17.1.tar.gz /pandoc-1.17.0.3.tar.gz +/pandoc-1.19.2.1.tar.gz diff --git a/pandoc.spec b/pandoc.spec index 28a1fd0..ea5e2d4 100644 --- a/pandoc.spec +++ b/pandoc.spec @@ -1,17 +1,23 @@ +# generated by cabal-rpm-0.11.1 # https://fedoraproject.org/wiki/Packaging:Haskell %global pkg_name pandoc +%global pkgver %{pkg_name}-%{version} + +%global doctemplates doctemplates-0.1.0.2 +%global subpkgs %{doctemplates} %bcond_with tests Name: %{pkg_name} -Version: 1.17.0.3 -Release: 5%{?dist} +Version: 1.19.1 +Release: 1%{?dist} Summary: Conversion between markup formats License: GPLv2+ Url: https://hackage.haskell.org/package/%{name} -Source0: https://hackage.haskell.org/package/%{name}-%{version}/%{name}-%{version}.tar.gz +Source0: https://hackage.haskell.org/package/%{pkgver}/%{pkgver}.tar.gz +Source1: https://hackage.haskell.org/package/%{doctemplates}/%{doctemplates}.tar.gz BuildRequires: ghc-Cabal-devel BuildRequires: ghc-rpm-macros @@ -32,6 +38,7 @@ BuildRequires: ghc-containers-devel BuildRequires: ghc-data-default-devel BuildRequires: ghc-deepseq-devel BuildRequires: ghc-directory-devel +#BuildRequires: ghc-doctemplates-devel BuildRequires: ghc-extensible-exceptions-devel BuildRequires: ghc-filemanip-devel BuildRequires: ghc-filepath-devel @@ -53,6 +60,7 @@ BuildRequires: ghc-temporary-devel BuildRequires: ghc-texmath-devel BuildRequires: ghc-text-devel BuildRequires: ghc-time-devel +BuildRequires: ghc-unix-devel BuildRequires: ghc-unordered-containers-devel BuildRequires: ghc-vector-devel BuildRequires: ghc-xml-devel @@ -81,10 +89,10 @@ Markdown and (subsets of) HTML, reStructuredText, LaTeX, DocBook, MediaWiki markup, TWiki markup, Haddock markup, OPML, Emacs Org-Mode, txt2tags, Word Docx, ODT, and Textile, and it can write Markdown, reStructuredText, XHTML, HTML 5, LaTeX, ConTeXt, DocBook, OPML, TEI, OpenDocument, ODT, Word docx, RTF, -MediaWiki, DokuWiki, Textile, groff man pages, plain text, Emacs Org-Mode, -AsciiDoc, Haddock markup, EPUB (v2 and v3), FictionBook2, InDesign ICML, and -several kinds of HTML/javascript slide shows (S5, Slidy, Slideous, DZSlides, -reveal.js). +MediaWiki, DokuWiki, ZimWiki, Textile, groff man pages, plain text, Emacs +Org-Mode, AsciiDoc, Haddock markup, EPUB (v2 and v3), FictionBook2, InDesign +ICML, and several kinds of HTML/javascript slide shows (S5, Slidy, Slideous, +DZSlides, reveal.js). In contrast to most existing tools for converting Markdown to HTML, pandoc has a modular design: it consists of a set of readers, which parse text in a given @@ -129,25 +137,41 @@ To use --latex-engine=xelatex or lualatex, install texlive-collection-xetex or texlive-collection-luatex respectively. +%global main_version %{version} + +%if %{defined ghclibdir} +%ghc_lib_subpackage %{doctemplates} +%endif + +%global version %{main_version} + + %prep -%setup -q +%setup -q -a1 cabal-tweak-flag https False +cabal-tweak-dep-ver directory '< 1.3' '< 1.4' %build +%ghc_libs_build %{subpkgs} %ghc_lib_build %install +%ghc_libs_install %{subpkgs} %ghc_lib_install -%ghc_fix_dynamic_rpath %{pkg_name} +%ghc_fix_rpath %{subpkgs} %{pkgver} -rm %{buildroot}%{_datadir}/%{name}-%{version}/{COPYRIGHT,README} +rm %{buildroot}%{_datadir}/%{name}-%{version}/COPYRIGHT ln -s pandoc %{buildroot}%{_bindir}/hsmarkdown install -m 0644 -p -D man/pandoc.1 %{buildroot}%{_mandir}/man1/pandoc.1 +mkdir -p %{buildroot}%{_docdir} +mv %{buildroot}%{_datadir}/%{doctemplates} %{buildroot}%{_docdir}/ghc-doctemplates-devel +echo "%%doc %{doctemplates}/README.md" >> %{doctemplates}/ghc-doctemplates-devel.files + %check %cabal_test @@ -162,7 +186,7 @@ install -m 0644 -p -D man/pandoc.1 %{buildroot}%{_mandir}/man1/pandoc.1 %files -%license COPYING COPYRIGHT +%license COPYING.md COPYRIGHT %doc BUGS README* changelog %attr(755,root,root) %{_bindir}/%{name} %attr(-,root,root) %{_bindir}/hsmarkdown @@ -173,7 +197,7 @@ install -m 0644 -p -D man/pandoc.1 %{buildroot}%{_mandir}/man1/pandoc.1 %files -n ghc-%{name} -f ghc-%{name}.files -%license COPYING COPYRIGHT +%license COPYING.md COPYRIGHT %{_datadir}/%{name}-%{version} @@ -181,6 +205,9 @@ install -m 0644 -p -D man/pandoc.1 %{buildroot}%{_mandir}/man1/pandoc.1 %changelog +* Wed Feb 22 2017 Jens Petersen - 1.19.1-1 +- update to 1.19.1 + * Wed Feb 15 2017 Björn Esser - 1.17.0.3-5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild to get back in sync with Haskell so-names diff --git a/sources b/sources index f152b5c..9a01e59 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -a4d9055e330ea4b573442442e7d411e4 pandoc-1.17.0.3.tar.gz +SHA512 (pandoc-1.19.2.1.tar.gz) = bb814c162b68efd00f249899ebb2cffa07c69bf0ac73838191de8da38dbc9a37b9edb0c24473c7ac8f816c0105d340ca7387c5f5c6f07a908e1537f4d35ef2f9 From 577ac7cf57e7b2640e406ea1e9af9b32b4d346b0 Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Sat, 25 Feb 2017 20:36:36 +0900 Subject: [PATCH 108/165] use pkgver for datadir --- pandoc.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pandoc.spec b/pandoc.spec index ea5e2d4..c6ba30b 100644 --- a/pandoc.spec +++ b/pandoc.spec @@ -162,7 +162,7 @@ cabal-tweak-dep-ver directory '< 1.3' '< 1.4' %ghc_lib_install %ghc_fix_rpath %{subpkgs} %{pkgver} -rm %{buildroot}%{_datadir}/%{name}-%{version}/COPYRIGHT +rm %{buildroot}%{_datadir}/%{pkgver}/COPYRIGHT ln -s pandoc %{buildroot}%{_bindir}/hsmarkdown @@ -198,7 +198,7 @@ echo "%%doc %{doctemplates}/README.md" >> %{doctemplates}/ghc-doctemplates-devel %files -n ghc-%{name} -f ghc-%{name}.files %license COPYING.md COPYRIGHT -%{_datadir}/%{name}-%{version} +%{_datadir}/%{pkgver} %files -n ghc-%{name}-devel -f ghc-%{name}-devel.files From d8557423f13dbb33a13abfaf956fd6aa4a9ee5d4 Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Sat, 25 Feb 2017 20:56:22 +0900 Subject: [PATCH 109/165] add tarballs --- .gitignore | 3 ++- sources | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index b7da8e2..9bbc0f5 100644 --- a/.gitignore +++ b/.gitignore @@ -16,4 +16,5 @@ /pandoc-1.16.0.2.tar.gz /pandoc-1.17.1.tar.gz /pandoc-1.17.0.3.tar.gz -/pandoc-1.19.2.1.tar.gz +/pandoc-1.19.1.tar.gz +/doctemplates-0.1.0.2.tar.gz diff --git a/sources b/sources index 9a01e59..b4de48f 100644 --- a/sources +++ b/sources @@ -1 +1,2 @@ -SHA512 (pandoc-1.19.2.1.tar.gz) = bb814c162b68efd00f249899ebb2cffa07c69bf0ac73838191de8da38dbc9a37b9edb0c24473c7ac8f816c0105d340ca7387c5f5c6f07a908e1537f4d35ef2f9 +SHA512 (pandoc-1.19.1.tar.gz) = b113f632350ee745f3646b9788299a06818bb7ae5ab36f66e63bd6331f684886ece923c2632bd2726a48e66217dddf17b1fdd4182fd502f498b744620117c4af +SHA512 (doctemplates-0.1.0.2.tar.gz) = 043cc1ff32c7b1b9ac2d528d647c08769ec6ffbf3cbf080422b6f435737030ed4085735ab9c1974bbae87099a31614b66ae800fefab7120e9add5ab03815c430 From d17518547e3d8249bf6a31815b734e3acf39f757 Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Sat, 25 Feb 2017 23:33:23 +0900 Subject: [PATCH 110/165] need subpackaging macros --- pandoc.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pandoc.spec b/pandoc.spec index c6ba30b..c37e20e 100644 --- a/pandoc.spec +++ b/pandoc.spec @@ -20,7 +20,7 @@ Source0: https://hackage.haskell.org/package/%{pkgver}/%{pkgver}.tar.gz Source1: https://hackage.haskell.org/package/%{doctemplates}/%{doctemplates}.tar.gz BuildRequires: ghc-Cabal-devel -BuildRequires: ghc-rpm-macros +BuildRequires: ghc-rpm-macros-extra # Begin cabal-rpm deps: BuildRequires: chrpath BuildRequires: ghc-HTTP-devel From bff7f5915475dc94c129d4173e55ef379e7214fe Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 27 Jul 2017 02:08:49 +0000 Subject: [PATCH 111/165] - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild --- pandoc.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pandoc.spec b/pandoc.spec index c37e20e..4ee49b1 100644 --- a/pandoc.spec +++ b/pandoc.spec @@ -11,7 +11,7 @@ Name: %{pkg_name} Version: 1.19.1 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Conversion between markup formats License: GPLv2+ @@ -205,6 +205,9 @@ echo "%%doc %{doctemplates}/README.md" >> %{doctemplates}/ghc-doctemplates-devel %changelog +* Thu Jul 27 2017 Fedora Release Engineering - 1.19.1-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild + * Wed Feb 22 2017 Jens Petersen - 1.19.1-1 - update to 1.19.1 From b0773ca26ba1b939b4789edd49ce3d7ecf3ee118 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 3 Aug 2017 04:48:30 +0000 Subject: [PATCH 112/165] - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild --- pandoc.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pandoc.spec b/pandoc.spec index 4ee49b1..9b3e823 100644 --- a/pandoc.spec +++ b/pandoc.spec @@ -11,7 +11,7 @@ Name: %{pkg_name} Version: 1.19.1 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Conversion between markup formats License: GPLv2+ @@ -205,6 +205,9 @@ echo "%%doc %{doctemplates}/README.md" >> %{doctemplates}/ghc-doctemplates-devel %changelog +* Thu Aug 03 2017 Fedora Release Engineering - 1.19.1-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild + * Thu Jul 27 2017 Fedora Release Engineering - 1.19.1-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild From a6d8639ed7d94d343addf59fa5a1e1bbad7f507f Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Tue, 10 Oct 2017 23:54:57 +0800 Subject: [PATCH 113/165] enable https (#1497456) --- pandoc.spec | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/pandoc.spec b/pandoc.spec index 9b3e823..1a812a9 100644 --- a/pandoc.spec +++ b/pandoc.spec @@ -1,4 +1,4 @@ -# generated by cabal-rpm-0.11.1 +# generated by cabal-rpm-0.11.2 # https://fedoraproject.org/wiki/Packaging:Haskell %global pkg_name pandoc @@ -45,6 +45,9 @@ BuildRequires: ghc-filepath-devel BuildRequires: ghc-haddock-library-devel BuildRequires: ghc-highlighting-kate-devel BuildRequires: ghc-hslua-devel +BuildRequires: ghc-http-client-devel +BuildRequires: ghc-http-client-tls-devel +BuildRequires: ghc-http-types-devel BuildRequires: ghc-mtl-devel BuildRequires: ghc-network-devel BuildRequires: ghc-network-uri-devel @@ -148,7 +151,6 @@ or texlive-collection-luatex respectively. %prep %setup -q -a1 -cabal-tweak-flag https False cabal-tweak-dep-ver directory '< 1.3' '< 1.4' @@ -205,6 +207,9 @@ echo "%%doc %{doctemplates}/README.md" >> %{doctemplates}/ghc-doctemplates-devel %changelog +* Tue Oct 10 2017 Jens Petersen - 1.19.1-3 +- enable https (#1497456) + * Thu Aug 03 2017 Fedora Release Engineering - 1.19.1-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild From b12947782dec1700a041123741b69370485dc6ec Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Sun, 22 Oct 2017 23:43:26 +0900 Subject: [PATCH 114/165] doc-templates is now packaged in Fedora --- pandoc.spec | 27 +++++++-------------------- sources | 1 - 2 files changed, 7 insertions(+), 21 deletions(-) diff --git a/pandoc.spec b/pandoc.spec index 1a812a9..837baf9 100644 --- a/pandoc.spec +++ b/pandoc.spec @@ -4,23 +4,19 @@ %global pkg_name pandoc %global pkgver %{pkg_name}-%{version} -%global doctemplates doctemplates-0.1.0.2 -%global subpkgs %{doctemplates} - %bcond_with tests Name: %{pkg_name} Version: 1.19.1 -Release: 3%{?dist} +Release: 6%{?dist} Summary: Conversion between markup formats License: GPLv2+ Url: https://hackage.haskell.org/package/%{name} Source0: https://hackage.haskell.org/package/%{pkgver}/%{pkgver}.tar.gz -Source1: https://hackage.haskell.org/package/%{doctemplates}/%{doctemplates}.tar.gz BuildRequires: ghc-Cabal-devel -BuildRequires: ghc-rpm-macros-extra +BuildRequires: ghc-rpm-macros # Begin cabal-rpm deps: BuildRequires: chrpath BuildRequires: ghc-HTTP-devel @@ -38,7 +34,7 @@ BuildRequires: ghc-containers-devel BuildRequires: ghc-data-default-devel BuildRequires: ghc-deepseq-devel BuildRequires: ghc-directory-devel -#BuildRequires: ghc-doctemplates-devel +BuildRequires: ghc-doctemplates-devel BuildRequires: ghc-extensible-exceptions-devel BuildRequires: ghc-filemanip-devel BuildRequires: ghc-filepath-devel @@ -140,29 +136,17 @@ To use --latex-engine=xelatex or lualatex, install texlive-collection-xetex or texlive-collection-luatex respectively. -%global main_version %{version} - -%if %{defined ghclibdir} -%ghc_lib_subpackage %{doctemplates} -%endif - -%global version %{main_version} - - %prep -%setup -q -a1 +%setup -q cabal-tweak-dep-ver directory '< 1.3' '< 1.4' %build -%ghc_libs_build %{subpkgs} %ghc_lib_build %install -%ghc_libs_install %{subpkgs} %ghc_lib_install -%ghc_fix_rpath %{subpkgs} %{pkgver} rm %{buildroot}%{_datadir}/%{pkgver}/COPYRIGHT @@ -207,6 +191,9 @@ echo "%%doc %{doctemplates}/README.md" >> %{doctemplates}/ghc-doctemplates-devel %changelog +* Sun Oct 22 2017 Jens Petersen - 1.19.1-6 +- doc-templates is now packaged in Fedora + * Tue Oct 10 2017 Jens Petersen - 1.19.1-3 - enable https (#1497456) diff --git a/sources b/sources index b4de48f..2640669 100644 --- a/sources +++ b/sources @@ -1,2 +1 @@ SHA512 (pandoc-1.19.1.tar.gz) = b113f632350ee745f3646b9788299a06818bb7ae5ab36f66e63bd6331f684886ece923c2632bd2726a48e66217dddf17b1fdd4182fd502f498b744620117c4af -SHA512 (doctemplates-0.1.0.2.tar.gz) = 043cc1ff32c7b1b9ac2d528d647c08769ec6ffbf3cbf080422b6f435737030ed4085735ab9c1974bbae87099a31614b66ae800fefab7120e9add5ab03815c430 From bc884f5bb4173e921ac9c31377689acdf7077131 Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Sun, 22 Oct 2017 23:49:05 +0900 Subject: [PATCH 115/165] fix the last release numbers --- pandoc.spec | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pandoc.spec b/pandoc.spec index 837baf9..81e3eb4 100644 --- a/pandoc.spec +++ b/pandoc.spec @@ -8,7 +8,7 @@ Name: %{pkg_name} Version: 1.19.1 -Release: 6%{?dist} +Release: 5%{?dist} Summary: Conversion between markup formats License: GPLv2+ @@ -191,10 +191,10 @@ echo "%%doc %{doctemplates}/README.md" >> %{doctemplates}/ghc-doctemplates-devel %changelog -* Sun Oct 22 2017 Jens Petersen - 1.19.1-6 +* Sun Oct 22 2017 Jens Petersen - 1.19.1-5 - doc-templates is now packaged in Fedora -* Tue Oct 10 2017 Jens Petersen - 1.19.1-3 +* Tue Oct 10 2017 Jens Petersen - 1.19.1-4 - enable https (#1497456) * Thu Aug 03 2017 Fedora Release Engineering - 1.19.1-3 From 74c087653c3a57637d0b4663839e5fea082ed5ea Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Mon, 23 Oct 2017 17:17:35 +0900 Subject: [PATCH 116/165] remove doctemplates lines from %install --- pandoc.spec | 4 ---- 1 file changed, 4 deletions(-) diff --git a/pandoc.spec b/pandoc.spec index 81e3eb4..cf52328 100644 --- a/pandoc.spec +++ b/pandoc.spec @@ -154,10 +154,6 @@ ln -s pandoc %{buildroot}%{_bindir}/hsmarkdown install -m 0644 -p -D man/pandoc.1 %{buildroot}%{_mandir}/man1/pandoc.1 -mkdir -p %{buildroot}%{_docdir} -mv %{buildroot}%{_datadir}/%{doctemplates} %{buildroot}%{_docdir}/ghc-doctemplates-devel -echo "%%doc %{doctemplates}/README.md" >> %{doctemplates}/ghc-doctemplates-devel.files - %check %cabal_test From 15db963691f123aeedd5b91427c15593b01cd133 Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Wed, 15 Nov 2017 18:32:57 +0900 Subject: [PATCH 117/165] remove old README.fedora file --- README.fedora | 5 ----- 1 file changed, 5 deletions(-) delete mode 100644 README.fedora diff --git a/README.fedora b/README.fedora deleted file mode 100644 index e4c3b72..0000000 --- a/README.fedora +++ /dev/null @@ -1,5 +0,0 @@ -PDF output requires texlive: - - $ sudo yum install texlive-latex texlive-xetex - : - $ pandoc -o output.pdf ... From e33250ac8d650fca99459acf86501de20a11926b Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Thu, 16 Nov 2017 21:09:09 +0900 Subject: [PATCH 118/165] update to 1.19.2.4 --- .gitignore | 1 + pandoc.spec | 11 +++++++---- sources | 2 +- 3 files changed, 9 insertions(+), 5 deletions(-) diff --git a/.gitignore b/.gitignore index 9bbc0f5..9f57bee 100644 --- a/.gitignore +++ b/.gitignore @@ -18,3 +18,4 @@ /pandoc-1.17.0.3.tar.gz /pandoc-1.19.1.tar.gz /doctemplates-0.1.0.2.tar.gz +/pandoc-1.19.2.4.tar.gz diff --git a/pandoc.spec b/pandoc.spec index cf52328..5be5eed 100644 --- a/pandoc.spec +++ b/pandoc.spec @@ -7,8 +7,8 @@ %bcond_with tests Name: %{pkg_name} -Version: 1.19.1 -Release: 5%{?dist} +Version: 1.19.2.4 +Release: 1%{?dist} Summary: Conversion between markup formats License: GPLv2+ @@ -39,7 +39,6 @@ BuildRequires: ghc-extensible-exceptions-devel BuildRequires: ghc-filemanip-devel BuildRequires: ghc-filepath-devel BuildRequires: ghc-haddock-library-devel -BuildRequires: ghc-highlighting-kate-devel BuildRequires: ghc-hslua-devel BuildRequires: ghc-http-client-devel BuildRequires: ghc-http-client-tls-devel @@ -53,6 +52,7 @@ BuildRequires: ghc-parsec-devel BuildRequires: ghc-process-devel BuildRequires: ghc-random-devel BuildRequires: ghc-scientific-devel +BuildRequires: ghc-skylighting-devel BuildRequires: ghc-syb-devel BuildRequires: ghc-tagsoup-devel BuildRequires: ghc-temporary-devel @@ -138,7 +138,6 @@ or texlive-collection-luatex respectively. %prep %setup -q -cabal-tweak-dep-ver directory '< 1.3' '< 1.4' %build @@ -187,6 +186,10 @@ install -m 0644 -p -D man/pandoc.1 %{buildroot}%{_mandir}/man1/pandoc.1 %changelog +* Thu Nov 16 2017 Jens Petersen - 1.19.2.4-1 +- update to 1.19.2.4 +- uses skylighting instead of highlighting-kate + * Sun Oct 22 2017 Jens Petersen - 1.19.1-5 - doc-templates is now packaged in Fedora diff --git a/sources b/sources index 2640669..8821aad 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (pandoc-1.19.1.tar.gz) = b113f632350ee745f3646b9788299a06818bb7ae5ab36f66e63bd6331f684886ece923c2632bd2726a48e66217dddf17b1fdd4182fd502f498b744620117c4af +SHA512 (pandoc-1.19.2.4.tar.gz) = 34c5f7827ea441bdc0762f82b93dbff80567789ef3e16e6e33e4d3a54f4d50bfd624338142dbc28360fa9fd84a64c5079acb57e56a73673b2aec8459564773a2 From 6cfdc3407cf6db12d5481cd0f4065419bf1276b4 Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Tue, 5 Dec 2017 17:45:12 +0900 Subject: [PATCH 119/165] allow skylighting > 0.2 which has prof on all archs --- pandoc.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/pandoc.spec b/pandoc.spec index 5be5eed..907a089 100644 --- a/pandoc.spec +++ b/pandoc.spec @@ -138,6 +138,7 @@ or texlive-collection-luatex respectively. %prep %setup -q +cabal-tweak-dep-ver skylighting '< 0.2' '< 0.5' %build From d2817acd999ab074b4ccc339d4cb6216516d49ac Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Mon, 11 Dec 2017 17:55:32 +0900 Subject: [PATCH 120/165] refresh to cabal-rpm-0.12 --- pandoc.spec | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/pandoc.spec b/pandoc.spec index 907a089..46d0cf1 100644 --- a/pandoc.spec +++ b/pandoc.spec @@ -1,4 +1,4 @@ -# generated by cabal-rpm-0.11.2 +# generated by cabal-rpm-0.12 # https://fedoraproject.org/wiki/Packaging:Haskell %global pkg_name pandoc @@ -112,9 +112,12 @@ This package provides the Haskell %{name} shared library. %package -n ghc-%{name}-devel Summary: Haskell %{name} library development files Provides: ghc-%{name}-static = %{version}-%{release} +Provides: ghc-%{name}-doc = %{version}-%{release} +%if %{defined ghc_version} Requires: ghc-compiler = %{ghc_version} Requires(post): ghc-compiler = %{ghc_version} Requires(postun): ghc-compiler = %{ghc_version} +%endif Requires: ghc-%{name}%{?_isa} = %{version}-%{release} %description -n ghc-%{name}-devel @@ -147,6 +150,7 @@ cabal-tweak-dep-ver skylighting '< 0.2' '< 0.5' %install %ghc_lib_install +%ghc_fix_rpath %{pkgver} rm %{buildroot}%{_datadir}/%{pkgver}/COPYRIGHT @@ -187,6 +191,9 @@ install -m 0644 -p -D man/pandoc.1 %{buildroot}%{_mandir}/man1/pandoc.1 %changelog +* Mon Dec 11 2017 Jens Petersen - 1.19.2.4-1 +- refresh to cabal-rpm-0.12 + * Thu Nov 16 2017 Jens Petersen - 1.19.2.4-1 - update to 1.19.2.4 - uses skylighting instead of highlighting-kate From 73616fd698e33eba0a1b885e978abefe55fc52bd Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Mon, 11 Dec 2017 18:40:24 +0900 Subject: [PATCH 121/165] bump release --- pandoc.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pandoc.spec b/pandoc.spec index 46d0cf1..d683e76 100644 --- a/pandoc.spec +++ b/pandoc.spec @@ -8,7 +8,7 @@ Name: %{pkg_name} Version: 1.19.2.4 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Conversion between markup formats License: GPLv2+ @@ -191,7 +191,7 @@ install -m 0644 -p -D man/pandoc.1 %{buildroot}%{_mandir}/man1/pandoc.1 %changelog -* Mon Dec 11 2017 Jens Petersen - 1.19.2.4-1 +* Mon Dec 11 2017 Jens Petersen - 1.19.2.4-2 - refresh to cabal-rpm-0.12 * Thu Nov 16 2017 Jens Petersen - 1.19.2.4-1 From 630e49c2104ec2b81f322d3810657d74c2c9342c Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Wed, 24 Jan 2018 14:12:29 +0100 Subject: [PATCH 122/165] refresh to cabal-rpm-0.12.1 --- pandoc.spec | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/pandoc.spec b/pandoc.spec index d683e76..cf180e6 100644 --- a/pandoc.spec +++ b/pandoc.spec @@ -1,4 +1,4 @@ -# generated by cabal-rpm-0.12 +# generated by cabal-rpm-0.12.1 # https://fedoraproject.org/wiki/Packaging:Haskell %global pkg_name pandoc @@ -163,6 +163,12 @@ install -m 0644 -p -D man/pandoc.1 %{buildroot}%{_mandir}/man1/pandoc.1 %cabal_test +%post -n ghc-%{name} -p /sbin/ldconfig + + +%postun -n ghc-%{name} -p /sbin/ldconfig + + %post -n ghc-%{name}-devel %ghc_pkg_recache From 59c21acc693890d8e565dc95cd696bcd25549a41 Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Wed, 24 Jan 2018 17:10:09 +0100 Subject: [PATCH 123/165] update to 2.0.6 --- .gitignore | 1 + pandoc.spec | 44 ++++++++++++++++++++++++-------------------- sources | 2 +- 3 files changed, 26 insertions(+), 21 deletions(-) diff --git a/.gitignore b/.gitignore index 9f57bee..e777b6b 100644 --- a/.gitignore +++ b/.gitignore @@ -19,3 +19,4 @@ /pandoc-1.19.1.tar.gz /doctemplates-0.1.0.2.tar.gz /pandoc-1.19.2.4.tar.gz +/pandoc-2.0.6.tar.gz diff --git a/pandoc.spec b/pandoc.spec index cf180e6..f7981b9 100644 --- a/pandoc.spec +++ b/pandoc.spec @@ -7,8 +7,8 @@ %bcond_with tests Name: %{pkg_name} -Version: 1.19.2.4 -Release: 2%{?dist} +Version: 2.0.6 +Release: 1%{?dist} Summary: Conversion between markup formats License: GPLv2+ @@ -19,40 +19,42 @@ BuildRequires: ghc-Cabal-devel BuildRequires: ghc-rpm-macros # Begin cabal-rpm deps: BuildRequires: chrpath +BuildRequires: ghc-Glob-devel BuildRequires: ghc-HTTP-devel BuildRequires: ghc-JuicyPixels-devel BuildRequires: ghc-SHA-devel BuildRequires: ghc-aeson-devel -BuildRequires: ghc-array-devel +BuildRequires: ghc-aeson-pretty-devel BuildRequires: ghc-base64-bytestring-devel BuildRequires: ghc-binary-devel BuildRequires: ghc-blaze-html-devel BuildRequires: ghc-blaze-markup-devel BuildRequires: ghc-bytestring-devel -BuildRequires: ghc-cmark-devel +BuildRequires: ghc-case-insensitive-devel +BuildRequires: ghc-cmark-gfm-devel BuildRequires: ghc-containers-devel BuildRequires: ghc-data-default-devel BuildRequires: ghc-deepseq-devel BuildRequires: ghc-directory-devel BuildRequires: ghc-doctemplates-devel -BuildRequires: ghc-extensible-exceptions-devel -BuildRequires: ghc-filemanip-devel BuildRequires: ghc-filepath-devel BuildRequires: ghc-haddock-library-devel BuildRequires: ghc-hslua-devel +BuildRequires: ghc-hslua-module-text-devel BuildRequires: ghc-http-client-devel BuildRequires: ghc-http-client-tls-devel BuildRequires: ghc-http-types-devel BuildRequires: ghc-mtl-devel BuildRequires: ghc-network-devel BuildRequires: ghc-network-uri-devel -BuildRequires: ghc-old-time-devel BuildRequires: ghc-pandoc-types-devel BuildRequires: ghc-parsec-devel BuildRequires: ghc-process-devel BuildRequires: ghc-random-devel +BuildRequires: ghc-safe-devel BuildRequires: ghc-scientific-devel BuildRequires: ghc-skylighting-devel +BuildRequires: ghc-split-devel BuildRequires: ghc-syb-devel BuildRequires: ghc-tagsoup-devel BuildRequires: ghc-temporary-devel @@ -68,13 +70,12 @@ BuildRequires: ghc-zip-archive-devel BuildRequires: ghc-zlib-devel %if %{with tests} BuildRequires: ghc-Diff-devel -BuildRequires: ghc-HUnit-devel BuildRequires: ghc-QuickCheck-devel -BuildRequires: ghc-ansi-terminal-devel BuildRequires: ghc-executable-path-devel -BuildRequires: ghc-test-framework-devel -BuildRequires: ghc-test-framework-hunit-devel -BuildRequires: ghc-test-framework-quickcheck2-devel +BuildRequires: ghc-tasty-devel +BuildRequires: ghc-tasty-golden-devel +BuildRequires: ghc-tasty-hunit-devel +BuildRequires: ghc-tasty-quickcheck-devel %endif # End cabal-rpm deps # added for F26 @@ -84,14 +85,15 @@ Obsoletes: pandoc-static < %{version}-%{release} %description Pandoc is a Haskell library for converting from one markup format to another, and a command-line tool that uses this library. It can read several dialects of -Markdown and (subsets of) HTML, reStructuredText, LaTeX, DocBook, MediaWiki -markup, TWiki markup, Haddock markup, OPML, Emacs Org-Mode, txt2tags, Word -Docx, ODT, and Textile, and it can write Markdown, reStructuredText, XHTML, -HTML 5, LaTeX, ConTeXt, DocBook, OPML, TEI, OpenDocument, ODT, Word docx, RTF, -MediaWiki, DokuWiki, ZimWiki, Textile, groff man pages, plain text, Emacs +Markdown and (subsets of) HTML, reStructuredText, LaTeX, DocBook, JATS, +MediaWiki markup, TWiki markup, TikiWiki markup, Creole 1.0, Haddock markup, +OPML, Emacs Org-Mode, Emacs Muse, txt2tags, Vimwiki, Word Docx, ODT, and +Textile, and it can write Markdown, reStructuredText, XHTML, HTML 5, LaTeX, +ConTeXt, DocBook, JATS, OPML, TEI, OpenDocument, ODT, Word docx, RTF, +MediaWiki, DokuWiki, ZimWiki, Textile, groff man, groff ms, plain text, Emacs Org-Mode, AsciiDoc, Haddock markup, EPUB (v2 and v3), FictionBook2, InDesign -ICML, and several kinds of HTML/javascript slide shows (S5, Slidy, Slideous, -DZSlides, reveal.js). +ICML, Muse, LaTeX beamer slides, PowerPoint, and several kinds of +HTML/JavaScript slide shows (S5, Slidy, Slideous, DZSlides, reveal.js). In contrast to most existing tools for converting Markdown to HTML, pandoc has a modular design: it consists of a set of readers, which parse text in a given @@ -141,7 +143,6 @@ or texlive-collection-luatex respectively. %prep %setup -q -cabal-tweak-dep-ver skylighting '< 0.2' '< 0.5' %build @@ -197,6 +198,9 @@ install -m 0644 -p -D man/pandoc.1 %{buildroot}%{_mandir}/man1/pandoc.1 %changelog +* Wed Jan 24 2018 Jens Petersen - 2.0.6-1 +- update to 2.0.6 + * Mon Dec 11 2017 Jens Petersen - 1.19.2.4-2 - refresh to cabal-rpm-0.12 diff --git a/sources b/sources index 8821aad..f56a0f4 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (pandoc-1.19.2.4.tar.gz) = 34c5f7827ea441bdc0762f82b93dbff80567789ef3e16e6e33e4d3a54f4d50bfd624338142dbc28360fa9fd84a64c5079acb57e56a73673b2aec8459564773a2 +SHA512 (pandoc-2.0.6.tar.gz) = a1e59fbedc8efbeaa482a90392beff3e6b93c5ee52f2955c57eba83baadfc10c76f474c1254de22daf7c0d250dc9114331d878f56ebf2e90cdd5bf75ecd6f208 From 74960a2a5d4e6ce653fafec681ec2f1ea8a2a415 Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Mon, 29 Jan 2018 16:03:47 +0100 Subject: [PATCH 124/165] subpackage new deps: cmark-gfm and hslua-module-text --- .gitignore | 2 ++ pandoc.spec | 29 +++++++++++++++++++++++++---- sources | 2 ++ 3 files changed, 29 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index e777b6b..c70f4a7 100644 --- a/.gitignore +++ b/.gitignore @@ -20,3 +20,5 @@ /doctemplates-0.1.0.2.tar.gz /pandoc-1.19.2.4.tar.gz /pandoc-2.0.6.tar.gz +/cmark-gfm-0.1.3.tar.gz +/hslua-module-text-0.1.2.1.tar.gz diff --git a/pandoc.spec b/pandoc.spec index f7981b9..1de3f1e 100644 --- a/pandoc.spec +++ b/pandoc.spec @@ -4,19 +4,26 @@ %global pkg_name pandoc %global pkgver %{pkg_name}-%{version} +%global cmarkgfm cmark-gfm-0.1.3 +%global hsluamoduletext hslua-module-text-0.1.2.1 +%global subpkgs %{cmarkgfm} %{hsluamoduletext} + %bcond_with tests Name: %{pkg_name} Version: 2.0.6 +# can only be reset when all subpkgs bumped Release: 1%{?dist} Summary: Conversion between markup formats License: GPLv2+ Url: https://hackage.haskell.org/package/%{name} Source0: https://hackage.haskell.org/package/%{pkgver}/%{pkgver}.tar.gz +Source1: https://hackage.haskell.org/package/%{cmarkgfm}/%{cmarkgfm}.tar.gz +Source2: https://hackage.haskell.org/package/%{hsluamoduletext}/%{hsluamoduletext}.tar.gz BuildRequires: ghc-Cabal-devel -BuildRequires: ghc-rpm-macros +BuildRequires: ghc-rpm-macros-extra # Begin cabal-rpm deps: BuildRequires: chrpath BuildRequires: ghc-Glob-devel @@ -31,7 +38,7 @@ BuildRequires: ghc-blaze-html-devel BuildRequires: ghc-blaze-markup-devel BuildRequires: ghc-bytestring-devel BuildRequires: ghc-case-insensitive-devel -BuildRequires: ghc-cmark-gfm-devel +#BuildRequires: ghc-cmark-gfm-devel BuildRequires: ghc-containers-devel BuildRequires: ghc-data-default-devel BuildRequires: ghc-deepseq-devel @@ -40,7 +47,7 @@ BuildRequires: ghc-doctemplates-devel BuildRequires: ghc-filepath-devel BuildRequires: ghc-haddock-library-devel BuildRequires: ghc-hslua-devel -BuildRequires: ghc-hslua-module-text-devel +#BuildRequires: ghc-hslua-module-text-devel BuildRequires: ghc-http-client-devel BuildRequires: ghc-http-client-tls-devel BuildRequires: ghc-http-types-devel @@ -141,17 +148,30 @@ To use --latex-engine=xelatex or lualatex, install texlive-collection-xetex or texlive-collection-luatex respectively. +%global main_version %{version} + +%if %{defined ghclibdir} +%ghc_lib_subpackage %{cmarkgfm} +%ghc_lib_subpackage %{hsluamoduletext} +%endif + +%global version %{main_version} + + %prep -%setup -q +%setup -q -a1 -a2 %build +%ghc_libs_build %{subpkgs} %ghc_lib_build %install +%ghc_libs_install %{subpkgs} %ghc_lib_install %ghc_fix_rpath %{pkgver} +mv %{buildroot}%{_ghclicensedir}/{,ghc-}%{name} rm %{buildroot}%{_datadir}/%{pkgver}/COPYRIGHT @@ -200,6 +220,7 @@ install -m 0644 -p -D man/pandoc.1 %{buildroot}%{_mandir}/man1/pandoc.1 %changelog * Wed Jan 24 2018 Jens Petersen - 2.0.6-1 - update to 2.0.6 +- subpackage 2 new deps * Mon Dec 11 2017 Jens Petersen - 1.19.2.4-2 - refresh to cabal-rpm-0.12 diff --git a/sources b/sources index f56a0f4..268e062 100644 --- a/sources +++ b/sources @@ -1 +1,3 @@ +SHA512 (cmark-gfm-0.1.3.tar.gz) = c12b533c377a7433e78acb39d0ec743e6c2b341f25e6c6722cfb543297b2a4c936c8d2dd5ef878e931bdb829b4a556ef630854c3dad442b5f464e91fbe6ed9c0 +SHA512 (hslua-module-text-0.1.2.1.tar.gz) = 06f6b5611d452479e99772bbd1eb622f56740a5fc17091cd5c49e13dacb5654deb6d073fe2f40ffb7240ab9267ea3c59d0282ef8f55fce9095525b3d29a73513 SHA512 (pandoc-2.0.6.tar.gz) = a1e59fbedc8efbeaa482a90392beff3e6b93c5ee52f2955c57eba83baadfc10c76f474c1254de22daf7c0d250dc9114331d878f56ebf2e90cdd5bf75ecd6f208 From b29b9f145756354713bf4bac995bbbe31509b260 Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Sun, 4 Feb 2018 01:03:55 +0900 Subject: [PATCH 125/165] drop ldconfig scriptlets --- pandoc.spec | 6 ------ 1 file changed, 6 deletions(-) diff --git a/pandoc.spec b/pandoc.spec index 1de3f1e..14d0cc9 100644 --- a/pandoc.spec +++ b/pandoc.spec @@ -184,12 +184,6 @@ install -m 0644 -p -D man/pandoc.1 %{buildroot}%{_mandir}/man1/pandoc.1 %cabal_test -%post -n ghc-%{name} -p /sbin/ldconfig - - -%postun -n ghc-%{name} -p /sbin/ldconfig - - %post -n ghc-%{name}-devel %ghc_pkg_recache From 4ebab17573995d40829cb3cadd9218307e36cee9 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 8 Feb 2018 18:14:31 +0000 Subject: [PATCH 126/165] - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- pandoc.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pandoc.spec b/pandoc.spec index 14d0cc9..b20ccf8 100644 --- a/pandoc.spec +++ b/pandoc.spec @@ -13,7 +13,7 @@ Name: %{pkg_name} Version: 2.0.6 # can only be reset when all subpkgs bumped -Release: 1%{?dist} +Release: 2%{?dist} Summary: Conversion between markup formats License: GPLv2+ @@ -212,6 +212,9 @@ install -m 0644 -p -D man/pandoc.1 %{buildroot}%{_mandir}/man1/pandoc.1 %changelog +* Thu Feb 08 2018 Fedora Release Engineering - 2.0.6-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild + * Wed Jan 24 2018 Jens Petersen - 2.0.6-1 - update to 2.0.6 - subpackage 2 new deps From 61a2894808febc37ee949b41af9b962aa8e2b59b Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Thu, 31 May 2018 00:02:24 +0900 Subject: [PATCH 127/165] cmark-gfm and hslua-module-text are now packaged --- pandoc.spec | 32 ++++++++------------------------ sources | 2 -- 2 files changed, 8 insertions(+), 26 deletions(-) diff --git a/pandoc.spec b/pandoc.spec index b20ccf8..18572e0 100644 --- a/pandoc.spec +++ b/pandoc.spec @@ -4,26 +4,19 @@ %global pkg_name pandoc %global pkgver %{pkg_name}-%{version} -%global cmarkgfm cmark-gfm-0.1.3 -%global hsluamoduletext hslua-module-text-0.1.2.1 -%global subpkgs %{cmarkgfm} %{hsluamoduletext} - %bcond_with tests Name: %{pkg_name} Version: 2.0.6 -# can only be reset when all subpkgs bumped -Release: 2%{?dist} +Release: 3%{?dist} Summary: Conversion between markup formats License: GPLv2+ Url: https://hackage.haskell.org/package/%{name} Source0: https://hackage.haskell.org/package/%{pkgver}/%{pkgver}.tar.gz -Source1: https://hackage.haskell.org/package/%{cmarkgfm}/%{cmarkgfm}.tar.gz -Source2: https://hackage.haskell.org/package/%{hsluamoduletext}/%{hsluamoduletext}.tar.gz BuildRequires: ghc-Cabal-devel -BuildRequires: ghc-rpm-macros-extra +BuildRequires: ghc-rpm-macros # Begin cabal-rpm deps: BuildRequires: chrpath BuildRequires: ghc-Glob-devel @@ -38,7 +31,7 @@ BuildRequires: ghc-blaze-html-devel BuildRequires: ghc-blaze-markup-devel BuildRequires: ghc-bytestring-devel BuildRequires: ghc-case-insensitive-devel -#BuildRequires: ghc-cmark-gfm-devel +BuildRequires: ghc-cmark-gfm-devel BuildRequires: ghc-containers-devel BuildRequires: ghc-data-default-devel BuildRequires: ghc-deepseq-devel @@ -47,7 +40,7 @@ BuildRequires: ghc-doctemplates-devel BuildRequires: ghc-filepath-devel BuildRequires: ghc-haddock-library-devel BuildRequires: ghc-hslua-devel -#BuildRequires: ghc-hslua-module-text-devel +BuildRequires: ghc-hslua-module-text-devel BuildRequires: ghc-http-client-devel BuildRequires: ghc-http-client-tls-devel BuildRequires: ghc-http-types-devel @@ -148,27 +141,15 @@ To use --latex-engine=xelatex or lualatex, install texlive-collection-xetex or texlive-collection-luatex respectively. -%global main_version %{version} - -%if %{defined ghclibdir} -%ghc_lib_subpackage %{cmarkgfm} -%ghc_lib_subpackage %{hsluamoduletext} -%endif - -%global version %{main_version} - - %prep -%setup -q -a1 -a2 +%setup -q %build -%ghc_libs_build %{subpkgs} %ghc_lib_build %install -%ghc_libs_install %{subpkgs} %ghc_lib_install %ghc_fix_rpath %{pkgver} mv %{buildroot}%{_ghclicensedir}/{,ghc-}%{name} @@ -212,6 +193,9 @@ install -m 0644 -p -D man/pandoc.1 %{buildroot}%{_mandir}/man1/pandoc.1 %changelog +* Thu May 31 2018 Jens Petersen - 2.0.6-3 +- no longer subpackage cmark-gfm and hslua-module-text + * Thu Feb 08 2018 Fedora Release Engineering - 2.0.6-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild diff --git a/sources b/sources index 268e062..f56a0f4 100644 --- a/sources +++ b/sources @@ -1,3 +1 @@ -SHA512 (cmark-gfm-0.1.3.tar.gz) = c12b533c377a7433e78acb39d0ec743e6c2b341f25e6c6722cfb543297b2a4c936c8d2dd5ef878e931bdb829b4a556ef630854c3dad442b5f464e91fbe6ed9c0 -SHA512 (hslua-module-text-0.1.2.1.tar.gz) = 06f6b5611d452479e99772bbd1eb622f56740a5fc17091cd5c49e13dacb5654deb6d073fe2f40ffb7240ab9267ea3c59d0282ef8f55fce9095525b3d29a73513 SHA512 (pandoc-2.0.6.tar.gz) = a1e59fbedc8efbeaa482a90392beff3e6b93c5ee52f2955c57eba83baadfc10c76f474c1254de22daf7c0d250dc9114331d878f56ebf2e90cdd5bf75ecd6f208 From 3aa9d6a26e1373c927d59d67621b96ff909420fd Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Fri, 1 Jun 2018 17:32:44 +0900 Subject: [PATCH 128/165] bump --- pandoc.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pandoc.spec b/pandoc.spec index 18572e0..b322155 100644 --- a/pandoc.spec +++ b/pandoc.spec @@ -8,7 +8,7 @@ Name: %{pkg_name} Version: 2.0.6 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Conversion between markup formats License: GPLv2+ @@ -193,6 +193,9 @@ install -m 0644 -p -D man/pandoc.1 %{buildroot}%{_mandir}/man1/pandoc.1 %changelog +* Fri Jun 1 2018 Jens Petersen - 2.0.6-4 +- rebuild + * Thu May 31 2018 Jens Petersen - 2.0.6-3 - no longer subpackage cmark-gfm and hslua-module-text From c49d332b61ec789fd97dea6b0ce1a9cbcb022aed Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 13 Jul 2018 15:27:35 +0000 Subject: [PATCH 129/165] - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- pandoc.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pandoc.spec b/pandoc.spec index b322155..e6044f1 100644 --- a/pandoc.spec +++ b/pandoc.spec @@ -8,7 +8,7 @@ Name: %{pkg_name} Version: 2.0.6 -Release: 4%{?dist} +Release: 5%{?dist} Summary: Conversion between markup formats License: GPLv2+ @@ -193,6 +193,9 @@ install -m 0644 -p -D man/pandoc.1 %{buildroot}%{_mandir}/man1/pandoc.1 %changelog +* Fri Jul 13 2018 Fedora Release Engineering - 2.0.6-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild + * Fri Jun 1 2018 Jens Petersen - 2.0.6-4 - rebuild From 96606d19586bb0097a0f4246030b2839b424ca2d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= Date: Mon, 23 Jul 2018 13:41:33 +0200 Subject: [PATCH 130/165] Rebuilt for #1607054 --- pandoc.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pandoc.spec b/pandoc.spec index e6044f1..3451d04 100644 --- a/pandoc.spec +++ b/pandoc.spec @@ -8,7 +8,7 @@ Name: %{pkg_name} Version: 2.0.6 -Release: 5%{?dist} +Release: 6%{?dist} Summary: Conversion between markup formats License: GPLv2+ @@ -193,6 +193,9 @@ install -m 0644 -p -D man/pandoc.1 %{buildroot}%{_mandir}/man1/pandoc.1 %changelog +* Mon Jul 23 2018 Miro Hrončok - 2.0.6-6 +- Rebuilt for #1607054 + * Fri Jul 13 2018 Fedora Release Engineering - 2.0.6-5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild From 6693eab755007a5aaa75c208ab3ec5373cb6928c Mon Sep 17 00:00:00 2001 From: Adam Williamson Date: Mon, 23 Jul 2018 23:30:45 -0700 Subject: [PATCH 131/165] Disable annotated build to work around #1607054 --- pandoc.spec | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pandoc.spec b/pandoc.spec index 3451d04..4e3368e 100644 --- a/pandoc.spec +++ b/pandoc.spec @@ -1,6 +1,9 @@ # generated by cabal-rpm-0.12.1 # https://fedoraproject.org/wiki/Packaging:Haskell +# workaround https://bugzilla.redhat.com/show_bug.cgi?id=1607054 +%undefine _annotated_build + %global pkg_name pandoc %global pkgver %{pkg_name}-%{version} From 07963090f7a6dcfbfc8915425a9a61d96be5c9b6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= Date: Tue, 24 Jul 2018 19:21:40 +0200 Subject: [PATCH 132/165] Enable annotated build again This reverts commit 6693eab755007a5aaa75c208ab3ec5373cb6928c. --- pandoc.spec | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pandoc.spec b/pandoc.spec index 4e3368e..15e05c1 100644 --- a/pandoc.spec +++ b/pandoc.spec @@ -1,9 +1,6 @@ # generated by cabal-rpm-0.12.1 # https://fedoraproject.org/wiki/Packaging:Haskell -# workaround https://bugzilla.redhat.com/show_bug.cgi?id=1607054 -%undefine _annotated_build - %global pkg_name pandoc %global pkgver %{pkg_name}-%{version} @@ -11,7 +8,7 @@ Name: %{pkg_name} Version: 2.0.6 -Release: 6%{?dist} +Release: 7%{?dist} Summary: Conversion between markup formats License: GPLv2+ @@ -196,6 +193,9 @@ install -m 0644 -p -D man/pandoc.1 %{buildroot}%{_mandir}/man1/pandoc.1 %changelog +* Tue Jul 24 2018 Miro Hrončok - 2.0.6-7 +- Enable annotated build again + * Mon Jul 23 2018 Miro Hrončok - 2.0.6-6 - Rebuilt for #1607054 From 5ac888b1ff3d00f09f52dd1231c0f95b65475ce5 Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Sat, 28 Jul 2018 18:55:20 +0900 Subject: [PATCH 133/165] update to 2.1.2 --- .gitignore | 1 + pandoc-2.1.2.cabal | 695 +++++++++++++++++++++++++++++++++++++++++++++ pandoc.spec | 12 +- sources | 2 +- 4 files changed, 706 insertions(+), 4 deletions(-) create mode 100644 pandoc-2.1.2.cabal diff --git a/.gitignore b/.gitignore index c70f4a7..31e6522 100644 --- a/.gitignore +++ b/.gitignore @@ -22,3 +22,4 @@ /pandoc-2.0.6.tar.gz /cmark-gfm-0.1.3.tar.gz /hslua-module-text-0.1.2.1.tar.gz +/pandoc-2.1.2.tar.gz diff --git a/pandoc-2.1.2.cabal b/pandoc-2.1.2.cabal new file mode 100644 index 0000000..b5d1c06 --- /dev/null +++ b/pandoc-2.1.2.cabal @@ -0,0 +1,695 @@ +name: pandoc +version: 2.1.2 +x-revision: 2 +cabal-version: >= 1.10 +build-type: Custom +license: GPL +license-file: COPYING.md +copyright: (c) 2006-2018 John MacFarlane +author: John MacFarlane +maintainer: John MacFarlane +bug-reports: https://github.com/jgm/pandoc/issues +stability: alpha +homepage: http://pandoc.org +category: Text +tested-with: GHC == 7.10.3, GHC == 8.0.2, GHC == 8.2.2 +synopsis: Conversion between markup formats +description: Pandoc is a Haskell library for converting from one markup + format to another, and a command-line tool that uses + this library. It can read several dialects of Markdown and + (subsets of) HTML, reStructuredText, LaTeX, DocBook, JATS, + MediaWiki markup, TWiki markup, TikiWiki markup, Creole 1.0, + Haddock markup, OPML, Emacs Org-Mode, Emacs Muse, txt2tags, + Vimwiki, Word Docx, ODT, and Textile, and it can write + Markdown, reStructuredText, XHTML, HTML 5, LaTeX, ConTeXt, + DocBook, JATS, OPML, TEI, OpenDocument, ODT, Word docx, + RTF, MediaWiki, DokuWiki, ZimWiki, Textile, groff man, + groff ms, plain text, Emacs Org-Mode, AsciiDoc, + Haddock markup, EPUB (v2 and v3), FictionBook2, InDesign + ICML, Muse, LaTeX beamer slides, PowerPoint, and several + kinds of HTML/JavaScript slide shows (S5, Slidy, Slideous, + DZSlides, reveal.js). + . + In contrast to most existing tools for converting Markdown + to HTML, pandoc has a modular design: it consists of a set of + readers, which parse text in a given format and produce a + native representation of the document, and a set of writers, + which convert this native representation into a target + format. Thus, adding an input or output format requires + only adding a reader or writer. +data-files: + -- templates + data/templates/default.html4 + data/templates/default.html5 + data/templates/default.docbook4 + data/templates/default.docbook5 + data/templates/default.jats + data/templates/default.tei + data/templates/default.opendocument + data/templates/default.icml + data/templates/default.opml + data/templates/default.latex + data/templates/default.context + data/templates/default.texinfo + data/templates/default.man + data/templates/default.ms + data/templates/default.markdown + data/templates/default.muse + data/templates/default.commonmark + data/templates/default.rst + data/templates/default.plain + data/templates/default.mediawiki + data/templates/default.dokuwiki + data/templates/default.zimwiki + data/templates/default.rtf + data/templates/default.s5 + data/templates/default.slidy + data/templates/default.slideous + data/templates/default.revealjs + data/templates/default.dzslides + data/templates/default.asciidoc + data/templates/default.haddock + data/templates/default.textile + data/templates/default.org + data/templates/default.epub2 + data/templates/default.epub3 + -- translations + data/translations/*.yaml + -- source files for reference.docx + data/docx/[Content_Types].xml + data/docx/_rels/.rels + data/docx/docProps/app.xml + data/docx/docProps/core.xml + data/docx/word/document.xml + data/docx/word/fontTable.xml + data/docx/word/comments.xml + data/docx/word/footnotes.xml + data/docx/word/numbering.xml + data/docx/word/settings.xml + data/docx/word/webSettings.xml + data/docx/word/styles.xml + data/docx/word/_rels/document.xml.rels + data/docx/word/_rels/footnotes.xml.rels + data/docx/word/theme/theme1.xml + -- source files for reference.odt + data/odt/mimetype + data/odt/manifest.rdf + data/odt/styles.xml + data/odt/content.xml + data/odt/meta.xml + data/odt/settings.xml + data/odt/Configurations2/accelerator/current.xml + data/odt/Thumbnails/thumbnail.png + data/odt/META-INF/manifest.xml + -- source files for reference.pptx + data/pptx/_rels/.rels + data/pptx/docProps/thumbnail.jpeg + data/pptx/docProps/app.xml + data/pptx/docProps/core.xml + data/pptx/ppt/slideLayouts/_rels/slideLayout1.xml.rels + data/pptx/ppt/slideLayouts/_rels/slideLayout2.xml.rels + data/pptx/ppt/slideLayouts/_rels/slideLayout3.xml.rels + data/pptx/ppt/slideLayouts/_rels/slideLayout4.xml.rels + data/pptx/ppt/slideLayouts/_rels/slideLayout5.xml.rels + data/pptx/ppt/slideLayouts/_rels/slideLayout6.xml.rels + data/pptx/ppt/slideLayouts/_rels/slideLayout7.xml.rels + data/pptx/ppt/slideLayouts/_rels/slideLayout8.xml.rels + data/pptx/ppt/slideLayouts/_rels/slideLayout9.xml.rels + data/pptx/ppt/slideLayouts/_rels/slideLayout10.xml.rels + data/pptx/ppt/slideLayouts/_rels/slideLayout11.xml.rels + data/pptx/ppt/slideLayouts/slideLayout1.xml + data/pptx/ppt/slideLayouts/slideLayout2.xml + data/pptx/ppt/slideLayouts/slideLayout3.xml + data/pptx/ppt/slideLayouts/slideLayout4.xml + data/pptx/ppt/slideLayouts/slideLayout5.xml + data/pptx/ppt/slideLayouts/slideLayout6.xml + data/pptx/ppt/slideLayouts/slideLayout7.xml + data/pptx/ppt/slideLayouts/slideLayout8.xml + data/pptx/ppt/slideLayouts/slideLayout9.xml + data/pptx/ppt/slideLayouts/slideLayout10.xml + data/pptx/ppt/slideLayouts/slideLayout11.xml + data/pptx/ppt/_rels/presentation.xml.rels + data/pptx/ppt/theme/theme1.xml + data/pptx/ppt/presProps.xml + data/pptx/ppt/slides/_rels/slide1.xml.rels + data/pptx/ppt/slides/_rels/slide2.xml.rels + data/pptx/ppt/slides/slide2.xml + data/pptx/ppt/slides/slide1.xml + data/pptx/ppt/viewProps.xml + data/pptx/ppt/tableStyles.xml + data/pptx/ppt/slideMasters/_rels/slideMaster1.xml.rels + data/pptx/ppt/slideMasters/slideMaster1.xml + data/pptx/ppt/presentation.xml + data/pptx/ppt/notesMasters/_rels/notesMaster1.xml.rels + data/pptx/ppt/notesMasters/notesMaster1.xml + data/pptx/ppt/notesSlides/_rels/notesSlide1.xml.rels + data/pptx/ppt/notesSlides/notesSlide1.xml + data/pptx/ppt/notesSlides/_rels/notesSlide2.xml.rels + data/pptx/ppt/notesSlides/notesSlide2.xml + data/pptx/ppt/theme/theme2.xml + data/pptx/[Content_Types].xml + -- stylesheet for EPUB writer + data/epub.css + -- data for LaTeXMathML writer + data/LaTeXMathML.js + -- data for dzslides writer + data/dzslides/template.html + -- default abbreviations file + data/abbreviations + -- sample lua custom writer + data/sample.lua + -- lua init script + data/init.lua + -- pandoc lua module + data/pandoc.lua + -- lua List module + data/pandoc.List.lua + -- bash completion template + data/bash_completion.tpl + -- jats csl + data/jats.csl + -- documentation + MANUAL.txt, COPYRIGHT +extra-source-files: + -- documentation + INSTALL.md, AUTHORS.md, README.md, + CONTRIBUTING.md, BUGS, changelog, + man/pandoc.1 + -- stack build plan + stack.yaml + -- files needed to build man page + man/manfilter.lua + man/pandoc.1.template + -- trypandoc + trypandoc/Makefile + trypandoc/index.html + -- tests + test/bodybg.gif + test/*.native + test/command/*.md + test/command/3533-rst-csv-tables.csv + test/command/3880.txt + test/command/abbrevs + test/command/SVG_logo-without-xml-declaration.svg + test/command/SVG_logo.svg + test/command/corrupt.svg + test/command/inkscape-cube.svg + test/command/sub-file-chapter-1.tex + test/command/sub-file-chapter-2.tex + test/command/3510-subdoc.org + test/command/3510-export.latex + test/command/3510-src.hs + test/command/3971b.tex + test/docbook-reader.docbook + test/docbook-xref.docbook + test/html-reader.html + test/opml-reader.opml + test/haddock-reader.haddock + test/insert + test/lalune.jpg + test/movie.jpg + test/media/rId25.jpg + test/media/rId26.jpg + test/media/rId27.jpg + test/latex-reader.latex + test/textile-reader.textile + test/markdown-reader-more.txt + test/markdown-citations.txt + test/textile-reader.textile + test/mediawiki-reader.wiki + test/vimwiki-reader.wiki + test/creole-reader.txt + test/creole-reader.native + test/rst-reader.rst + test/jats-reader.xml + test/s5-basic.html + test/s5-fancy.html + test/s5-fragment.html + test/s5-inserts.html + test/tables.context + test/tables.docbook4 + test/tables.docbook5 + test/tables.jats + test/tables.dokuwiki + test/tables.zimwiki + test/tables.icml + test/tables.html4 + test/tables.html5 + test/tables.latex + test/tables.man + test/tables.ms + test/tables.plain + test/tables.markdown + test/tables.mediawiki + test/tables.tei + test/tables.textile + test/tables.opendocument + test/tables.org + test/tables.asciidoc + test/tables.haddock + test/tables.texinfo + test/tables.rst + test/tables.rtf + test/tables.txt + test/tables.fb2 + test/tables.muse + test/tables.custom + test/testsuite.txt + test/writer.latex + test/writer.context + test/writer.docbook4 + test/writer.docbook5 + test/writer.jats + test/writer.html4 + test/writer.html5 + test/writer.man + test/writer.ms + test/writer.markdown + test/writer.plain + test/writer.mediawiki + test/writer.textile + test/writer.opendocument + test/writer.org + test/writer.asciidoc + test/writer.haddock + test/writer.rst + test/writer.icml + test/writer.rtf + test/writer.tei + test/writer.texinfo + test/writer.fb2 + test/writer.opml + test/writer.dokuwiki + test/writer.zimwiki + test/writer.muse + test/writer.custom + test/writers-lang-and-dir.latex + test/writers-lang-and-dir.context + test/dokuwiki_inline_formatting.dokuwiki + test/lhs-test.markdown + test/lhs-test.markdown+lhs + test/lhs-test.rst + test/lhs-test.rst+lhs + test/lhs-test.latex + test/lhs-test.latex+lhs + test/lhs-test.html + test/lhs-test.html+lhs + test/lhs-test.fragment.html+lhs + test/pipe-tables.txt + test/dokuwiki_external_images.dokuwiki + test/dokuwiki_external_images.native + test/dokuwiki_multiblock_table.dokuwiki + test/dokuwiki_multiblock_table.native + test/fb2/*.markdown + test/fb2/*.fb2 + test/fb2/images-embedded.html + test/fb2/images-embedded.fb2 + test/fb2/test-small.png + test/fb2/test.jpg + test/docx/*.docx + test/docx/golden/*.docx + test/docx/*.native + test/epub/*.epub + test/epub/*.native + test/pptx/*.pptx + test/pptx/*.native + test/txt2tags.t2t + test/twiki-reader.twiki + test/tikiwiki-reader.tikiwiki + test/odt/odt/*.odt + test/odt/markdown/*.md + test/odt/native/*.native + test/lua/*.lua +source-repository head + type: git + location: git://github.com/jgm/pandoc.git + +flag static + Description: Use static linking for pandoc executable. + Default: False + +flag embed_data_files + Description: Embed data files in binary for relocatable executable. + Default: False + +flag trypandoc + Description: Build trypandoc cgi executable. + Default: False + +flag weigh-pandoc + Description: Build weigh-pandoc to measure memory usage. + Default: False + +flag network-uri + Description: Get Network.URI from the network-uri package + Default: True + +flag old-locale + Description: Use old-locale and time < 1.5 + Default: False + +custom-setup + setup-depends: base, Cabal + +library + build-depends: base >= 4.8 && < 4.11, + syb >= 0.1 && < 0.8, + containers >= 0.4.2.1 && < 0.6, + unordered-containers >= 0.2 && < 0.3, + parsec >= 3.1 && < 3.2, + mtl >= 2.2 && < 2.3, + exceptions >= 0.8 && < 0.10, + filepath >= 1.1 && < 1.5, + process >= 1.2.3 && < 1.7, + directory >= 1 && < 1.4, + bytestring >= 0.9 && < 0.11, + text >= 0.11 && < 1.3, + safe >= 0.3 && < 0.4, + zip-archive >= 0.2.3.4 && < 0.4, + HTTP >= 4000.0.5 && < 4000.4, + texmath >= 0.10 && < 0.11, + xml >= 1.3.12 && < 1.4, + split >= 0.2 && < 0.3, + random >= 1 && < 1.2, + pandoc-types >= 1.17.3 && < 1.17.4, + aeson >= 0.7 && < 1.3, + aeson-pretty >= 0.8.5 && < 0.9, + tagsoup >= 0.14.6 && < 0.15, + base64-bytestring >= 0.1 && < 1.1, + zlib >= 0.5 && < 0.7, + skylighting >= 0.5.1 && < 0.7, + data-default >= 0.4 && < 0.8, + temporary >= 1.1 && < 1.3, + blaze-html >= 0.9 && < 0.10, + blaze-markup >= 0.8 && < 0.9, + yaml >= 0.8.8.2 && < 0.9, + scientific >= 0.2 && < 0.4, + vector >= 0.10 && < 0.13, + hslua >= 0.9.5 && < 0.9.6, + hslua-module-text >= 0.1.2 && < 0.2, + binary >= 0.5 && < 0.10, + SHA >= 1.6 && < 1.7, + haddock-library >= 1.1 && < 1.5, + deepseq >= 1.3 && < 1.5, + JuicyPixels >= 3.1.6.1 && < 3.3, + Glob >= 0.7 && < 0.10, + cmark-gfm >= 0.1.1 && < 0.2, + doctemplates >= 0.2.1 && < 0.3, + http-client >= 0.4.30 && < 0.6, + http-client-tls >= 0.2.4 && < 0.4, + http-types >= 0.8 && < 0.13, + case-insensitive >= 1.2 && < 1.3 + if os(windows) + cpp-options: -D_WINDOWS + else + build-depends: unix >= 2.4 && < 2.8 + if flag(old-locale) + build-depends: old-locale >= 1 && < 1.1, + time >= 1.2 && < 1.5 + else + build-depends: time >= 1.5 && < 1.9 + if flag(network-uri) + build-depends: network-uri >= 2.6 && < 2.7, network >= 2.6 + else + build-depends: network >= 2 && < 2.6 + if flag(embed_data_files) + cpp-options: -DEMBED_DATA_FILES + build-depends: file-embed >= 0.0 && < 0.1 + other-modules: Text.Pandoc.Data + if os(windows) + cpp-options: -D_WINDOWS + ghc-options: -Wall -fno-warn-unused-do-bind + default-language: Haskell98 + other-extensions: PatternGuards, OverloadedStrings, + ScopedTypeVariables, GeneralizedNewtypeDeriving, + RelaxedPolyRec, DeriveDataTypeable, TypeSynonymInstances, + FlexibleInstances + hs-source-dirs: src + + exposed-modules: Text.Pandoc, + Text.Pandoc.App, + Text.Pandoc.Options, + Text.Pandoc.Extensions, + Text.Pandoc.Pretty, + Text.Pandoc.Shared, + Text.Pandoc.MediaBag, + Text.Pandoc.Error, + Text.Pandoc.Readers, + Text.Pandoc.Readers.HTML, + Text.Pandoc.Readers.LaTeX, + Text.Pandoc.Readers.LaTeX.Types, + Text.Pandoc.Readers.Markdown, + Text.Pandoc.Readers.CommonMark, + Text.Pandoc.Readers.Creole, + Text.Pandoc.Readers.MediaWiki, + Text.Pandoc.Readers.Vimwiki, + Text.Pandoc.Readers.RST, + Text.Pandoc.Readers.Org, + Text.Pandoc.Readers.DocBook, + Text.Pandoc.Readers.JATS, + Text.Pandoc.Readers.OPML, + Text.Pandoc.Readers.Textile, + Text.Pandoc.Readers.Native, + Text.Pandoc.Readers.Haddock, + Text.Pandoc.Readers.TWiki, + Text.Pandoc.Readers.TikiWiki, + Text.Pandoc.Readers.Txt2Tags, + Text.Pandoc.Readers.Docx, + Text.Pandoc.Readers.Odt, + Text.Pandoc.Readers.EPUB, + Text.Pandoc.Readers.Muse, + Text.Pandoc.Writers, + Text.Pandoc.Writers.Native, + Text.Pandoc.Writers.Docbook, + Text.Pandoc.Writers.JATS, + Text.Pandoc.Writers.OPML, + Text.Pandoc.Writers.HTML, + Text.Pandoc.Writers.ICML, + Text.Pandoc.Writers.LaTeX, + Text.Pandoc.Writers.ConTeXt, + Text.Pandoc.Writers.OpenDocument, + Text.Pandoc.Writers.Texinfo, + Text.Pandoc.Writers.Man, + Text.Pandoc.Writers.Ms, + Text.Pandoc.Writers.Markdown, + Text.Pandoc.Writers.CommonMark, + Text.Pandoc.Writers.Haddock, + Text.Pandoc.Writers.RST, + Text.Pandoc.Writers.Org, + Text.Pandoc.Writers.AsciiDoc, + Text.Pandoc.Writers.Custom, + Text.Pandoc.Writers.Textile, + Text.Pandoc.Writers.MediaWiki, + Text.Pandoc.Writers.DokuWiki, + Text.Pandoc.Writers.ZimWiki, + Text.Pandoc.Writers.RTF, + Text.Pandoc.Writers.ODT, + Text.Pandoc.Writers.Docx, + Text.Pandoc.Writers.Powerpoint, + Text.Pandoc.Writers.EPUB, + Text.Pandoc.Writers.FB2, + Text.Pandoc.Writers.TEI, + Text.Pandoc.Writers.Muse, + Text.Pandoc.Writers.Math, + Text.Pandoc.Writers.Shared, + Text.Pandoc.Writers.OOXML, + Text.Pandoc.Lua, + Text.Pandoc.PDF, + Text.Pandoc.UTF8, + Text.Pandoc.Templates, + Text.Pandoc.XML, + Text.Pandoc.SelfContained, + Text.Pandoc.Highlighting, + Text.Pandoc.Logging, + Text.Pandoc.Process, + Text.Pandoc.MIME, + Text.Pandoc.Parsing, + Text.Pandoc.Asciify, + Text.Pandoc.Emoji, + Text.Pandoc.ImageSize, + Text.Pandoc.BCP47, + Text.Pandoc.Class + other-modules: Text.Pandoc.Filter, + Text.Pandoc.Filter.JSON, + Text.Pandoc.Filter.Lua, + Text.Pandoc.Filter.Path, + Text.Pandoc.Readers.Docx.Lists, + Text.Pandoc.Readers.Docx.Combine, + Text.Pandoc.Readers.Docx.Parse, + Text.Pandoc.Readers.Docx.Util, + Text.Pandoc.Readers.Docx.StyleMap, + Text.Pandoc.Readers.Docx.Fields, + Text.Pandoc.Readers.Odt.Base, + Text.Pandoc.Readers.Odt.Namespaces, + Text.Pandoc.Readers.Odt.StyleReader, + Text.Pandoc.Readers.Odt.ContentReader, + Text.Pandoc.Readers.Odt.Generic.Fallible, + Text.Pandoc.Readers.Odt.Generic.SetMap, + Text.Pandoc.Readers.Odt.Generic.Utils, + Text.Pandoc.Readers.Odt.Generic.Namespaces, + Text.Pandoc.Readers.Odt.Generic.XMLConverter, + Text.Pandoc.Readers.Odt.Arrows.State, + Text.Pandoc.Readers.Odt.Arrows.Utils, + Text.Pandoc.Readers.Org.BlockStarts, + Text.Pandoc.Readers.Org.Blocks, + Text.Pandoc.Readers.Org.DocumentTree, + Text.Pandoc.Readers.Org.ExportSettings, + Text.Pandoc.Readers.Org.Inlines, + Text.Pandoc.Readers.Org.Meta, + Text.Pandoc.Readers.Org.ParserState, + Text.Pandoc.Readers.Org.Parsing, + Text.Pandoc.Readers.Org.Shared, + Text.Pandoc.Writers.Powerpoint.Presentation, + Text.Pandoc.Writers.Powerpoint.Output, + Text.Pandoc.Lua.Filter, + Text.Pandoc.Lua.Init, + Text.Pandoc.Lua.Module.MediaBag, + Text.Pandoc.Lua.Module.Pandoc, + Text.Pandoc.Lua.Module.Utils, + Text.Pandoc.Lua.Packages, + Text.Pandoc.Lua.StackInstances, + Text.Pandoc.Lua.Util, + Text.Pandoc.CSS, + Text.Pandoc.CSV, + Text.Pandoc.UUID, + Text.Pandoc.Translations, + Text.Pandoc.Slides, + Text.Pandoc.Compat.Time, + Paths_pandoc + + buildable: True + +executable pandoc + build-depends: pandoc, base >= 4.7 && < 5 + ghc-options: -rtsopts -with-rtsopts=-K16m -Wall -fno-warn-unused-do-bind -threaded + if flag(static) + ld-options: -static + default-language: Haskell98 + other-extensions: PatternGuards, OverloadedStrings, + ScopedTypeVariables, GeneralizedNewtypeDeriving, + RelaxedPolyRec, DeriveDataTypeable, TypeSynonymInstances, + FlexibleInstances + hs-source-dirs: . + main-is: pandoc.hs + buildable: True + other-modules: Paths_pandoc + +executable trypandoc + main-is: trypandoc.hs + hs-source-dirs: trypandoc + default-language: Haskell2010 + if flag(trypandoc) + build-depends: base, aeson, pandoc, + text, wai-extra, wai >= 0.3, http-types + buildable: True + else + buildable: False + +executable weigh-pandoc + main-is: weigh-pandoc.hs + hs-source-dirs: benchmark + if flag(weigh-pandoc) + build-depends: pandoc, + base >= 4.2 && < 5, + text, + weigh >= 0.0 && < 0.1, + mtl >= 2.2 && < 2.3 + buildable: True + else + buildable: False + ghc-options: -rtsopts -Wall -fno-warn-unused-do-bind + default-language: Haskell98 + +test-suite test-pandoc + type: exitcode-stdio-1.0 + main-is: test-pandoc.hs + hs-source-dirs: test + build-depends: base >= 4.2 && < 5, + pandoc, + pandoc-types >= 1.17.3 && < 1.18, + bytestring >= 0.9 && < 0.11, + base64-bytestring >= 0.1 && < 1.1, + text >= 0.11 && < 1.3, + time >= 1.5 && < 1.9, + directory >= 1 && < 1.4, + filepath >= 1.1 && < 1.5, + hslua >= 0.9.5 && < 0.9.6, + process >= 1.2.3 && < 1.7, + temporary >= 1.1 && < 1.3, + Diff >= 0.2 && < 0.4, + tasty >= 0.11 && < 1.1, + tasty-hunit >= 0.9 && < 0.11, + tasty-quickcheck >= 0.8 && < 0.10, + tasty-golden >= 2.3 && < 2.4, + QuickCheck >= 2.4 && < 2.12, + containers >= 0.4.2.1 && < 0.6, + executable-path >= 0.0 && < 0.1, + zip-archive >= 0.2.3.4 && < 0.4, + xml >= 1.3.12 && < 1.4, + Glob >= 0.7 && < 0.10 + if flag(old-locale) + build-depends: old-locale >= 1 && < 1.1, + time >= 1.2 && < 1.5 + else + build-depends: time >= 1.5 && < 1.9 + other-modules: Tests.Old + Tests.Command + Tests.Helpers + Tests.Lua + Tests.Shared + Tests.Readers.LaTeX + Tests.Readers.HTML + Tests.Readers.JATS + Tests.Readers.Markdown + Tests.Readers.Org + Tests.Readers.Org.Block + Tests.Readers.Org.Block.CodeBlock + Tests.Readers.Org.Block.Figure + Tests.Readers.Org.Block.Header + Tests.Readers.Org.Block.List + Tests.Readers.Org.Block.Table + Tests.Readers.Org.Directive + Tests.Readers.Org.Inline + Tests.Readers.Org.Inline.Citation + Tests.Readers.Org.Inline.Note + Tests.Readers.Org.Inline.Smart + Tests.Readers.Org.Meta + Tests.Readers.Org.Shared + Tests.Readers.RST + Tests.Readers.Docx + Tests.Readers.Odt + Tests.Readers.Txt2Tags + Tests.Readers.EPUB + Tests.Readers.Muse + Tests.Readers.Creole + Tests.Writers.Native + Tests.Writers.ConTeXt + Tests.Writers.Docbook + Tests.Writers.HTML + Tests.Writers.JATS + Tests.Writers.Markdown + Tests.Writers.Org + Tests.Writers.Plain + Tests.Writers.AsciiDoc + Tests.Writers.LaTeX + Tests.Writers.Docx + Tests.Writers.RST + Tests.Writers.TEI + Tests.Writers.Muse + Tests.Writers.FB2 + Tests.Writers.Powerpoint + Tests.Writers.OOXML + ghc-options: -rtsopts -Wall -fno-warn-unused-do-bind -threaded + default-language: Haskell98 + +benchmark benchmark-pandoc + type: exitcode-stdio-1.0 + main-is: benchmark-pandoc.hs + hs-source-dirs: benchmark + build-depends: pandoc, + time, bytestring, containers, + base >= 4.2 && < 5, + text >= 0.11 && < 1.3, + criterion >= 1.0 && < 1.4 + ghc-options: -rtsopts -Wall -fno-warn-unused-do-bind + default-language: Haskell98 diff --git a/pandoc.spec b/pandoc.spec index 15e05c1..1b42da5 100644 --- a/pandoc.spec +++ b/pandoc.spec @@ -1,4 +1,4 @@ -# generated by cabal-rpm-0.12.1 +# generated by cabal-rpm-0.12.5 # https://fedoraproject.org/wiki/Packaging:Haskell %global pkg_name pandoc @@ -7,13 +7,14 @@ %bcond_with tests Name: %{pkg_name} -Version: 2.0.6 -Release: 7%{?dist} +Version: 2.1.2 +Release: 1%{?dist} Summary: Conversion between markup formats License: GPLv2+ Url: https://hackage.haskell.org/package/%{name} Source0: https://hackage.haskell.org/package/%{pkgver}/%{pkgver}.tar.gz +Source1: https://hackage.haskell.org/package/%{pkgver}/%{name}.cabal#/%{pkgver}.cabal BuildRequires: ghc-Cabal-devel BuildRequires: ghc-rpm-macros @@ -37,6 +38,7 @@ BuildRequires: ghc-data-default-devel BuildRequires: ghc-deepseq-devel BuildRequires: ghc-directory-devel BuildRequires: ghc-doctemplates-devel +BuildRequires: ghc-exceptions-devel BuildRequires: ghc-filepath-devel BuildRequires: ghc-haddock-library-devel BuildRequires: ghc-hslua-devel @@ -143,6 +145,7 @@ or texlive-collection-luatex respectively. %prep %setup -q +cp -p %{SOURCE1} %{name}.cabal %build @@ -193,6 +196,9 @@ install -m 0644 -p -D man/pandoc.1 %{buildroot}%{_mandir}/man1/pandoc.1 %changelog +* Sat Jul 28 2018 Jens Petersen - 2.1.2-1 +- update to 2.1.2 + * Tue Jul 24 2018 Miro Hrončok - 2.0.6-7 - Enable annotated build again diff --git a/sources b/sources index f56a0f4..82036d8 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (pandoc-2.0.6.tar.gz) = a1e59fbedc8efbeaa482a90392beff3e6b93c5ee52f2955c57eba83baadfc10c76f474c1254de22daf7c0d250dc9114331d878f56ebf2e90cdd5bf75ecd6f208 +SHA512 (pandoc-2.1.2.tar.gz) = a1b02c353ac021609abe24685eb6e5c57b706cd0b6136e076d4df584344810b184ecb18f2206b21c1d6a0484aa37ccaafe41e1771829e59fe26879080739b1e9 From 061683557d7054160112de98c7468c47d104c4ad Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Wed, 24 Oct 2018 21:40:11 +0900 Subject: [PATCH 134/165] static executable; common subpackage; refresh to cabal-rpm-0.13 --- pandoc.spec | 43 ++++++++++++++++++++++++++++++++++--------- 1 file changed, 34 insertions(+), 9 deletions(-) diff --git a/pandoc.spec b/pandoc.spec index 1b42da5..9844b60 100644 --- a/pandoc.spec +++ b/pandoc.spec @@ -1,4 +1,4 @@ -# generated by cabal-rpm-0.12.5 +# generated by cabal-rpm-0.13 # https://fedoraproject.org/wiki/Packaging:Haskell %global pkg_name pandoc @@ -8,17 +8,19 @@ Name: %{pkg_name} Version: 2.1.2 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Conversion between markup formats License: GPLv2+ Url: https://hackage.haskell.org/package/%{name} +# Begin cabal-rpm sources: Source0: https://hackage.haskell.org/package/%{pkgver}/%{pkgver}.tar.gz Source1: https://hackage.haskell.org/package/%{pkgver}/%{name}.cabal#/%{pkgver}.cabal +# End cabal-rpm sources +# Begin cabal-rpm deps: BuildRequires: ghc-Cabal-devel BuildRequires: ghc-rpm-macros -# Begin cabal-rpm deps: BuildRequires: chrpath BuildRequires: ghc-Glob-devel BuildRequires: ghc-HTTP-devel @@ -81,8 +83,8 @@ BuildRequires: ghc-tasty-quickcheck-devel %endif # End cabal-rpm deps # added for F26 -Obsoletes: pandoc-common < %{version}-%{release} Obsoletes: pandoc-static < %{version}-%{release} +Requires: pandoc-common = %{version}-%{release} %description Pandoc is a Haskell library for converting from one markup format to another, @@ -106,8 +108,17 @@ Thus, adding an input or output format requires only adding a reader or writer. For pdf output please also install pandoc-pdf. +%package common +Summary: Pandoc data files +BuildArch: noarch + +%description common +This package contains the common data files used by pandoc. + + %package -n ghc-%{name} Summary: Haskell %{name} library +Requires: pandoc-common = %{version}-%{release} %description -n ghc-%{name} This package provides the Haskell %{name} shared library. @@ -146,16 +157,19 @@ or texlive-collection-luatex respectively. %prep %setup -q cp -p %{SOURCE1} %{name}.cabal +# End cabal-rpm setup %build +# Begin cabal-rpm build: %ghc_lib_build +# End cabal-rpm build %install +# Begin cabal-rpm install %ghc_lib_install -%ghc_fix_rpath %{pkgver} -mv %{buildroot}%{_ghclicensedir}/{,ghc-}%{name} +# End cabal-rpm install rm %{buildroot}%{_datadir}/%{pkgver}/COPYRIGHT @@ -177,25 +191,36 @@ install -m 0644 -p -D man/pandoc.1 %{buildroot}%{_mandir}/man1/pandoc.1 %files +# Begin cabal-rpm files: %license COPYING.md COPYRIGHT -%doc BUGS README* changelog -%attr(755,root,root) %{_bindir}/%{name} +%doc AUTHORS.md BUGS CONTRIBUTING.md README.md +%{_bindir}/%{name} +# End cabal-rpm files %attr(-,root,root) %{_bindir}/hsmarkdown %attr(644,root,root) %{_mandir}/man1/pandoc.1* +%files common +%{_datadir}/%{pkgver} + + %files pdf %files -n ghc-%{name} -f ghc-%{name}.files +# Begin cabal-rpm files: %license COPYING.md COPYRIGHT -%{_datadir}/%{pkgver} +# End cabal-rpm files %files -n ghc-%{name}-devel -f ghc-%{name}-devel.files %changelog +* Wed Oct 24 2018 Jens Petersen - 2.1.2-2 +- rebuild for static executable +- resurrect common subpackage + * Sat Jul 28 2018 Jens Petersen - 2.1.2-1 - update to 2.1.2 From 09b188ca8997f0392205136262aea477205fb599 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 1 Feb 2019 17:54:33 +0000 Subject: [PATCH 135/165] - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- pandoc.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pandoc.spec b/pandoc.spec index 9844b60..4b60dd7 100644 --- a/pandoc.spec +++ b/pandoc.spec @@ -8,7 +8,7 @@ Name: %{pkg_name} Version: 2.1.2 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Conversion between markup formats License: GPLv2+ @@ -217,6 +217,9 @@ install -m 0644 -p -D man/pandoc.1 %{buildroot}%{_mandir}/man1/pandoc.1 %changelog +* Fri Feb 01 2019 Fedora Release Engineering - 2.1.2-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild + * Wed Oct 24 2018 Jens Petersen - 2.1.2-2 - rebuild for static executable - resurrect common subpackage From a09defe1100fdc85d447124ada54b042fcc884f3 Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Thu, 21 Feb 2019 15:12:12 +0800 Subject: [PATCH 136/165] update to 2.2.1 --- .gitignore | 1 + pandoc-2.1.2.cabal => pandoc-2.2.1.cabal | 1404 +++++++++++----------- pandoc.spec | 19 +- sources | 2 +- 4 files changed, 722 insertions(+), 704 deletions(-) rename pandoc-2.1.2.cabal => pandoc-2.2.1.cabal (88%) diff --git a/.gitignore b/.gitignore index 31e6522..7077739 100644 --- a/.gitignore +++ b/.gitignore @@ -23,3 +23,4 @@ /cmark-gfm-0.1.3.tar.gz /hslua-module-text-0.1.2.1.tar.gz /pandoc-2.1.2.tar.gz +/pandoc-2.2.1.tar.gz diff --git a/pandoc-2.1.2.cabal b/pandoc-2.2.1.cabal similarity index 88% rename from pandoc-2.1.2.cabal rename to pandoc-2.2.1.cabal index b5d1c06..64037ad 100644 --- a/pandoc-2.1.2.cabal +++ b/pandoc-2.2.1.cabal @@ -1,695 +1,709 @@ -name: pandoc -version: 2.1.2 -x-revision: 2 -cabal-version: >= 1.10 -build-type: Custom -license: GPL -license-file: COPYING.md -copyright: (c) 2006-2018 John MacFarlane -author: John MacFarlane -maintainer: John MacFarlane -bug-reports: https://github.com/jgm/pandoc/issues -stability: alpha -homepage: http://pandoc.org -category: Text -tested-with: GHC == 7.10.3, GHC == 8.0.2, GHC == 8.2.2 -synopsis: Conversion between markup formats -description: Pandoc is a Haskell library for converting from one markup - format to another, and a command-line tool that uses - this library. It can read several dialects of Markdown and - (subsets of) HTML, reStructuredText, LaTeX, DocBook, JATS, - MediaWiki markup, TWiki markup, TikiWiki markup, Creole 1.0, - Haddock markup, OPML, Emacs Org-Mode, Emacs Muse, txt2tags, - Vimwiki, Word Docx, ODT, and Textile, and it can write - Markdown, reStructuredText, XHTML, HTML 5, LaTeX, ConTeXt, - DocBook, JATS, OPML, TEI, OpenDocument, ODT, Word docx, - RTF, MediaWiki, DokuWiki, ZimWiki, Textile, groff man, - groff ms, plain text, Emacs Org-Mode, AsciiDoc, - Haddock markup, EPUB (v2 and v3), FictionBook2, InDesign - ICML, Muse, LaTeX beamer slides, PowerPoint, and several - kinds of HTML/JavaScript slide shows (S5, Slidy, Slideous, - DZSlides, reveal.js). - . - In contrast to most existing tools for converting Markdown - to HTML, pandoc has a modular design: it consists of a set of - readers, which parse text in a given format and produce a - native representation of the document, and a set of writers, - which convert this native representation into a target - format. Thus, adding an input or output format requires - only adding a reader or writer. -data-files: - -- templates - data/templates/default.html4 - data/templates/default.html5 - data/templates/default.docbook4 - data/templates/default.docbook5 - data/templates/default.jats - data/templates/default.tei - data/templates/default.opendocument - data/templates/default.icml - data/templates/default.opml - data/templates/default.latex - data/templates/default.context - data/templates/default.texinfo - data/templates/default.man - data/templates/default.ms - data/templates/default.markdown - data/templates/default.muse - data/templates/default.commonmark - data/templates/default.rst - data/templates/default.plain - data/templates/default.mediawiki - data/templates/default.dokuwiki - data/templates/default.zimwiki - data/templates/default.rtf - data/templates/default.s5 - data/templates/default.slidy - data/templates/default.slideous - data/templates/default.revealjs - data/templates/default.dzslides - data/templates/default.asciidoc - data/templates/default.haddock - data/templates/default.textile - data/templates/default.org - data/templates/default.epub2 - data/templates/default.epub3 - -- translations - data/translations/*.yaml - -- source files for reference.docx - data/docx/[Content_Types].xml - data/docx/_rels/.rels - data/docx/docProps/app.xml - data/docx/docProps/core.xml - data/docx/word/document.xml - data/docx/word/fontTable.xml - data/docx/word/comments.xml - data/docx/word/footnotes.xml - data/docx/word/numbering.xml - data/docx/word/settings.xml - data/docx/word/webSettings.xml - data/docx/word/styles.xml - data/docx/word/_rels/document.xml.rels - data/docx/word/_rels/footnotes.xml.rels - data/docx/word/theme/theme1.xml - -- source files for reference.odt - data/odt/mimetype - data/odt/manifest.rdf - data/odt/styles.xml - data/odt/content.xml - data/odt/meta.xml - data/odt/settings.xml - data/odt/Configurations2/accelerator/current.xml - data/odt/Thumbnails/thumbnail.png - data/odt/META-INF/manifest.xml - -- source files for reference.pptx - data/pptx/_rels/.rels - data/pptx/docProps/thumbnail.jpeg - data/pptx/docProps/app.xml - data/pptx/docProps/core.xml - data/pptx/ppt/slideLayouts/_rels/slideLayout1.xml.rels - data/pptx/ppt/slideLayouts/_rels/slideLayout2.xml.rels - data/pptx/ppt/slideLayouts/_rels/slideLayout3.xml.rels - data/pptx/ppt/slideLayouts/_rels/slideLayout4.xml.rels - data/pptx/ppt/slideLayouts/_rels/slideLayout5.xml.rels - data/pptx/ppt/slideLayouts/_rels/slideLayout6.xml.rels - data/pptx/ppt/slideLayouts/_rels/slideLayout7.xml.rels - data/pptx/ppt/slideLayouts/_rels/slideLayout8.xml.rels - data/pptx/ppt/slideLayouts/_rels/slideLayout9.xml.rels - data/pptx/ppt/slideLayouts/_rels/slideLayout10.xml.rels - data/pptx/ppt/slideLayouts/_rels/slideLayout11.xml.rels - data/pptx/ppt/slideLayouts/slideLayout1.xml - data/pptx/ppt/slideLayouts/slideLayout2.xml - data/pptx/ppt/slideLayouts/slideLayout3.xml - data/pptx/ppt/slideLayouts/slideLayout4.xml - data/pptx/ppt/slideLayouts/slideLayout5.xml - data/pptx/ppt/slideLayouts/slideLayout6.xml - data/pptx/ppt/slideLayouts/slideLayout7.xml - data/pptx/ppt/slideLayouts/slideLayout8.xml - data/pptx/ppt/slideLayouts/slideLayout9.xml - data/pptx/ppt/slideLayouts/slideLayout10.xml - data/pptx/ppt/slideLayouts/slideLayout11.xml - data/pptx/ppt/_rels/presentation.xml.rels - data/pptx/ppt/theme/theme1.xml - data/pptx/ppt/presProps.xml - data/pptx/ppt/slides/_rels/slide1.xml.rels - data/pptx/ppt/slides/_rels/slide2.xml.rels - data/pptx/ppt/slides/slide2.xml - data/pptx/ppt/slides/slide1.xml - data/pptx/ppt/viewProps.xml - data/pptx/ppt/tableStyles.xml - data/pptx/ppt/slideMasters/_rels/slideMaster1.xml.rels - data/pptx/ppt/slideMasters/slideMaster1.xml - data/pptx/ppt/presentation.xml - data/pptx/ppt/notesMasters/_rels/notesMaster1.xml.rels - data/pptx/ppt/notesMasters/notesMaster1.xml - data/pptx/ppt/notesSlides/_rels/notesSlide1.xml.rels - data/pptx/ppt/notesSlides/notesSlide1.xml - data/pptx/ppt/notesSlides/_rels/notesSlide2.xml.rels - data/pptx/ppt/notesSlides/notesSlide2.xml - data/pptx/ppt/theme/theme2.xml - data/pptx/[Content_Types].xml - -- stylesheet for EPUB writer - data/epub.css - -- data for LaTeXMathML writer - data/LaTeXMathML.js - -- data for dzslides writer - data/dzslides/template.html - -- default abbreviations file - data/abbreviations - -- sample lua custom writer - data/sample.lua - -- lua init script - data/init.lua - -- pandoc lua module - data/pandoc.lua - -- lua List module - data/pandoc.List.lua - -- bash completion template - data/bash_completion.tpl - -- jats csl - data/jats.csl - -- documentation - MANUAL.txt, COPYRIGHT -extra-source-files: - -- documentation - INSTALL.md, AUTHORS.md, README.md, - CONTRIBUTING.md, BUGS, changelog, - man/pandoc.1 - -- stack build plan - stack.yaml - -- files needed to build man page - man/manfilter.lua - man/pandoc.1.template - -- trypandoc - trypandoc/Makefile - trypandoc/index.html - -- tests - test/bodybg.gif - test/*.native - test/command/*.md - test/command/3533-rst-csv-tables.csv - test/command/3880.txt - test/command/abbrevs - test/command/SVG_logo-without-xml-declaration.svg - test/command/SVG_logo.svg - test/command/corrupt.svg - test/command/inkscape-cube.svg - test/command/sub-file-chapter-1.tex - test/command/sub-file-chapter-2.tex - test/command/3510-subdoc.org - test/command/3510-export.latex - test/command/3510-src.hs - test/command/3971b.tex - test/docbook-reader.docbook - test/docbook-xref.docbook - test/html-reader.html - test/opml-reader.opml - test/haddock-reader.haddock - test/insert - test/lalune.jpg - test/movie.jpg - test/media/rId25.jpg - test/media/rId26.jpg - test/media/rId27.jpg - test/latex-reader.latex - test/textile-reader.textile - test/markdown-reader-more.txt - test/markdown-citations.txt - test/textile-reader.textile - test/mediawiki-reader.wiki - test/vimwiki-reader.wiki - test/creole-reader.txt - test/creole-reader.native - test/rst-reader.rst - test/jats-reader.xml - test/s5-basic.html - test/s5-fancy.html - test/s5-fragment.html - test/s5-inserts.html - test/tables.context - test/tables.docbook4 - test/tables.docbook5 - test/tables.jats - test/tables.dokuwiki - test/tables.zimwiki - test/tables.icml - test/tables.html4 - test/tables.html5 - test/tables.latex - test/tables.man - test/tables.ms - test/tables.plain - test/tables.markdown - test/tables.mediawiki - test/tables.tei - test/tables.textile - test/tables.opendocument - test/tables.org - test/tables.asciidoc - test/tables.haddock - test/tables.texinfo - test/tables.rst - test/tables.rtf - test/tables.txt - test/tables.fb2 - test/tables.muse - test/tables.custom - test/testsuite.txt - test/writer.latex - test/writer.context - test/writer.docbook4 - test/writer.docbook5 - test/writer.jats - test/writer.html4 - test/writer.html5 - test/writer.man - test/writer.ms - test/writer.markdown - test/writer.plain - test/writer.mediawiki - test/writer.textile - test/writer.opendocument - test/writer.org - test/writer.asciidoc - test/writer.haddock - test/writer.rst - test/writer.icml - test/writer.rtf - test/writer.tei - test/writer.texinfo - test/writer.fb2 - test/writer.opml - test/writer.dokuwiki - test/writer.zimwiki - test/writer.muse - test/writer.custom - test/writers-lang-and-dir.latex - test/writers-lang-and-dir.context - test/dokuwiki_inline_formatting.dokuwiki - test/lhs-test.markdown - test/lhs-test.markdown+lhs - test/lhs-test.rst - test/lhs-test.rst+lhs - test/lhs-test.latex - test/lhs-test.latex+lhs - test/lhs-test.html - test/lhs-test.html+lhs - test/lhs-test.fragment.html+lhs - test/pipe-tables.txt - test/dokuwiki_external_images.dokuwiki - test/dokuwiki_external_images.native - test/dokuwiki_multiblock_table.dokuwiki - test/dokuwiki_multiblock_table.native - test/fb2/*.markdown - test/fb2/*.fb2 - test/fb2/images-embedded.html - test/fb2/images-embedded.fb2 - test/fb2/test-small.png - test/fb2/test.jpg - test/docx/*.docx - test/docx/golden/*.docx - test/docx/*.native - test/epub/*.epub - test/epub/*.native - test/pptx/*.pptx - test/pptx/*.native - test/txt2tags.t2t - test/twiki-reader.twiki - test/tikiwiki-reader.tikiwiki - test/odt/odt/*.odt - test/odt/markdown/*.md - test/odt/native/*.native - test/lua/*.lua -source-repository head - type: git - location: git://github.com/jgm/pandoc.git - -flag static - Description: Use static linking for pandoc executable. - Default: False - -flag embed_data_files - Description: Embed data files in binary for relocatable executable. - Default: False - -flag trypandoc - Description: Build trypandoc cgi executable. - Default: False - -flag weigh-pandoc - Description: Build weigh-pandoc to measure memory usage. - Default: False - -flag network-uri - Description: Get Network.URI from the network-uri package - Default: True - -flag old-locale - Description: Use old-locale and time < 1.5 - Default: False - -custom-setup - setup-depends: base, Cabal - -library - build-depends: base >= 4.8 && < 4.11, - syb >= 0.1 && < 0.8, - containers >= 0.4.2.1 && < 0.6, - unordered-containers >= 0.2 && < 0.3, - parsec >= 3.1 && < 3.2, - mtl >= 2.2 && < 2.3, - exceptions >= 0.8 && < 0.10, - filepath >= 1.1 && < 1.5, - process >= 1.2.3 && < 1.7, - directory >= 1 && < 1.4, - bytestring >= 0.9 && < 0.11, - text >= 0.11 && < 1.3, - safe >= 0.3 && < 0.4, - zip-archive >= 0.2.3.4 && < 0.4, - HTTP >= 4000.0.5 && < 4000.4, - texmath >= 0.10 && < 0.11, - xml >= 1.3.12 && < 1.4, - split >= 0.2 && < 0.3, - random >= 1 && < 1.2, - pandoc-types >= 1.17.3 && < 1.17.4, - aeson >= 0.7 && < 1.3, - aeson-pretty >= 0.8.5 && < 0.9, - tagsoup >= 0.14.6 && < 0.15, - base64-bytestring >= 0.1 && < 1.1, - zlib >= 0.5 && < 0.7, - skylighting >= 0.5.1 && < 0.7, - data-default >= 0.4 && < 0.8, - temporary >= 1.1 && < 1.3, - blaze-html >= 0.9 && < 0.10, - blaze-markup >= 0.8 && < 0.9, - yaml >= 0.8.8.2 && < 0.9, - scientific >= 0.2 && < 0.4, - vector >= 0.10 && < 0.13, - hslua >= 0.9.5 && < 0.9.6, - hslua-module-text >= 0.1.2 && < 0.2, - binary >= 0.5 && < 0.10, - SHA >= 1.6 && < 1.7, - haddock-library >= 1.1 && < 1.5, - deepseq >= 1.3 && < 1.5, - JuicyPixels >= 3.1.6.1 && < 3.3, - Glob >= 0.7 && < 0.10, - cmark-gfm >= 0.1.1 && < 0.2, - doctemplates >= 0.2.1 && < 0.3, - http-client >= 0.4.30 && < 0.6, - http-client-tls >= 0.2.4 && < 0.4, - http-types >= 0.8 && < 0.13, - case-insensitive >= 1.2 && < 1.3 - if os(windows) - cpp-options: -D_WINDOWS - else - build-depends: unix >= 2.4 && < 2.8 - if flag(old-locale) - build-depends: old-locale >= 1 && < 1.1, - time >= 1.2 && < 1.5 - else - build-depends: time >= 1.5 && < 1.9 - if flag(network-uri) - build-depends: network-uri >= 2.6 && < 2.7, network >= 2.6 - else - build-depends: network >= 2 && < 2.6 - if flag(embed_data_files) - cpp-options: -DEMBED_DATA_FILES - build-depends: file-embed >= 0.0 && < 0.1 - other-modules: Text.Pandoc.Data - if os(windows) - cpp-options: -D_WINDOWS - ghc-options: -Wall -fno-warn-unused-do-bind - default-language: Haskell98 - other-extensions: PatternGuards, OverloadedStrings, - ScopedTypeVariables, GeneralizedNewtypeDeriving, - RelaxedPolyRec, DeriveDataTypeable, TypeSynonymInstances, - FlexibleInstances - hs-source-dirs: src - - exposed-modules: Text.Pandoc, - Text.Pandoc.App, - Text.Pandoc.Options, - Text.Pandoc.Extensions, - Text.Pandoc.Pretty, - Text.Pandoc.Shared, - Text.Pandoc.MediaBag, - Text.Pandoc.Error, - Text.Pandoc.Readers, - Text.Pandoc.Readers.HTML, - Text.Pandoc.Readers.LaTeX, - Text.Pandoc.Readers.LaTeX.Types, - Text.Pandoc.Readers.Markdown, - Text.Pandoc.Readers.CommonMark, - Text.Pandoc.Readers.Creole, - Text.Pandoc.Readers.MediaWiki, - Text.Pandoc.Readers.Vimwiki, - Text.Pandoc.Readers.RST, - Text.Pandoc.Readers.Org, - Text.Pandoc.Readers.DocBook, - Text.Pandoc.Readers.JATS, - Text.Pandoc.Readers.OPML, - Text.Pandoc.Readers.Textile, - Text.Pandoc.Readers.Native, - Text.Pandoc.Readers.Haddock, - Text.Pandoc.Readers.TWiki, - Text.Pandoc.Readers.TikiWiki, - Text.Pandoc.Readers.Txt2Tags, - Text.Pandoc.Readers.Docx, - Text.Pandoc.Readers.Odt, - Text.Pandoc.Readers.EPUB, - Text.Pandoc.Readers.Muse, - Text.Pandoc.Writers, - Text.Pandoc.Writers.Native, - Text.Pandoc.Writers.Docbook, - Text.Pandoc.Writers.JATS, - Text.Pandoc.Writers.OPML, - Text.Pandoc.Writers.HTML, - Text.Pandoc.Writers.ICML, - Text.Pandoc.Writers.LaTeX, - Text.Pandoc.Writers.ConTeXt, - Text.Pandoc.Writers.OpenDocument, - Text.Pandoc.Writers.Texinfo, - Text.Pandoc.Writers.Man, - Text.Pandoc.Writers.Ms, - Text.Pandoc.Writers.Markdown, - Text.Pandoc.Writers.CommonMark, - Text.Pandoc.Writers.Haddock, - Text.Pandoc.Writers.RST, - Text.Pandoc.Writers.Org, - Text.Pandoc.Writers.AsciiDoc, - Text.Pandoc.Writers.Custom, - Text.Pandoc.Writers.Textile, - Text.Pandoc.Writers.MediaWiki, - Text.Pandoc.Writers.DokuWiki, - Text.Pandoc.Writers.ZimWiki, - Text.Pandoc.Writers.RTF, - Text.Pandoc.Writers.ODT, - Text.Pandoc.Writers.Docx, - Text.Pandoc.Writers.Powerpoint, - Text.Pandoc.Writers.EPUB, - Text.Pandoc.Writers.FB2, - Text.Pandoc.Writers.TEI, - Text.Pandoc.Writers.Muse, - Text.Pandoc.Writers.Math, - Text.Pandoc.Writers.Shared, - Text.Pandoc.Writers.OOXML, - Text.Pandoc.Lua, - Text.Pandoc.PDF, - Text.Pandoc.UTF8, - Text.Pandoc.Templates, - Text.Pandoc.XML, - Text.Pandoc.SelfContained, - Text.Pandoc.Highlighting, - Text.Pandoc.Logging, - Text.Pandoc.Process, - Text.Pandoc.MIME, - Text.Pandoc.Parsing, - Text.Pandoc.Asciify, - Text.Pandoc.Emoji, - Text.Pandoc.ImageSize, - Text.Pandoc.BCP47, - Text.Pandoc.Class - other-modules: Text.Pandoc.Filter, - Text.Pandoc.Filter.JSON, - Text.Pandoc.Filter.Lua, - Text.Pandoc.Filter.Path, - Text.Pandoc.Readers.Docx.Lists, - Text.Pandoc.Readers.Docx.Combine, - Text.Pandoc.Readers.Docx.Parse, - Text.Pandoc.Readers.Docx.Util, - Text.Pandoc.Readers.Docx.StyleMap, - Text.Pandoc.Readers.Docx.Fields, - Text.Pandoc.Readers.Odt.Base, - Text.Pandoc.Readers.Odt.Namespaces, - Text.Pandoc.Readers.Odt.StyleReader, - Text.Pandoc.Readers.Odt.ContentReader, - Text.Pandoc.Readers.Odt.Generic.Fallible, - Text.Pandoc.Readers.Odt.Generic.SetMap, - Text.Pandoc.Readers.Odt.Generic.Utils, - Text.Pandoc.Readers.Odt.Generic.Namespaces, - Text.Pandoc.Readers.Odt.Generic.XMLConverter, - Text.Pandoc.Readers.Odt.Arrows.State, - Text.Pandoc.Readers.Odt.Arrows.Utils, - Text.Pandoc.Readers.Org.BlockStarts, - Text.Pandoc.Readers.Org.Blocks, - Text.Pandoc.Readers.Org.DocumentTree, - Text.Pandoc.Readers.Org.ExportSettings, - Text.Pandoc.Readers.Org.Inlines, - Text.Pandoc.Readers.Org.Meta, - Text.Pandoc.Readers.Org.ParserState, - Text.Pandoc.Readers.Org.Parsing, - Text.Pandoc.Readers.Org.Shared, - Text.Pandoc.Writers.Powerpoint.Presentation, - Text.Pandoc.Writers.Powerpoint.Output, - Text.Pandoc.Lua.Filter, - Text.Pandoc.Lua.Init, - Text.Pandoc.Lua.Module.MediaBag, - Text.Pandoc.Lua.Module.Pandoc, - Text.Pandoc.Lua.Module.Utils, - Text.Pandoc.Lua.Packages, - Text.Pandoc.Lua.StackInstances, - Text.Pandoc.Lua.Util, - Text.Pandoc.CSS, - Text.Pandoc.CSV, - Text.Pandoc.UUID, - Text.Pandoc.Translations, - Text.Pandoc.Slides, - Text.Pandoc.Compat.Time, - Paths_pandoc - - buildable: True - -executable pandoc - build-depends: pandoc, base >= 4.7 && < 5 - ghc-options: -rtsopts -with-rtsopts=-K16m -Wall -fno-warn-unused-do-bind -threaded - if flag(static) - ld-options: -static - default-language: Haskell98 - other-extensions: PatternGuards, OverloadedStrings, - ScopedTypeVariables, GeneralizedNewtypeDeriving, - RelaxedPolyRec, DeriveDataTypeable, TypeSynonymInstances, - FlexibleInstances - hs-source-dirs: . - main-is: pandoc.hs - buildable: True - other-modules: Paths_pandoc - -executable trypandoc - main-is: trypandoc.hs - hs-source-dirs: trypandoc - default-language: Haskell2010 - if flag(trypandoc) - build-depends: base, aeson, pandoc, - text, wai-extra, wai >= 0.3, http-types - buildable: True - else - buildable: False - -executable weigh-pandoc - main-is: weigh-pandoc.hs - hs-source-dirs: benchmark - if flag(weigh-pandoc) - build-depends: pandoc, - base >= 4.2 && < 5, - text, - weigh >= 0.0 && < 0.1, - mtl >= 2.2 && < 2.3 - buildable: True - else - buildable: False - ghc-options: -rtsopts -Wall -fno-warn-unused-do-bind - default-language: Haskell98 - -test-suite test-pandoc - type: exitcode-stdio-1.0 - main-is: test-pandoc.hs - hs-source-dirs: test - build-depends: base >= 4.2 && < 5, - pandoc, - pandoc-types >= 1.17.3 && < 1.18, - bytestring >= 0.9 && < 0.11, - base64-bytestring >= 0.1 && < 1.1, - text >= 0.11 && < 1.3, - time >= 1.5 && < 1.9, - directory >= 1 && < 1.4, - filepath >= 1.1 && < 1.5, - hslua >= 0.9.5 && < 0.9.6, - process >= 1.2.3 && < 1.7, - temporary >= 1.1 && < 1.3, - Diff >= 0.2 && < 0.4, - tasty >= 0.11 && < 1.1, - tasty-hunit >= 0.9 && < 0.11, - tasty-quickcheck >= 0.8 && < 0.10, - tasty-golden >= 2.3 && < 2.4, - QuickCheck >= 2.4 && < 2.12, - containers >= 0.4.2.1 && < 0.6, - executable-path >= 0.0 && < 0.1, - zip-archive >= 0.2.3.4 && < 0.4, - xml >= 1.3.12 && < 1.4, - Glob >= 0.7 && < 0.10 - if flag(old-locale) - build-depends: old-locale >= 1 && < 1.1, - time >= 1.2 && < 1.5 - else - build-depends: time >= 1.5 && < 1.9 - other-modules: Tests.Old - Tests.Command - Tests.Helpers - Tests.Lua - Tests.Shared - Tests.Readers.LaTeX - Tests.Readers.HTML - Tests.Readers.JATS - Tests.Readers.Markdown - Tests.Readers.Org - Tests.Readers.Org.Block - Tests.Readers.Org.Block.CodeBlock - Tests.Readers.Org.Block.Figure - Tests.Readers.Org.Block.Header - Tests.Readers.Org.Block.List - Tests.Readers.Org.Block.Table - Tests.Readers.Org.Directive - Tests.Readers.Org.Inline - Tests.Readers.Org.Inline.Citation - Tests.Readers.Org.Inline.Note - Tests.Readers.Org.Inline.Smart - Tests.Readers.Org.Meta - Tests.Readers.Org.Shared - Tests.Readers.RST - Tests.Readers.Docx - Tests.Readers.Odt - Tests.Readers.Txt2Tags - Tests.Readers.EPUB - Tests.Readers.Muse - Tests.Readers.Creole - Tests.Writers.Native - Tests.Writers.ConTeXt - Tests.Writers.Docbook - Tests.Writers.HTML - Tests.Writers.JATS - Tests.Writers.Markdown - Tests.Writers.Org - Tests.Writers.Plain - Tests.Writers.AsciiDoc - Tests.Writers.LaTeX - Tests.Writers.Docx - Tests.Writers.RST - Tests.Writers.TEI - Tests.Writers.Muse - Tests.Writers.FB2 - Tests.Writers.Powerpoint - Tests.Writers.OOXML - ghc-options: -rtsopts -Wall -fno-warn-unused-do-bind -threaded - default-language: Haskell98 - -benchmark benchmark-pandoc - type: exitcode-stdio-1.0 - main-is: benchmark-pandoc.hs - hs-source-dirs: benchmark - build-depends: pandoc, - time, bytestring, containers, - base >= 4.2 && < 5, - text >= 0.11 && < 1.3, - criterion >= 1.0 && < 1.4 - ghc-options: -rtsopts -Wall -fno-warn-unused-do-bind - default-language: Haskell98 +name: pandoc +version: 2.2.1 +x-revision: 1 +cabal-version: >= 1.10 +build-type: Custom +license: GPL-2 +license-file: COPYING.md +copyright: (c) 2006-2018 John MacFarlane +author: John MacFarlane +maintainer: John MacFarlane +bug-reports: https://github.com/jgm/pandoc/issues +stability: alpha +homepage: https://pandoc.org +category: Text +tested-with: GHC == 7.10.3, GHC == 8.0.2, GHC == 8.2.2, GHC == 8.4.1 +synopsis: Conversion between markup formats +description: Pandoc is a Haskell library for converting from one markup + format to another, and a command-line tool that uses + this library. It can read several dialects of Markdown and + (subsets of) HTML, reStructuredText, LaTeX, DocBook, JATS, + MediaWiki markup, TWiki markup, TikiWiki markup, Creole 1.0, + Haddock markup, OPML, Emacs Org-Mode, Emacs Muse, txt2tags, + Vimwiki, Word Docx, ODT, EPUB, FictionBook2, and Textile, + and it can write Markdown, reStructuredText, XHTML, HTML 5, + LaTeX, ConTeXt, DocBook, JATS, OPML, TEI, OpenDocument, + ODT, Word docx, RTF, MediaWiki, DokuWiki, ZimWiki, Textile, + groff man, groff ms, plain text, Emacs Org-Mode, AsciiDoc, + Haddock markup, EPUB (v2 and v3), FictionBook2, InDesign + ICML, Muse, LaTeX beamer slides, PowerPoint, and several + kinds of HTML/JavaScript slide shows (S5, Slidy, Slideous, + DZSlides, reveal.js). + . + In contrast to most existing tools for converting Markdown + to HTML, pandoc has a modular design: it consists of a set of + readers, which parse text in a given format and produce a + native representation of the document, and a set of writers, + which convert this native representation into a target + format. Thus, adding an input or output format requires + only adding a reader or writer. +data-files: + -- templates + data/templates/default.html4 + data/templates/default.html5 + data/templates/default.docbook4 + data/templates/default.docbook5 + data/templates/default.jats + data/templates/default.tei + data/templates/default.opendocument + data/templates/default.icml + data/templates/default.opml + data/templates/default.latex + data/templates/default.context + data/templates/default.texinfo + data/templates/default.man + data/templates/default.ms + data/templates/default.markdown + data/templates/default.muse + data/templates/default.commonmark + data/templates/default.rst + data/templates/default.plain + data/templates/default.mediawiki + data/templates/default.dokuwiki + data/templates/default.zimwiki + data/templates/default.rtf + data/templates/default.s5 + data/templates/default.slidy + data/templates/default.slideous + data/templates/default.revealjs + data/templates/default.dzslides + data/templates/default.asciidoc + data/templates/default.haddock + data/templates/default.textile + data/templates/default.org + data/templates/default.epub2 + data/templates/default.epub3 + -- translations + data/translations/*.yaml + -- source files for reference.docx + data/docx/[Content_Types].xml + data/docx/_rels/.rels + data/docx/docProps/app.xml + data/docx/docProps/core.xml + data/docx/word/document.xml + data/docx/word/fontTable.xml + data/docx/word/comments.xml + data/docx/word/footnotes.xml + data/docx/word/numbering.xml + data/docx/word/settings.xml + data/docx/word/webSettings.xml + data/docx/word/styles.xml + data/docx/word/_rels/document.xml.rels + data/docx/word/_rels/footnotes.xml.rels + data/docx/word/theme/theme1.xml + -- source files for reference.odt + data/odt/mimetype + data/odt/manifest.rdf + data/odt/styles.xml + data/odt/content.xml + data/odt/meta.xml + data/odt/settings.xml + data/odt/Configurations2/accelerator/current.xml + data/odt/Thumbnails/thumbnail.png + data/odt/META-INF/manifest.xml + -- source files for reference.pptx + data/pptx/_rels/.rels + data/pptx/docProps/app.xml + data/pptx/docProps/core.xml + data/pptx/ppt/slideLayouts/_rels/slideLayout1.xml.rels + data/pptx/ppt/slideLayouts/_rels/slideLayout2.xml.rels + data/pptx/ppt/slideLayouts/_rels/slideLayout3.xml.rels + data/pptx/ppt/slideLayouts/_rels/slideLayout4.xml.rels + data/pptx/ppt/slideLayouts/_rels/slideLayout5.xml.rels + data/pptx/ppt/slideLayouts/_rels/slideLayout6.xml.rels + data/pptx/ppt/slideLayouts/_rels/slideLayout7.xml.rels + data/pptx/ppt/slideLayouts/_rels/slideLayout8.xml.rels + data/pptx/ppt/slideLayouts/_rels/slideLayout9.xml.rels + data/pptx/ppt/slideLayouts/_rels/slideLayout10.xml.rels + data/pptx/ppt/slideLayouts/_rels/slideLayout11.xml.rels + data/pptx/ppt/slideLayouts/slideLayout1.xml + data/pptx/ppt/slideLayouts/slideLayout2.xml + data/pptx/ppt/slideLayouts/slideLayout3.xml + data/pptx/ppt/slideLayouts/slideLayout4.xml + data/pptx/ppt/slideLayouts/slideLayout5.xml + data/pptx/ppt/slideLayouts/slideLayout6.xml + data/pptx/ppt/slideLayouts/slideLayout7.xml + data/pptx/ppt/slideLayouts/slideLayout8.xml + data/pptx/ppt/slideLayouts/slideLayout9.xml + data/pptx/ppt/slideLayouts/slideLayout10.xml + data/pptx/ppt/slideLayouts/slideLayout11.xml + data/pptx/ppt/_rels/presentation.xml.rels + data/pptx/ppt/theme/theme1.xml + data/pptx/ppt/presProps.xml + data/pptx/ppt/slides/_rels/slide1.xml.rels + data/pptx/ppt/slides/_rels/slide2.xml.rels + data/pptx/ppt/slides/slide2.xml + data/pptx/ppt/slides/slide1.xml + data/pptx/ppt/viewProps.xml + data/pptx/ppt/tableStyles.xml + data/pptx/ppt/slideMasters/_rels/slideMaster1.xml.rels + data/pptx/ppt/slideMasters/slideMaster1.xml + data/pptx/ppt/presentation.xml + data/pptx/ppt/notesMasters/_rels/notesMaster1.xml.rels + data/pptx/ppt/notesMasters/notesMaster1.xml + data/pptx/ppt/notesSlides/_rels/notesSlide1.xml.rels + data/pptx/ppt/notesSlides/notesSlide1.xml + data/pptx/ppt/notesSlides/_rels/notesSlide2.xml.rels + data/pptx/ppt/notesSlides/notesSlide2.xml + data/pptx/ppt/theme/theme2.xml + data/pptx/[Content_Types].xml + -- stylesheet for EPUB writer + data/epub.css + -- data for dzslides writer + data/dzslides/template.html + -- default abbreviations file + data/abbreviations + -- sample lua custom writer + data/sample.lua + -- lua init script + data/init.lua + -- pandoc lua module + data/pandoc.lua + -- lua List module + data/pandoc.List.lua + -- bash completion template + data/bash_completion.tpl + -- jats csl + data/jats.csl + -- documentation + MANUAL.txt, COPYRIGHT +extra-source-files: + -- documentation + INSTALL.md, AUTHORS.md, README.md, + CONTRIBUTING.md, BUGS, changelog, + man/pandoc.1 + -- stack build plan + stack.yaml + -- files needed to build man page + man/manfilter.lua + man/pandoc.1.template + -- trypandoc + trypandoc/Makefile + trypandoc/index.html + -- tests + test/bodybg.gif + test/*.native + test/command/*.md + test/command/3533-rst-csv-tables.csv + test/command/3880.txt + test/command/abbrevs + test/command/SVG_logo-without-xml-declaration.svg + test/command/SVG_logo.svg + test/command/corrupt.svg + test/command/inkscape-cube.svg + test/command/sub-file-chapter-1.tex + test/command/sub-file-chapter-2.tex + test/command/3510-subdoc.org + test/command/3510-export.latex + test/command/3510-src.hs + test/command/3971b.tex + test/docbook-reader.docbook + test/docbook-xref.docbook + test/html-reader.html + test/opml-reader.opml + test/haddock-reader.haddock + test/insert + test/lalune.jpg + test/movie.jpg + test/media/rId25.jpg + test/media/rId26.jpg + test/media/rId27.jpg + test/latex-reader.latex + test/textile-reader.textile + test/markdown-reader-more.txt + test/markdown-citations.txt + test/textile-reader.textile + test/mediawiki-reader.wiki + test/vimwiki-reader.wiki + test/creole-reader.txt + test/creole-reader.native + test/rst-reader.rst + test/jats-reader.xml + test/s5-basic.html + test/s5-fancy.html + test/s5-fragment.html + test/s5-inserts.html + test/tables.context + test/tables.docbook4 + test/tables.docbook5 + test/tables.jats + test/tables.dokuwiki + test/tables.zimwiki + test/tables.icml + test/tables.html4 + test/tables.html5 + test/tables.latex + test/tables.man + test/tables.ms + test/tables.plain + test/tables.markdown + test/tables.mediawiki + test/tables.tei + test/tables.textile + test/tables.opendocument + test/tables.org + test/tables.asciidoc + test/tables.haddock + test/tables.texinfo + test/tables.rst + test/tables.rtf + test/tables.txt + test/tables.fb2 + test/tables.muse + test/tables.custom + test/testsuite.txt + test/writer.latex + test/writer.context + test/writer.docbook4 + test/writer.docbook5 + test/writer.jats + test/writer.html4 + test/writer.html5 + test/writer.man + test/writer.ms + test/writer.markdown + test/writer.plain + test/writer.mediawiki + test/writer.textile + test/writer.opendocument + test/writer.org + test/writer.asciidoc + test/writer.haddock + test/writer.rst + test/writer.icml + test/writer.rtf + test/writer.tei + test/writer.texinfo + test/writer.fb2 + test/writer.opml + test/writer.dokuwiki + test/writer.zimwiki + test/writer.muse + test/writer.custom + test/writers-lang-and-dir.latex + test/writers-lang-and-dir.context + test/dokuwiki_inline_formatting.dokuwiki + test/lhs-test.markdown + test/lhs-test.markdown+lhs + test/lhs-test.rst + test/lhs-test.rst+lhs + test/lhs-test.latex + test/lhs-test.latex+lhs + test/lhs-test.html + test/lhs-test.html+lhs + test/lhs-test.fragment.html+lhs + test/pipe-tables.txt + test/dokuwiki_external_images.dokuwiki + test/dokuwiki_external_images.native + test/dokuwiki_multiblock_table.dokuwiki + test/dokuwiki_multiblock_table.native + test/fb2/*.markdown + test/fb2/*.fb2 + test/fb2/images-embedded.html + test/fb2/images-embedded.fb2 + test/fb2/test-small.png + test/fb2/reader/*.fb2 + test/fb2/reader/*.native + test/fb2/test.jpg + test/docx/*.docx + test/docx/golden/*.docx + test/docx/*.native + test/epub/*.epub + test/epub/*.native + test/pptx/*.pptx + test/pptx/*.native + test/txt2tags.t2t + test/twiki-reader.twiki + test/tikiwiki-reader.tikiwiki + test/odt/odt/*.odt + test/odt/markdown/*.md + test/odt/native/*.native + test/lua/*.lua +source-repository head + type: git + location: git://github.com/jgm/pandoc.git + +flag static + Description: Use static linking for pandoc executable. + Default: False + +flag embed_data_files + Description: Embed data files in binary for relocatable executable. + Default: False + +flag trypandoc + Description: Build trypandoc cgi executable. + Default: False + +flag network-uri + Description: Get Network.URI from the network-uri package + Default: True + +custom-setup + setup-depends: base, Cabal + +library + build-depends: base >= 4.8 && < 5, + syb >= 0.1 && < 0.8, + containers >= 0.4.2.1 && < 0.6, + unordered-containers >= 0.2 && < 0.3, + parsec >= 3.1 && < 3.2, + mtl >= 2.2 && < 2.3, + exceptions >= 0.8 && < 0.11, + filepath >= 1.1 && < 1.5, + process >= 1.2.3 && < 1.7, + directory >= 1 && < 1.4, + bytestring >= 0.9 && < 0.11, + text >= 0.11 && < 1.3, + time >= 1.5 && < 1.10, + safe >= 0.3 && < 0.4, + zip-archive >= 0.2.3.4 && < 0.4, + HTTP >= 4000.0.5 && < 4000.4, + texmath >= 0.10 && < 0.12, + xml >= 1.3.12 && < 1.4, + split >= 0.2 && < 0.3, + random >= 1 && < 1.2, + pandoc-types >= 1.17.4.2 && < 1.18, + aeson >= 0.7 && < 1.4, + aeson-pretty >= 0.8.5 && < 0.9, + tagsoup >= 0.14.6 && < 0.15, + base64-bytestring >= 0.1 && < 1.1, + zlib >= 0.5 && < 0.7, + skylighting >= 0.5.1 && < 0.8, + data-default >= 0.4 && < 0.8, + temporary >= 1.1 && < 1.4, + blaze-html >= 0.9 && < 0.10, + blaze-markup >= 0.8 && < 0.9, + yaml >= 0.8.8.2 && < 0.9, + scientific >= 0.2 && < 0.4, + vector >= 0.10 && < 0.13, + hslua >= 0.9.5 && < 0.9.6, + hslua-module-text >= 0.1.2 && < 0.2, + binary >= 0.5 && < 0.10, + SHA >= 1.6 && < 1.7, + haddock-library >= 1.1 && < 1.6, + deepseq >= 1.3 && < 1.5, + JuicyPixels >= 3.1.6.1 && < 3.3, + Glob >= 0.7 && < 0.10, + cmark-gfm >= 0.1.1 && < 0.2, + doctemplates >= 0.2.1 && < 0.3, + http-client >= 0.4.30 && < 0.6, + http-client-tls >= 0.2.4 && < 0.4, + http-types >= 0.8 && < 0.13, + case-insensitive >= 1.2 && < 1.3 + if impl(ghc < 8.0) + build-depends: semigroups == 0.18.* + if impl(ghc < 8.4) + hs-source-dirs: prelude + other-modules: Prelude + build-depends: base-compat >= 0.9 + if os(windows) + cpp-options: -D_WINDOWS + else + build-depends: unix >= 2.4 && < 2.8 + if flag(network-uri) + build-depends: network-uri >= 2.6 && < 2.7, network >= 2.6 + else + build-depends: network >= 2 && < 2.6 + if flag(embed_data_files) + cpp-options: -DEMBED_DATA_FILES + build-depends: file-embed >= 0.0 && < 0.1 + other-modules: Text.Pandoc.Data + if os(windows) + cpp-options: -D_WINDOWS + ghc-options: -Wall -fno-warn-unused-do-bind + default-language: Haskell2010 + other-extensions: NoImplicitPrelude + hs-source-dirs: src + + exposed-modules: Text.Pandoc, + Text.Pandoc.App, + Text.Pandoc.Options, + Text.Pandoc.Extensions, + Text.Pandoc.Pretty, + Text.Pandoc.Shared, + Text.Pandoc.MediaBag, + Text.Pandoc.Error, + Text.Pandoc.Readers, + Text.Pandoc.Readers.HTML, + Text.Pandoc.Readers.LaTeX, + Text.Pandoc.Readers.LaTeX.Types, + Text.Pandoc.Readers.Markdown, + Text.Pandoc.Readers.CommonMark, + Text.Pandoc.Readers.Creole, + Text.Pandoc.Readers.MediaWiki, + Text.Pandoc.Readers.Vimwiki, + Text.Pandoc.Readers.RST, + Text.Pandoc.Readers.Org, + Text.Pandoc.Readers.DocBook, + Text.Pandoc.Readers.JATS, + Text.Pandoc.Readers.OPML, + Text.Pandoc.Readers.Textile, + Text.Pandoc.Readers.Native, + Text.Pandoc.Readers.Haddock, + Text.Pandoc.Readers.TWiki, + Text.Pandoc.Readers.TikiWiki, + Text.Pandoc.Readers.Txt2Tags, + Text.Pandoc.Readers.Docx, + Text.Pandoc.Readers.Odt, + Text.Pandoc.Readers.EPUB, + Text.Pandoc.Readers.Muse, + Text.Pandoc.Readers.FB2, + Text.Pandoc.Writers, + Text.Pandoc.Writers.Native, + Text.Pandoc.Writers.Docbook, + Text.Pandoc.Writers.JATS, + Text.Pandoc.Writers.OPML, + Text.Pandoc.Writers.HTML, + Text.Pandoc.Writers.ICML, + Text.Pandoc.Writers.LaTeX, + Text.Pandoc.Writers.ConTeXt, + Text.Pandoc.Writers.OpenDocument, + Text.Pandoc.Writers.Texinfo, + Text.Pandoc.Writers.Man, + Text.Pandoc.Writers.Ms, + Text.Pandoc.Writers.Markdown, + Text.Pandoc.Writers.CommonMark, + Text.Pandoc.Writers.Haddock, + Text.Pandoc.Writers.RST, + Text.Pandoc.Writers.Org, + Text.Pandoc.Writers.AsciiDoc, + Text.Pandoc.Writers.Custom, + Text.Pandoc.Writers.Textile, + Text.Pandoc.Writers.MediaWiki, + Text.Pandoc.Writers.DokuWiki, + Text.Pandoc.Writers.ZimWiki, + Text.Pandoc.Writers.RTF, + Text.Pandoc.Writers.ODT, + Text.Pandoc.Writers.Docx, + Text.Pandoc.Writers.Powerpoint, + Text.Pandoc.Writers.EPUB, + Text.Pandoc.Writers.FB2, + Text.Pandoc.Writers.TEI, + Text.Pandoc.Writers.Muse, + Text.Pandoc.Writers.Math, + Text.Pandoc.Writers.Shared, + Text.Pandoc.Writers.OOXML, + Text.Pandoc.Lua, + Text.Pandoc.PDF, + Text.Pandoc.UTF8, + Text.Pandoc.Templates, + Text.Pandoc.XML, + Text.Pandoc.SelfContained, + Text.Pandoc.Highlighting, + Text.Pandoc.Logging, + Text.Pandoc.Process, + Text.Pandoc.MIME, + Text.Pandoc.Parsing, + Text.Pandoc.Asciify, + Text.Pandoc.Emoji, + Text.Pandoc.ImageSize, + Text.Pandoc.BCP47, + Text.Pandoc.Class + other-modules: Text.Pandoc.Filter, + Text.Pandoc.Filter.JSON, + Text.Pandoc.Filter.Lua, + Text.Pandoc.Filter.Path, + Text.Pandoc.Readers.Docx.Lists, + Text.Pandoc.Readers.Docx.Combine, + Text.Pandoc.Readers.Docx.Parse, + Text.Pandoc.Readers.Docx.Util, + Text.Pandoc.Readers.Docx.StyleMap, + Text.Pandoc.Readers.Docx.Fields, + Text.Pandoc.Readers.Odt.Base, + Text.Pandoc.Readers.Odt.Namespaces, + Text.Pandoc.Readers.Odt.StyleReader, + Text.Pandoc.Readers.Odt.ContentReader, + Text.Pandoc.Readers.Odt.Generic.Fallible, + Text.Pandoc.Readers.Odt.Generic.SetMap, + Text.Pandoc.Readers.Odt.Generic.Utils, + Text.Pandoc.Readers.Odt.Generic.Namespaces, + Text.Pandoc.Readers.Odt.Generic.XMLConverter, + Text.Pandoc.Readers.Odt.Arrows.State, + Text.Pandoc.Readers.Odt.Arrows.Utils, + Text.Pandoc.Readers.Org.BlockStarts, + Text.Pandoc.Readers.Org.Blocks, + Text.Pandoc.Readers.Org.DocumentTree, + Text.Pandoc.Readers.Org.ExportSettings, + Text.Pandoc.Readers.Org.Inlines, + Text.Pandoc.Readers.Org.Meta, + Text.Pandoc.Readers.Org.ParserState, + Text.Pandoc.Readers.Org.Parsing, + Text.Pandoc.Readers.Org.Shared, + Text.Pandoc.Writers.Powerpoint.Presentation, + Text.Pandoc.Writers.Powerpoint.Output, + Text.Pandoc.Lua.Filter, + Text.Pandoc.Lua.Init, + Text.Pandoc.Lua.Module.MediaBag, + Text.Pandoc.Lua.Module.Pandoc, + Text.Pandoc.Lua.Module.Utils, + Text.Pandoc.Lua.Packages, + Text.Pandoc.Lua.StackInstances, + Text.Pandoc.Lua.Util, + Text.Pandoc.CSS, + Text.Pandoc.CSV, + Text.Pandoc.UUID, + Text.Pandoc.Translations, + Text.Pandoc.Slides, + Paths_pandoc + + buildable: True + +executable pandoc + build-depends: pandoc, base >= 4.7 && < 5 + if impl(ghc < 8.0) + build-depends: semigroups == 0.18.* + if impl(ghc < 8.4) + hs-source-dirs: prelude + other-modules: Prelude + build-depends: base-compat >= 0.9 + ghc-options: -rtsopts -with-rtsopts=-K16m -Wall -fno-warn-unused-do-bind -threaded + if flag(static) + ld-options: -static + default-language: Haskell2010 + other-extensions: NoImplicitPrelude + hs-source-dirs: . + main-is: pandoc.hs + buildable: True + other-modules: Paths_pandoc + +executable trypandoc + main-is: trypandoc.hs + hs-source-dirs: trypandoc + default-language: Haskell2010 + other-extensions: NoImplicitPrelude + if flag(trypandoc) + build-depends: base, aeson, pandoc, + text, wai-extra, wai >= 0.3, http-types + buildable: True + else + buildable: False + if impl(ghc < 8.0) + build-depends: semigroups == 0.18.* + if impl(ghc < 8.4) + hs-source-dirs: prelude + other-modules: Prelude + build-depends: base-compat >= 0.9 + +benchmark weigh-pandoc + type: exitcode-stdio-1.0 + main-is: weigh-pandoc.hs + hs-source-dirs: benchmark + build-depends: pandoc, + base >= 4.2 && < 5, + text, + weigh >= 0.0 && < 0.1, + mtl >= 2.2 && < 2.3 + if impl(ghc < 8.0) + build-depends: semigroups == 0.18.* + if impl(ghc < 8.4) + hs-source-dirs: prelude + other-modules: Prelude + build-depends: base-compat >= 0.9 + ghc-options: -rtsopts -Wall -fno-warn-unused-do-bind -threaded + default-language: Haskell2010 + other-extensions: NoImplicitPrelude + +test-suite test-pandoc + type: exitcode-stdio-1.0 + main-is: test-pandoc.hs + hs-source-dirs: test + build-depends: base >= 4.2 && < 5, + pandoc, + pandoc-types >= 1.17.4.2 && < 1.18, + bytestring >= 0.9 && < 0.11, + base64-bytestring >= 0.1 && < 1.1, + text >= 0.11 && < 1.3, + time >= 1.5 && < 1.10, + directory >= 1 && < 1.4, + filepath >= 1.1 && < 1.5, + hslua >= 0.9.5 && < 0.9.6, + process >= 1.2.3 && < 1.7, + temporary >= 1.1 && < 1.4, + Diff >= 0.2 && < 0.4, + tasty >= 0.11 && < 1.1, + tasty-hunit >= 0.9 && < 0.11, + tasty-quickcheck >= 0.8 && < 0.11, + tasty-golden >= 2.3 && < 2.4, + QuickCheck >= 2.4 && < 2.12, + containers >= 0.4.2.1 && < 0.6, + executable-path >= 0.0 && < 0.1, + zip-archive >= 0.2.3.4 && < 0.4, + xml >= 1.3.12 && < 1.4, + Glob >= 0.7 && < 0.10 + if impl(ghc < 8.0) + build-depends: semigroups == 0.18.* + if impl(ghc < 8.4) + hs-source-dirs: prelude + other-modules: Prelude + build-depends: base-compat >= 0.9 + other-modules: Tests.Old + Tests.Command + Tests.Helpers + Tests.Lua + Tests.Shared + Tests.Readers.LaTeX + Tests.Readers.HTML + Tests.Readers.JATS + Tests.Readers.Markdown + Tests.Readers.Org + Tests.Readers.Org.Block + Tests.Readers.Org.Block.CodeBlock + Tests.Readers.Org.Block.Figure + Tests.Readers.Org.Block.Header + Tests.Readers.Org.Block.List + Tests.Readers.Org.Block.Table + Tests.Readers.Org.Directive + Tests.Readers.Org.Inline + Tests.Readers.Org.Inline.Citation + Tests.Readers.Org.Inline.Note + Tests.Readers.Org.Inline.Smart + Tests.Readers.Org.Meta + Tests.Readers.Org.Shared + Tests.Readers.RST + Tests.Readers.Docx + Tests.Readers.Odt + Tests.Readers.Txt2Tags + Tests.Readers.EPUB + Tests.Readers.Muse + Tests.Readers.Creole + Tests.Readers.FB2 + Tests.Writers.Native + Tests.Writers.ConTeXt + Tests.Writers.Docbook + Tests.Writers.HTML + Tests.Writers.JATS + Tests.Writers.Markdown + Tests.Writers.Org + Tests.Writers.Plain + Tests.Writers.AsciiDoc + Tests.Writers.LaTeX + Tests.Writers.Docx + Tests.Writers.RST + Tests.Writers.TEI + Tests.Writers.Muse + Tests.Writers.FB2 + Tests.Writers.Powerpoint + Tests.Writers.OOXML + ghc-options: -rtsopts -Wall -fno-warn-unused-do-bind -threaded + default-language: Haskell2010 + other-extensions: NoImplicitPrelude + +benchmark benchmark-pandoc + type: exitcode-stdio-1.0 + main-is: benchmark-pandoc.hs + hs-source-dirs: benchmark + build-depends: pandoc, + time, bytestring, containers, + base >= 4.2 && < 5, + text >= 0.11 && < 1.3, + criterion >= 1.0 && < 1.5 + if impl(ghc < 8.0) + build-depends: semigroups == 0.18.* + if impl(ghc < 8.4) + hs-source-dirs: prelude + other-modules: Prelude + build-depends: base-compat >= 0.9 + ghc-options: -rtsopts -Wall -fno-warn-unused-do-bind -threaded + default-language: Haskell2010 + other-extensions: NoImplicitPrelude diff --git a/pandoc.spec b/pandoc.spec index 4b60dd7..614703f 100644 --- a/pandoc.spec +++ b/pandoc.spec @@ -7,8 +7,8 @@ %bcond_with tests Name: %{pkg_name} -Version: 2.1.2 -Release: 3%{?dist} +Version: 2.2.1 +Release: 1%{?dist} Summary: Conversion between markup formats License: GPLv2+ @@ -91,12 +91,12 @@ Pandoc is a Haskell library for converting from one markup format to another, and a command-line tool that uses this library. It can read several dialects of Markdown and (subsets of) HTML, reStructuredText, LaTeX, DocBook, JATS, MediaWiki markup, TWiki markup, TikiWiki markup, Creole 1.0, Haddock markup, -OPML, Emacs Org-Mode, Emacs Muse, txt2tags, Vimwiki, Word Docx, ODT, and -Textile, and it can write Markdown, reStructuredText, XHTML, HTML 5, LaTeX, -ConTeXt, DocBook, JATS, OPML, TEI, OpenDocument, ODT, Word docx, RTF, -MediaWiki, DokuWiki, ZimWiki, Textile, groff man, groff ms, plain text, Emacs -Org-Mode, AsciiDoc, Haddock markup, EPUB (v2 and v3), FictionBook2, InDesign -ICML, Muse, LaTeX beamer slides, PowerPoint, and several kinds of +OPML, Emacs Org-Mode, Emacs Muse, txt2tags, Vimwiki, Word Docx, ODT, EPUB, +FictionBook2, and Textile, and it can write Markdown, reStructuredText, XHTML, +HTML 5, LaTeX, ConTeXt, DocBook, JATS, OPML, TEI, OpenDocument, ODT, Word docx, +RTF, MediaWiki, DokuWiki, ZimWiki, Textile, groff man, groff ms, plain text, +Emacs Org-Mode, AsciiDoc, Haddock markup, EPUB (v2 and v3), FictionBook2, +InDesign ICML, Muse, LaTeX beamer slides, PowerPoint, and several kinds of HTML/JavaScript slide shows (S5, Slidy, Slideous, DZSlides, reveal.js). In contrast to most existing tools for converting Markdown to HTML, pandoc has @@ -217,6 +217,9 @@ install -m 0644 -p -D man/pandoc.1 %{buildroot}%{_mandir}/man1/pandoc.1 %changelog +* Thu Feb 21 2019 Jens Petersen - 2.2.1-1 +- update to 2.2.1 + * Fri Feb 01 2019 Fedora Release Engineering - 2.1.2-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild diff --git a/sources b/sources index 82036d8..77745e1 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (pandoc-2.1.2.tar.gz) = a1b02c353ac021609abe24685eb6e5c57b706cd0b6136e076d4df584344810b184ecb18f2206b21c1d6a0484aa37ccaafe41e1771829e59fe26879080739b1e9 +SHA512 (pandoc-2.2.1.tar.gz) = 84af51e180bcf8f0c11e67d8031d11a4b60c6061736a48c21e64bc30d0018a0161e3993167111584e384eced18632841b70027fdf29ed9e46427425096bb56b1 From d622a3a9edabea161974b06ca9b378464dc4bee9 Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Sat, 23 Feb 2019 09:37:18 +0800 Subject: [PATCH 137/165] cblrpm common subpackage --- pandoc.spec | 28 ++++++++++++++++------------ 1 file changed, 16 insertions(+), 12 deletions(-) diff --git a/pandoc.spec b/pandoc.spec index 614703f..9d5918c 100644 --- a/pandoc.spec +++ b/pandoc.spec @@ -21,7 +21,6 @@ Source1: https://hackage.haskell.org/package/%{pkgver}/%{name}.cabal#/%{p # Begin cabal-rpm deps: BuildRequires: ghc-Cabal-devel BuildRequires: ghc-rpm-macros -BuildRequires: chrpath BuildRequires: ghc-Glob-devel BuildRequires: ghc-HTTP-devel BuildRequires: ghc-JuicyPixels-devel @@ -81,10 +80,10 @@ BuildRequires: ghc-tasty-golden-devel BuildRequires: ghc-tasty-hunit-devel BuildRequires: ghc-tasty-quickcheck-devel %endif +Requires: %{name}-common = %{version}-%{release} # End cabal-rpm deps # added for F26 Obsoletes: pandoc-static < %{version}-%{release} -Requires: pandoc-common = %{version}-%{release} %description Pandoc is a Haskell library for converting from one markup format to another, @@ -109,16 +108,19 @@ For pdf output please also install pandoc-pdf. %package common -Summary: Pandoc data files +Summary: %{name} common files +# templates are dual: GPLv2+ or BSD +# dzslides js and css: DWTFYWTPL +License: GPLv2+ and BSD BuildArch: noarch %description common -This package contains the common data files used by pandoc. +This package provides the %{name} common data files. %package -n ghc-%{name} Summary: Haskell %{name} library -Requires: pandoc-common = %{version}-%{release} +Requires: %{name}-common = %{version}-%{release} %description -n ghc-%{name} This package provides the Haskell %{name} shared library. @@ -155,8 +157,9 @@ or texlive-collection-luatex respectively. %prep +# Begin cabal-rpm setup: %setup -q -cp -p %{SOURCE1} %{name}.cabal +cp -bp %{SOURCE1} %{name}.cabal # End cabal-rpm setup @@ -169,6 +172,7 @@ cp -p %{SOURCE1} %{name}.cabal %install # Begin cabal-rpm install %ghc_lib_install +mv %{buildroot}%{_ghcdocdir}{,-common} # End cabal-rpm install rm %{buildroot}%{_datadir}/%{pkgver}/COPYRIGHT @@ -192,24 +196,24 @@ install -m 0644 -p -D man/pandoc.1 %{buildroot}%{_mandir}/man1/pandoc.1 %files # Begin cabal-rpm files: -%license COPYING.md COPYRIGHT -%doc AUTHORS.md BUGS CONTRIBUTING.md README.md %{_bindir}/%{name} # End cabal-rpm files -%attr(-,root,root) %{_bindir}/hsmarkdown -%attr(644,root,root) %{_mandir}/man1/pandoc.1* +%{_bindir}/hsmarkdown +%{_mandir}/man1/pandoc.1* %files common +# Begin cabal-rpm files: +%license COPYING.md +%doc AUTHORS.md BUGS CONTRIBUTING.md README.md changelog %{_datadir}/%{pkgver} - +# End cabal-rpm files %files pdf %files -n ghc-%{name} -f ghc-%{name}.files # Begin cabal-rpm files: -%license COPYING.md COPYRIGHT # End cabal-rpm files From 26bd43fe66f6fbc7cc25a816dacd6ff572b9084d Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 26 Jul 2019 00:00:16 +0000 Subject: [PATCH 138/165] - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- pandoc.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pandoc.spec b/pandoc.spec index 9d5918c..bfb5ac0 100644 --- a/pandoc.spec +++ b/pandoc.spec @@ -8,7 +8,7 @@ Name: %{pkg_name} Version: 2.2.1 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Conversion between markup formats License: GPLv2+ @@ -221,6 +221,9 @@ install -m 0644 -p -D man/pandoc.1 %{buildroot}%{_mandir}/man1/pandoc.1 %changelog +* Fri Jul 26 2019 Fedora Release Engineering - 2.2.1-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild + * Thu Feb 21 2019 Jens Petersen - 2.2.1-1 - update to 2.2.1 From c848f81ac5ec9ffcfb87162f33c597ca0479d388 Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Thu, 25 Jul 2019 04:27:27 +0000 Subject: [PATCH 139/165] refresh to cabal-rpm-1.0.0: lib doc/prof subpkgs and bin static BRs --- pandoc.spec | 52 +++++++++++++++++++++++++++++++++++++--------------- 1 file changed, 37 insertions(+), 15 deletions(-) diff --git a/pandoc.spec b/pandoc.spec index bfb5ac0..45300d9 100644 --- a/pandoc.spec +++ b/pandoc.spec @@ -1,4 +1,4 @@ -# generated by cabal-rpm-0.13 +# generated by cabal-rpm-1.0.0 # https://fedoraproject.org/wiki/Packaging:Haskell %global pkg_name pandoc @@ -20,6 +20,12 @@ Source1: https://hackage.haskell.org/package/%{pkgver}/%{name}.cabal#/%{p # Begin cabal-rpm deps: BuildRequires: ghc-Cabal-devel +%if %{with haddock} +BuildRequires: ghc-doc +%endif +%if %{with ghc_prof} +BuildRequires: ghc-prof +%endif BuildRequires: ghc-rpm-macros BuildRequires: ghc-Glob-devel BuildRequires: ghc-HTTP-devel @@ -104,7 +110,7 @@ format and produce a native representation of the document, and a set of writers, which convert this native representation into a target format. Thus, adding an input or output format requires only adding a reader or writer. -For pdf output please also install pandoc-pdf. +For pdf output please also install pandoc-pdf or weasyprint. %package common @@ -129,11 +135,8 @@ This package provides the Haskell %{name} shared library. %package -n ghc-%{name}-devel Summary: Haskell %{name} library development files Provides: ghc-%{name}-static = %{version}-%{release} -Provides: ghc-%{name}-doc = %{version}-%{release} %if %{defined ghc_version} Requires: ghc-compiler = %{ghc_version} -Requires(post): ghc-compiler = %{ghc_version} -Requires(postun): ghc-compiler = %{ghc_version} %endif Requires: ghc-%{name}%{?_isa} = %{version}-%{release} @@ -156,6 +159,25 @@ To use --latex-engine=xelatex or lualatex, install texlive-collection-xetex or texlive-collection-luatex respectively. +%if %{with haddock} +%package -n ghc-%{name}-doc +Summary: Haskell %{name} library documentation + +%description -n ghc-%{name}-doc +This package provides the Haskell %{name} library documentation. +%endif + + +%if %{with ghc_prof} +%package -n ghc-%{name}-prof +Summary: Haskell %{name} profiling library +Requires: ghc-%{name}-devel%{?_isa} = %{version}-%{release} + +%description -n ghc-%{name}-prof +This package provides the Haskell %{name} profiling library. +%endif + + %prep # Begin cabal-rpm setup: %setup -q @@ -186,14 +208,6 @@ install -m 0644 -p -D man/pandoc.1 %{buildroot}%{_mandir}/man1/pandoc.1 %cabal_test -%post -n ghc-%{name}-devel -%ghc_pkg_recache - - -%postun -n ghc-%{name}-devel -%ghc_pkg_recache - - %files # Begin cabal-rpm files: %{_bindir}/%{name} @@ -213,13 +227,21 @@ install -m 0644 -p -D man/pandoc.1 %{buildroot}%{_mandir}/man1/pandoc.1 %files -n ghc-%{name} -f ghc-%{name}.files -# Begin cabal-rpm files: -# End cabal-rpm files %files -n ghc-%{name}-devel -f ghc-%{name}-devel.files +%if %{with haddock} +%files -n ghc-%{name}-doc -f ghc-%{name}-doc.files +%endif + + +%if %{with ghc_prof} +%files -n ghc-%{name}-prof -f ghc-%{name}-prof.files +%endif + + %changelog * Fri Jul 26 2019 Fedora Release Engineering - 2.2.1-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild From 85732f72113064deb0dcc12c740d978b7d737228 Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Fri, 26 Jul 2019 01:46:39 +0000 Subject: [PATCH 140/165] update to 2.5 --- .gitignore | 4 + pandoc-2.2.1.cabal => pandoc-2.5.cabal | 145 +++++++++++++++---------- pandoc.spec | 60 +++++++--- sources | 5 +- 4 files changed, 142 insertions(+), 72 deletions(-) rename pandoc-2.2.1.cabal => pandoc-2.5.cabal (87%) diff --git a/.gitignore b/.gitignore index 7077739..e54e4f0 100644 --- a/.gitignore +++ b/.gitignore @@ -24,3 +24,7 @@ /hslua-module-text-0.1.2.1.tar.gz /pandoc-2.1.2.tar.gz /pandoc-2.2.1.tar.gz +/pandoc-2.5.tar.gz +/unicode-transforms-0.3.6.tar.gz +/HsYAML-0.1.2.0.tar.gz +/bitarray-0.0.1.1.tar.gz diff --git a/pandoc-2.2.1.cabal b/pandoc-2.5.cabal similarity index 87% rename from pandoc-2.2.1.cabal rename to pandoc-2.5.cabal index 64037ad..5d22ca9 100644 --- a/pandoc-2.2.1.cabal +++ b/pandoc-2.5.cabal @@ -1,7 +1,7 @@ name: pandoc -version: 2.2.1 -x-revision: 1 -cabal-version: >= 1.10 +version: 2.5 +x-revision: 2 +cabal-version: 2.0 build-type: Custom license: GPL-2 license-file: COPYING.md @@ -12,7 +12,8 @@ bug-reports: https://github.com/jgm/pandoc/issues stability: alpha homepage: https://pandoc.org category: Text -tested-with: GHC == 7.10.3, GHC == 8.0.2, GHC == 8.2.2, GHC == 8.4.1 +tested-with: GHC == 7.10.3, GHC == 8.0.2, GHC == 8.2.2, GHC == 8.4.3, + GHC == 8.6.1 synopsis: Conversion between markup formats description: Pandoc is a Haskell library for converting from one markup format to another, and a command-line tool that uses @@ -20,15 +21,16 @@ description: Pandoc is a Haskell library for converting from one markup (subsets of) HTML, reStructuredText, LaTeX, DocBook, JATS, MediaWiki markup, TWiki markup, TikiWiki markup, Creole 1.0, Haddock markup, OPML, Emacs Org-Mode, Emacs Muse, txt2tags, - Vimwiki, Word Docx, ODT, EPUB, FictionBook2, and Textile, - and it can write Markdown, reStructuredText, XHTML, HTML 5, - LaTeX, ConTeXt, DocBook, JATS, OPML, TEI, OpenDocument, - ODT, Word docx, RTF, MediaWiki, DokuWiki, ZimWiki, Textile, - groff man, groff ms, plain text, Emacs Org-Mode, AsciiDoc, - Haddock markup, EPUB (v2 and v3), FictionBook2, InDesign - ICML, Muse, LaTeX beamer slides, PowerPoint, and several - kinds of HTML/JavaScript slide shows (S5, Slidy, Slideous, - DZSlides, reveal.js). + Vimwiki, Word Docx, ODT, EPUB, FictionBook2, roff man, + and Textile, and it can write Markdown, reStructuredText, + XHTML, HTML 5, LaTeX, ConTeXt, DocBook, JATS, OPML, TEI, + OpenDocument, ODT, Word docx, PowerPoint pptx, + RTF, MediaWiki, DokuWiki, ZimWiki, Textile, + roff man, roff ms, plain text, Emacs Org-Mode, + AsciiDoc, Haddock markup, EPUB (v2 and v3), + FictionBook2, InDesign ICML, Muse, LaTeX beamer slides, + and several kinds of HTML/JavaScript slide shows + (S5, Slidy, Slideous, DZSlides, reveal.js). . In contrast to most existing tools for converting Markdown to HTML, pandoc has a modular design: it consists of a set of @@ -80,6 +82,7 @@ data-files: data/docx/_rels/.rels data/docx/docProps/app.xml data/docx/docProps/core.xml + data/docx/docProps/custom.xml data/docx/word/document.xml data/docx/word/fontTable.xml data/docx/word/comments.xml @@ -191,8 +194,11 @@ extra-source-files: test/command/SVG_logo.svg test/command/corrupt.svg test/command/inkscape-cube.svg + test/command/lua-pandoc-state.lua test/command/sub-file-chapter-1.tex test/command/sub-file-chapter-2.tex + test/command/bar.tex + test/command/yaml-metadata.yaml test/command/3510-subdoc.org test/command/3510-export.latex test/command/3510-src.hs @@ -204,6 +210,7 @@ extra-source-files: test/haddock-reader.haddock test/insert test/lalune.jpg + test/man-reader.man test/movie.jpg test/media/rId25.jpg test/media/rId26.jpg @@ -331,21 +338,22 @@ flag embed_data_files Description: Embed data files in binary for relocatable executable. Default: False +flag derive_json_via_th + Description: Use Template Haskell instead of GHC Generics to derive ToJSON + and FromJSON instances. + Default: True + flag trypandoc Description: Build trypandoc cgi executable. Default: False -flag network-uri - Description: Get Network.URI from the network-uri package - Default: True - custom-setup - setup-depends: base, Cabal + setup-depends: base, Cabal >= 2.0 library build-depends: base >= 4.8 && < 5, syb >= 0.1 && < 0.8, - containers >= 0.4.2.1 && < 0.6, + containers >= 0.4.2.1 && < 0.7, unordered-containers >= 0.2 && < 0.3, parsec >= 3.1 && < 3.2, mtl >= 2.2 && < 2.3, @@ -354,45 +362,51 @@ library process >= 1.2.3 && < 1.7, directory >= 1 && < 1.4, bytestring >= 0.9 && < 0.11, - text >= 0.11 && < 1.3, + text >= 1.1.1.0 && < 1.3, time >= 1.5 && < 1.10, safe >= 0.3 && < 0.4, - zip-archive >= 0.2.3.4 && < 0.4, + zip-archive >= 0.2.3.4 && < 0.5, HTTP >= 4000.0.5 && < 4000.4, - texmath >= 0.10 && < 0.12, + texmath >= 0.11 && < 0.12, xml >= 1.3.12 && < 1.4, split >= 0.2 && < 0.3, random >= 1 && < 1.2, - pandoc-types >= 1.17.4.2 && < 1.18, - aeson >= 0.7 && < 1.4, + pandoc-types >= 1.17.5 && < 1.18, + aeson >= 0.7 && < 1.5, aeson-pretty >= 0.8.5 && < 0.9, tagsoup >= 0.14.6 && < 0.15, base64-bytestring >= 0.1 && < 1.1, zlib >= 0.5 && < 0.7, - skylighting >= 0.5.1 && < 0.8, + skylighting >= 0.7.4 && < 0.8, data-default >= 0.4 && < 0.8, temporary >= 1.1 && < 1.4, blaze-html >= 0.9 && < 0.10, blaze-markup >= 0.8 && < 0.9, - yaml >= 0.8.8.2 && < 0.9, - scientific >= 0.2 && < 0.4, vector >= 0.10 && < 0.13, - hslua >= 0.9.5 && < 0.9.6, - hslua-module-text >= 0.1.2 && < 0.2, - binary >= 0.5 && < 0.10, + hslua >= 1.0.1 && < 1.1, + hslua-module-text >= 0.2 && < 0.3, + binary >= 0.5 && < 0.11, SHA >= 1.6 && < 1.7, - haddock-library >= 1.1 && < 1.6, + haddock-library >= 1.7 && < 1.8, deepseq >= 1.3 && < 1.5, - JuicyPixels >= 3.1.6.1 && < 3.3, - Glob >= 0.7 && < 0.10, + JuicyPixels >= 3.1.6.1 && < 3.4, + Glob >= 0.7 && < 0.11, cmark-gfm >= 0.1.1 && < 0.2, doctemplates >= 0.2.1 && < 0.3, + network-uri >= 2.6 && < 2.7, + network >= 2.6, http-client >= 0.4.30 && < 0.6, http-client-tls >= 0.2.4 && < 0.4, http-types >= 0.8 && < 0.13, - case-insensitive >= 1.2 && < 1.3 + case-insensitive >= 1.2 && < 1.3, + unicode-transforms >= 0.3 && < 0.4, + HsYAML >= 0.1.1.1 && < 0.2 if impl(ghc < 8.0) - build-depends: semigroups == 0.18.* + build-depends: semigroups == 0.18.*, + -- basement 0.0.8 and foundation 0.0.21, transitive + -- dependencies, drop support for ghc 7.10: + basement < 0.0.8, + foundation < 0.0.21 if impl(ghc < 8.4) hs-source-dirs: prelude other-modules: Prelude @@ -401,17 +415,23 @@ library cpp-options: -D_WINDOWS else build-depends: unix >= 2.4 && < 2.8 - if flag(network-uri) - build-depends: network-uri >= 2.6 && < 2.7, network >= 2.6 - else - build-depends: network >= 2 && < 2.6 if flag(embed_data_files) cpp-options: -DEMBED_DATA_FILES build-depends: file-embed >= 0.0 && < 0.1 other-modules: Text.Pandoc.Data + if flag(derive_json_via_th) + cpp-options: -DDERIVE_JSON_VIA_TH if os(windows) cpp-options: -D_WINDOWS - ghc-options: -Wall -fno-warn-unused-do-bind + ghc-options: -Wall -fno-warn-unused-do-bind + if impl(ghc > 8.0) + ghc-options: -Wincomplete-record-updates + -Wnoncanonical-monad-instances + -Wnoncanonical-monadfail-instances + if impl(ghc > 8.4) + ghc-options: -Wincomplete-uni-patterns + -Widentities + -Werror=missing-home-modules default-language: Haskell2010 other-extensions: NoImplicitPrelude hs-source-dirs: src @@ -424,6 +444,7 @@ library Text.Pandoc.Shared, Text.Pandoc.MediaBag, Text.Pandoc.Error, + Text.Pandoc.Filter, Text.Pandoc.Readers, Text.Pandoc.Readers.HTML, Text.Pandoc.Readers.LaTeX, @@ -448,6 +469,7 @@ library Text.Pandoc.Readers.Odt, Text.Pandoc.Readers.EPUB, Text.Pandoc.Readers.Muse, + Text.Pandoc.Readers.Man, Text.Pandoc.Readers.FB2, Text.Pandoc.Writers, Text.Pandoc.Writers.Native, @@ -500,7 +522,10 @@ library Text.Pandoc.ImageSize, Text.Pandoc.BCP47, Text.Pandoc.Class - other-modules: Text.Pandoc.Filter, + other-modules: Text.Pandoc.App.CommandLineOptions, + Text.Pandoc.App.FormatHeuristics, + Text.Pandoc.App.Opt, + Text.Pandoc.App.OutputSettings, Text.Pandoc.Filter.JSON, Text.Pandoc.Filter.Lua, Text.Pandoc.Filter.Path, @@ -510,6 +535,8 @@ library Text.Pandoc.Readers.Docx.Util, Text.Pandoc.Readers.Docx.StyleMap, Text.Pandoc.Readers.Docx.Fields, + Text.Pandoc.Readers.LaTeX.Parsing, + Text.Pandoc.Readers.LaTeX.Lang, Text.Pandoc.Readers.Odt.Base, Text.Pandoc.Readers.Odt.Namespaces, Text.Pandoc.Readers.Odt.StyleReader, @@ -530,9 +557,12 @@ library Text.Pandoc.Readers.Org.ParserState, Text.Pandoc.Readers.Org.Parsing, Text.Pandoc.Readers.Org.Shared, + Text.Pandoc.Readers.Roff, + Text.Pandoc.Writers.Roff, Text.Pandoc.Writers.Powerpoint.Presentation, Text.Pandoc.Writers.Powerpoint.Output, Text.Pandoc.Lua.Filter, + Text.Pandoc.Lua.Global, Text.Pandoc.Lua.Init, Text.Pandoc.Lua.Module.MediaBag, Text.Pandoc.Lua.Module.Pandoc, @@ -542,15 +572,16 @@ library Text.Pandoc.Lua.Util, Text.Pandoc.CSS, Text.Pandoc.CSV, + Text.Pandoc.RoffChar, Text.Pandoc.UUID, Text.Pandoc.Translations, Text.Pandoc.Slides, Paths_pandoc - + autogen-modules: Paths_pandoc buildable: True executable pandoc - build-depends: pandoc, base >= 4.7 && < 5 + build-depends: pandoc, base >= 4.8 && < 5 if impl(ghc < 8.0) build-depends: semigroups == 0.18.* if impl(ghc < 8.4) @@ -590,7 +621,7 @@ benchmark weigh-pandoc main-is: weigh-pandoc.hs hs-source-dirs: benchmark build-depends: pandoc, - base >= 4.2 && < 5, + base >= 4.8 && < 5, text, weigh >= 0.0 && < 0.1, mtl >= 2.2 && < 2.3 @@ -608,29 +639,29 @@ test-suite test-pandoc type: exitcode-stdio-1.0 main-is: test-pandoc.hs hs-source-dirs: test - build-depends: base >= 4.2 && < 5, + build-depends: base >= 4.8 && < 5, pandoc, - pandoc-types >= 1.17.4.2 && < 1.18, + pandoc-types >= 1.17.5 && < 1.18, bytestring >= 0.9 && < 0.11, base64-bytestring >= 0.1 && < 1.1, - text >= 0.11 && < 1.3, + text >= 1.1.1.0 && < 1.3, time >= 1.5 && < 1.10, directory >= 1 && < 1.4, filepath >= 1.1 && < 1.5, - hslua >= 0.9.5 && < 0.9.6, + hslua >= 1.0 && < 1.1, process >= 1.2.3 && < 1.7, temporary >= 1.1 && < 1.4, Diff >= 0.2 && < 0.4, - tasty >= 0.11 && < 1.1, + tasty >= 0.11 && < 1.3, tasty-hunit >= 0.9 && < 0.11, tasty-quickcheck >= 0.8 && < 0.11, tasty-golden >= 2.3 && < 2.4, - QuickCheck >= 2.4 && < 2.12, - containers >= 0.4.2.1 && < 0.6, + QuickCheck >= 2.4 && < 2.13, + containers >= 0.4.2.1 && < 0.7, executable-path >= 0.0 && < 0.1, - zip-archive >= 0.2.3.4 && < 0.4, + zip-archive >= 0.2.3.4 && < 0.5, xml >= 1.3.12 && < 1.4, - Glob >= 0.7 && < 0.10 + Glob >= 0.7 && < 0.11 if impl(ghc < 8.0) build-depends: semigroups == 0.18.* if impl(ghc < 8.4) @@ -667,6 +698,7 @@ test-suite test-pandoc Tests.Readers.EPUB Tests.Readers.Muse Tests.Readers.Creole + Tests.Readers.Man Tests.Readers.FB2 Tests.Writers.Native Tests.Writers.ConTeXt @@ -695,9 +727,10 @@ benchmark benchmark-pandoc hs-source-dirs: benchmark build-depends: pandoc, time, bytestring, containers, - base >= 4.2 && < 5, - text >= 0.11 && < 1.3, - criterion >= 1.0 && < 1.5 + base >= 4.8 && < 5, + text >= 1.1.1.0 && < 1.3, + mtl >= 2.2 && < 2.3, + criterion >= 1.0 && < 1.6 if impl(ghc < 8.0) build-depends: semigroups == 0.18.* if impl(ghc < 8.4) diff --git a/pandoc.spec b/pandoc.spec index 45300d9..eb7ae43 100644 --- a/pandoc.spec +++ b/pandoc.spec @@ -1,21 +1,31 @@ -# generated by cabal-rpm-1.0.0 +# generated by cabal-rpm-1.0.0 --subpackage # https://fedoraproject.org/wiki/Packaging:Haskell %global pkg_name pandoc %global pkgver %{pkg_name}-%{version} +%global HsYAML HsYAML-0.1.2.0 +%global unicodetransforms unicode-transforms-0.3.6 +# needed by unicode-transforms +%global bitarray bitarray-0.0.1.1 +%global subpkgs %{HsYAML} %{bitarray} %{unicodetransforms} + %bcond_with tests Name: %{pkg_name} -Version: 2.2.1 -Release: 2%{?dist} +Version: 2.5 +# can only be reset when all subpkgs bumped +Release: 1%{?dist} Summary: Conversion between markup formats License: GPLv2+ Url: https://hackage.haskell.org/package/%{name} # Begin cabal-rpm sources: Source0: https://hackage.haskell.org/package/%{pkgver}/%{pkgver}.tar.gz -Source1: https://hackage.haskell.org/package/%{pkgver}/%{name}.cabal#/%{pkgver}.cabal +Source1: https://hackage.haskell.org/package/%{HsYAML}/%{HsYAML}.tar.gz +Source2: https://hackage.haskell.org/package/%{unicodetransforms}/%{unicodetransforms}.tar.gz +Source3: https://hackage.haskell.org/package/%{bitarray}/%{bitarray}.tar.gz +Source4: https://hackage.haskell.org/package/%{pkgver}/%{name}.cabal#/%{pkgver}.cabal # End cabal-rpm sources # Begin cabal-rpm deps: @@ -26,9 +36,11 @@ BuildRequires: ghc-doc %if %{with ghc_prof} BuildRequires: ghc-prof %endif -BuildRequires: ghc-rpm-macros +BuildRequires: ghc-rpm-macros-extra +BuildRequires: chrpath BuildRequires: ghc-Glob-devel BuildRequires: ghc-HTTP-devel +#BuildRequires: ghc-HsYAML-devel BuildRequires: ghc-JuicyPixels-devel BuildRequires: ghc-SHA-devel BuildRequires: ghc-aeson-devel @@ -61,7 +73,6 @@ BuildRequires: ghc-parsec-devel BuildRequires: ghc-process-devel BuildRequires: ghc-random-devel BuildRequires: ghc-safe-devel -BuildRequires: ghc-scientific-devel BuildRequires: ghc-skylighting-devel BuildRequires: ghc-split-devel BuildRequires: ghc-syb-devel @@ -70,11 +81,11 @@ BuildRequires: ghc-temporary-devel BuildRequires: ghc-texmath-devel BuildRequires: ghc-text-devel BuildRequires: ghc-time-devel +#BuildRequires: ghc-unicode-transforms-devel BuildRequires: ghc-unix-devel BuildRequires: ghc-unordered-containers-devel BuildRequires: ghc-vector-devel BuildRequires: ghc-xml-devel -BuildRequires: ghc-yaml-devel BuildRequires: ghc-zip-archive-devel BuildRequires: ghc-zlib-devel %if %{with tests} @@ -97,12 +108,13 @@ and a command-line tool that uses this library. It can read several dialects of Markdown and (subsets of) HTML, reStructuredText, LaTeX, DocBook, JATS, MediaWiki markup, TWiki markup, TikiWiki markup, Creole 1.0, Haddock markup, OPML, Emacs Org-Mode, Emacs Muse, txt2tags, Vimwiki, Word Docx, ODT, EPUB, -FictionBook2, and Textile, and it can write Markdown, reStructuredText, XHTML, -HTML 5, LaTeX, ConTeXt, DocBook, JATS, OPML, TEI, OpenDocument, ODT, Word docx, -RTF, MediaWiki, DokuWiki, ZimWiki, Textile, groff man, groff ms, plain text, -Emacs Org-Mode, AsciiDoc, Haddock markup, EPUB (v2 and v3), FictionBook2, -InDesign ICML, Muse, LaTeX beamer slides, PowerPoint, and several kinds of -HTML/JavaScript slide shows (S5, Slidy, Slideous, DZSlides, reveal.js). +FictionBook2, roff man, and Textile, and it can write Markdown, +reStructuredText, XHTML, HTML 5, LaTeX, ConTeXt, DocBook, JATS, OPML, TEI, +OpenDocument, ODT, Word docx, PowerPoint pptx, RTF, MediaWiki, DokuWiki, +ZimWiki, Textile, roff man, roff ms, plain text, Emacs Org-Mode, AsciiDoc, +Haddock markup, EPUB (v2 and v3), FictionBook2, InDesign ICML, Muse, LaTeX +beamer slides, and several kinds of HTML/JavaScript slide shows (S5, Slidy, +Slideous, DZSlides, reveal.js). In contrast to most existing tools for converting Markdown to HTML, pandoc has a modular design: it consists of a set of readers, which parse text in a given @@ -178,22 +190,36 @@ This package provides the Haskell %{name} profiling library. %endif +%global main_version %{version} + +%if %{defined ghclibdir} +%ghc_lib_subpackage %{HsYAML} +%ghc_lib_subpackage %{unicodetransforms} +%ghc_lib_subpackage %{bitarray} +%endif + +%global version %{main_version} + + %prep # Begin cabal-rpm setup: -%setup -q -cp -bp %{SOURCE1} %{name}.cabal +%setup -q -a1 -a2 -a3 +cp -bp %{SOURCE4} %{name}.cabal # End cabal-rpm setup %build # Begin cabal-rpm build: +%ghc_libs_build %{subpkgs} %ghc_lib_build # End cabal-rpm build %install # Begin cabal-rpm install +%ghc_libs_install %{subpkgs} %ghc_lib_install +%ghc_fix_rpath %{pkgver} mv %{buildroot}%{_ghcdocdir}{,-common} # End cabal-rpm install @@ -243,6 +269,10 @@ install -m 0644 -p -D man/pandoc.1 %{buildroot}%{_mandir}/man1/pandoc.1 %changelog +* Fri Jul 26 2019 Jens Petersen - 2.5-1 +- update to 2.5 +- subpackage HsYAML, unicode-transforms, bitarray + * Fri Jul 26 2019 Fedora Release Engineering - 2.2.1-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild diff --git a/sources b/sources index 77745e1..9fc6bb5 100644 --- a/sources +++ b/sources @@ -1 +1,4 @@ -SHA512 (pandoc-2.2.1.tar.gz) = 84af51e180bcf8f0c11e67d8031d11a4b60c6061736a48c21e64bc30d0018a0161e3993167111584e384eced18632841b70027fdf29ed9e46427425096bb56b1 +SHA512 (unicode-transforms-0.3.6.tar.gz) = f9dfa47447766194d4d2d5c363bdddbd91443c44be985a46918298c2b32e8706656ee2bbfcb61063f6c0a23af3ff4309a5288aae1feb956efef79469f88c5b4b +SHA512 (HsYAML-0.1.2.0.tar.gz) = 540123f547e4f76241a1282f87f45b0af282076a6edcd73c52a5362b5f5bcc50b92fef0c6a611ebdca25f8b5e9a9825911d42d2b9be75e9bbea214a3718dd9c3 +SHA512 (pandoc-2.5.tar.gz) = 40a47680437288253888c6b943192bfcfa402d4bf797962aaa15b8fc43d0ab1887f717c724f71c901c97dcb9bb42322bbb54fdbd9906f0da1187e95b50cfca92 +SHA512 (bitarray-0.0.1.1.tar.gz) = 4b51ef2be989949e4ab8b9cab194c2bb5f3895abf9881ddf6009dd234c2c7d01edf01dc4ae96312a36f0b3d43f1b2b975eeaa738f66ccc2ab9a1a10e07582602 From fd5021fd016dc8431237659d1091923355152b03 Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Mon, 5 Aug 2019 18:33:26 +0800 Subject: [PATCH 141/165] BR prof for lib and static for executable --- pandoc.spec | 110 +++++++++++++++++++++++++--------------------------- 1 file changed, 53 insertions(+), 57 deletions(-) diff --git a/pandoc.spec b/pandoc.spec index eb7ae43..8df2660 100644 --- a/pandoc.spec +++ b/pandoc.spec @@ -1,4 +1,4 @@ -# generated by cabal-rpm-1.0.0 --subpackage +# generated by cabal-rpm-1.0.1 --subpackage # https://fedoraproject.org/wiki/Packaging:Haskell %global pkg_name pandoc @@ -30,64 +30,59 @@ Source4: https://hackage.haskell.org/package/%{pkgver}/%{name}.cabal#/%{p # Begin cabal-rpm deps: BuildRequires: ghc-Cabal-devel -%if %{with haddock} -BuildRequires: ghc-doc -%endif -%if %{with ghc_prof} -BuildRequires: ghc-prof -%endif BuildRequires: ghc-rpm-macros-extra +BuildRequires: ghc-Glob-prof +BuildRequires: ghc-HTTP-prof +#BuildRequires: ghc-HsYAML-prof +BuildRequires: ghc-JuicyPixels-prof +BuildRequires: ghc-SHA-prof +BuildRequires: ghc-aeson-prof +BuildRequires: ghc-aeson-pretty-prof +BuildRequires: ghc-base-prof +BuildRequires: ghc-base64-bytestring-prof +BuildRequires: ghc-binary-prof +BuildRequires: ghc-blaze-html-prof +BuildRequires: ghc-blaze-markup-prof +BuildRequires: ghc-bytestring-prof +BuildRequires: ghc-case-insensitive-prof +BuildRequires: ghc-cmark-gfm-prof +BuildRequires: ghc-containers-prof +BuildRequires: ghc-data-default-prof +BuildRequires: ghc-deepseq-prof +BuildRequires: ghc-directory-prof +BuildRequires: ghc-doctemplates-prof +BuildRequires: ghc-exceptions-prof +BuildRequires: ghc-filepath-prof +BuildRequires: ghc-haddock-library-prof +BuildRequires: ghc-hslua-prof +BuildRequires: ghc-hslua-module-text-prof +BuildRequires: ghc-http-client-prof +BuildRequires: ghc-http-client-tls-prof +BuildRequires: ghc-http-types-prof +BuildRequires: ghc-mtl-prof +BuildRequires: ghc-network-prof +BuildRequires: ghc-network-uri-prof +BuildRequires: ghc-pandoc-types-prof +BuildRequires: ghc-parsec-prof +BuildRequires: ghc-process-prof +BuildRequires: ghc-random-prof +BuildRequires: ghc-safe-prof +BuildRequires: ghc-skylighting-prof +BuildRequires: ghc-split-prof +BuildRequires: ghc-syb-prof +BuildRequires: ghc-tagsoup-prof +BuildRequires: ghc-temporary-prof +BuildRequires: ghc-texmath-prof +BuildRequires: ghc-text-prof +BuildRequires: ghc-time-prof +#BuildRequires: ghc-unicode-transforms-prof +BuildRequires: ghc-unix-prof +BuildRequires: ghc-unordered-containers-prof +BuildRequires: ghc-vector-prof +BuildRequires: ghc-xml-prof +BuildRequires: ghc-zip-archive-prof +BuildRequires: ghc-zlib-prof BuildRequires: chrpath -BuildRequires: ghc-Glob-devel -BuildRequires: ghc-HTTP-devel -#BuildRequires: ghc-HsYAML-devel -BuildRequires: ghc-JuicyPixels-devel -BuildRequires: ghc-SHA-devel -BuildRequires: ghc-aeson-devel -BuildRequires: ghc-aeson-pretty-devel -BuildRequires: ghc-base64-bytestring-devel -BuildRequires: ghc-binary-devel -BuildRequires: ghc-blaze-html-devel -BuildRequires: ghc-blaze-markup-devel -BuildRequires: ghc-bytestring-devel -BuildRequires: ghc-case-insensitive-devel -BuildRequires: ghc-cmark-gfm-devel -BuildRequires: ghc-containers-devel -BuildRequires: ghc-data-default-devel -BuildRequires: ghc-deepseq-devel -BuildRequires: ghc-directory-devel -BuildRequires: ghc-doctemplates-devel -BuildRequires: ghc-exceptions-devel -BuildRequires: ghc-filepath-devel -BuildRequires: ghc-haddock-library-devel -BuildRequires: ghc-hslua-devel -BuildRequires: ghc-hslua-module-text-devel -BuildRequires: ghc-http-client-devel -BuildRequires: ghc-http-client-tls-devel -BuildRequires: ghc-http-types-devel -BuildRequires: ghc-mtl-devel -BuildRequires: ghc-network-devel -BuildRequires: ghc-network-uri-devel -BuildRequires: ghc-pandoc-types-devel -BuildRequires: ghc-parsec-devel -BuildRequires: ghc-process-devel -BuildRequires: ghc-random-devel -BuildRequires: ghc-safe-devel -BuildRequires: ghc-skylighting-devel -BuildRequires: ghc-split-devel -BuildRequires: ghc-syb-devel -BuildRequires: ghc-tagsoup-devel -BuildRequires: ghc-temporary-devel -BuildRequires: ghc-texmath-devel -BuildRequires: ghc-text-devel -BuildRequires: ghc-time-devel -#BuildRequires: ghc-unicode-transforms-devel -BuildRequires: ghc-unix-devel -BuildRequires: ghc-unordered-containers-devel -BuildRequires: ghc-vector-devel -BuildRequires: ghc-xml-devel -BuildRequires: ghc-zip-archive-devel -BuildRequires: ghc-zlib-devel %if %{with tests} BuildRequires: ghc-Diff-devel BuildRequires: ghc-QuickCheck-devel @@ -147,6 +142,7 @@ This package provides the Haskell %{name} shared library. %package -n ghc-%{name}-devel Summary: Haskell %{name} library development files Provides: ghc-%{name}-static = %{version}-%{release} +Provides: ghc-%{name}-static%{?_isa} = %{version}-%{release} %if %{defined ghc_version} Requires: ghc-compiler = %{ghc_version} %endif From 1d1603615396f8216da0d54e6ee6292e65d24834 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 29 Jan 2020 20:50:03 +0000 Subject: [PATCH 142/165] - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- pandoc.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pandoc.spec b/pandoc.spec index 8df2660..7037433 100644 --- a/pandoc.spec +++ b/pandoc.spec @@ -15,7 +15,7 @@ Name: %{pkg_name} Version: 2.5 # can only be reset when all subpkgs bumped -Release: 1%{?dist} +Release: 2%{?dist} Summary: Conversion between markup formats License: GPLv2+ @@ -265,6 +265,9 @@ install -m 0644 -p -D man/pandoc.1 %{buildroot}%{_mandir}/man1/pandoc.1 %changelog +* Wed Jan 29 2020 Fedora Release Engineering - 2.5-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild + * Fri Jul 26 2019 Jens Petersen - 2.5-1 - update to 2.5 - subpackage HsYAML, unicode-transforms, bitarray From ee99a4d9eab96c52b9c6bd11a2b83bd637079ab8 Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Fri, 7 Feb 2020 00:30:15 +0800 Subject: [PATCH 143/165] refresh to cabal-rpm-2.0.2 --- pandoc.spec | 31 ++++++++++++++----------------- 1 file changed, 14 insertions(+), 17 deletions(-) diff --git a/pandoc.spec b/pandoc.spec index 7037433..9839007 100644 --- a/pandoc.spec +++ b/pandoc.spec @@ -1,4 +1,4 @@ -# generated by cabal-rpm-1.0.1 --subpackage +# generated by cabal-rpm-2.0.2 --subpackage # https://fedoraproject.org/wiki/Packaging:Haskell %global pkg_name pandoc @@ -10,8 +10,6 @@ %global bitarray bitarray-0.0.1.1 %global subpkgs %{HsYAML} %{bitarray} %{unicodetransforms} -%bcond_with tests - Name: %{pkg_name} Version: 2.5 # can only be reset when all subpkgs bumped @@ -82,20 +80,10 @@ BuildRequires: ghc-vector-prof BuildRequires: ghc-xml-prof BuildRequires: ghc-zip-archive-prof BuildRequires: ghc-zlib-prof -BuildRequires: chrpath -%if %{with tests} -BuildRequires: ghc-Diff-devel -BuildRequires: ghc-QuickCheck-devel -BuildRequires: ghc-executable-path-devel -BuildRequires: ghc-tasty-devel -BuildRequires: ghc-tasty-golden-devel -BuildRequires: ghc-tasty-hunit-devel -BuildRequires: ghc-tasty-quickcheck-devel -%endif Requires: %{name}-common = %{version}-%{release} +# for missing dep 'bitarray': +BuildRequires: ghc-array-prof # End cabal-rpm deps -# added for F26 -Obsoletes: pandoc-static < %{version}-%{release} %description Pandoc is a Haskell library for converting from one markup format to another, @@ -170,6 +158,7 @@ or texlive-collection-luatex respectively. %if %{with haddock} %package -n ghc-%{name}-doc Summary: Haskell %{name} library documentation +BuildArch: noarch %description -n ghc-%{name}-doc This package provides the Haskell %{name} library documentation. @@ -180,6 +169,7 @@ This package provides the Haskell %{name} library documentation. %package -n ghc-%{name}-prof Summary: Haskell %{name} profiling library Requires: ghc-%{name}-devel%{?_isa} = %{version}-%{release} +Supplements: (ghc-%{name}-devel and ghc-prof) %description -n ghc-%{name}-prof This package provides the Haskell %{name} profiling library. @@ -226,8 +216,14 @@ ln -s pandoc %{buildroot}%{_bindir}/hsmarkdown install -m 0644 -p -D man/pandoc.1 %{buildroot}%{_mandir}/man1/pandoc.1 -%check -%cabal_test +%if 0%{?fedora} < 31 || 0%{?rhel} < 8 +%post -n ghc-%{name}-devel +%ghc_pkg_recache + + +%postun -n ghc-%{name}-devel +%ghc_pkg_recache +%endif %files @@ -256,6 +252,7 @@ install -m 0644 -p -D man/pandoc.1 %{buildroot}%{_mandir}/man1/pandoc.1 %if %{with haddock} %files -n ghc-%{name}-doc -f ghc-%{name}-doc.files +%license COPYING.md %endif From fc50f10dd120967a2e5d01133c20bceb0404eef4 Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Fri, 14 Feb 2020 23:36:43 +0800 Subject: [PATCH 144/165] update to pandoc-2.7.3 --- .gitignore | 3 +++ pandoc.spec | 39 +++++++++++++++++++++++++-------------- sources | 4 +++- 3 files changed, 31 insertions(+), 15 deletions(-) diff --git a/.gitignore b/.gitignore index e54e4f0..b3273b7 100644 --- a/.gitignore +++ b/.gitignore @@ -28,3 +28,6 @@ /unicode-transforms-0.3.6.tar.gz /HsYAML-0.1.2.0.tar.gz /bitarray-0.0.1.1.tar.gz +/hslua-module-system-0.2.1.tar.gz +/ipynb-0.1.tar.gz +/pandoc-2.7.3.tar.gz diff --git a/pandoc.spec b/pandoc.spec index 9839007..c553f3d 100644 --- a/pandoc.spec +++ b/pandoc.spec @@ -8,10 +8,12 @@ %global unicodetransforms unicode-transforms-0.3.6 # needed by unicode-transforms %global bitarray bitarray-0.0.1.1 -%global subpkgs %{HsYAML} %{bitarray} %{unicodetransforms} +%global hsluamodulesystem hslua-module-system-0.2.1 +%global ipynb ipynb-0.1 +%global subpkgs %{HsYAML} %{bitarray} %{unicodetransforms} %{hsluamodulesystem} %{ipynb} Name: %{pkg_name} -Version: 2.5 +Version: 2.7.3 # can only be reset when all subpkgs bumped Release: 2%{?dist} Summary: Conversion between markup formats @@ -23,7 +25,8 @@ Source0: https://hackage.haskell.org/package/%{pkgver}/%{pkgver}.tar.gz Source1: https://hackage.haskell.org/package/%{HsYAML}/%{HsYAML}.tar.gz Source2: https://hackage.haskell.org/package/%{unicodetransforms}/%{unicodetransforms}.tar.gz Source3: https://hackage.haskell.org/package/%{bitarray}/%{bitarray}.tar.gz -Source4: https://hackage.haskell.org/package/%{pkgver}/%{name}.cabal#/%{pkgver}.cabal +Source4: https://hackage.haskell.org/package/%{hsluamodulesystem}/%{hsluamodulesystem}.tar.gz +Source5: https://hackage.haskell.org/package/%{ipynb}/%{ipynb}.tar.gz # End cabal-rpm sources # Begin cabal-rpm deps: @@ -36,6 +39,7 @@ BuildRequires: ghc-JuicyPixels-prof BuildRequires: ghc-SHA-prof BuildRequires: ghc-aeson-prof BuildRequires: ghc-aeson-pretty-prof +BuildRequires: ghc-attoparsec-prof BuildRequires: ghc-base-prof BuildRequires: ghc-base64-bytestring-prof BuildRequires: ghc-binary-prof @@ -53,10 +57,12 @@ BuildRequires: ghc-exceptions-prof BuildRequires: ghc-filepath-prof BuildRequires: ghc-haddock-library-prof BuildRequires: ghc-hslua-prof +#BuildRequires: ghc-hslua-module-system-prof BuildRequires: ghc-hslua-module-text-prof BuildRequires: ghc-http-client-prof BuildRequires: ghc-http-client-tls-prof BuildRequires: ghc-http-types-prof +#BuildRequires: ghc-ipynb-prof BuildRequires: ghc-mtl-prof BuildRequires: ghc-network-prof BuildRequires: ghc-network-uri-prof @@ -65,6 +71,7 @@ BuildRequires: ghc-parsec-prof BuildRequires: ghc-process-prof BuildRequires: ghc-random-prof BuildRequires: ghc-safe-prof +BuildRequires: ghc-scientific-prof BuildRequires: ghc-skylighting-prof BuildRequires: ghc-split-prof BuildRequires: ghc-syb-prof @@ -89,15 +96,15 @@ BuildRequires: ghc-array-prof Pandoc is a Haskell library for converting from one markup format to another, and a command-line tool that uses this library. It can read several dialects of Markdown and (subsets of) HTML, reStructuredText, LaTeX, DocBook, JATS, -MediaWiki markup, TWiki markup, TikiWiki markup, Creole 1.0, Haddock markup, -OPML, Emacs Org-Mode, Emacs Muse, txt2tags, Vimwiki, Word Docx, ODT, EPUB, -FictionBook2, roff man, and Textile, and it can write Markdown, -reStructuredText, XHTML, HTML 5, LaTeX, ConTeXt, DocBook, JATS, OPML, TEI, -OpenDocument, ODT, Word docx, PowerPoint pptx, RTF, MediaWiki, DokuWiki, -ZimWiki, Textile, roff man, roff ms, plain text, Emacs Org-Mode, AsciiDoc, -Haddock markup, EPUB (v2 and v3), FictionBook2, InDesign ICML, Muse, LaTeX -beamer slides, and several kinds of HTML/JavaScript slide shows (S5, Slidy, -Slideous, DZSlides, reveal.js). +MediaWiki markup, DokuWiki markup, TWiki markup, TikiWiki markup, Creole 1.0, +Haddock markup, OPML, Emacs Org-Mode, Emacs Muse, txt2tags, ipynb (Jupyter +notebooks), Vimwiki, Word Docx, ODT, EPUB, FictionBook2, roff man, and Textile, +and it can write Markdown, reStructuredText, XHTML, HTML 5, LaTeX, ConTeXt, +DocBook, JATS, OPML, TEI, OpenDocument, ODT, Word docx, PowerPoint pptx, RTF, +MediaWiki, DokuWiki, XWiki, ZimWiki, Textile, Jira, roff man, roff ms, plain +text, Emacs Org-Mode, AsciiDoc, Haddock markup, EPUB (v2 and v3), ipynb, +FictionBook2, InDesign ICML, Muse, LaTeX beamer slides, and several kinds of +HTML/JavaScript slide shows (S5, Slidy, Slideous, DZSlides, reveal.js). In contrast to most existing tools for converting Markdown to HTML, pandoc has a modular design: it consists of a set of readers, which parse text in a given @@ -182,6 +189,8 @@ This package provides the Haskell %{name} profiling library. %ghc_lib_subpackage %{HsYAML} %ghc_lib_subpackage %{unicodetransforms} %ghc_lib_subpackage %{bitarray} +%ghc_lib_subpackage %{hsluamodulesystem} +%ghc_lib_subpackage %{ipynb} %endif %global version %{main_version} @@ -189,8 +198,7 @@ This package provides the Haskell %{name} profiling library. %prep # Begin cabal-rpm setup: -%setup -q -a1 -a2 -a3 -cp -bp %{SOURCE4} %{name}.cabal +%setup -q -a1 -a2 -a3 -a4 -a5 # End cabal-rpm setup @@ -262,6 +270,9 @@ install -m 0644 -p -D man/pandoc.1 %{buildroot}%{_mandir}/man1/pandoc.1 %changelog +* Fri Feb 14 2020 Jens Petersen - 2.7.3-2 +- https://pandoc.org/releases.html#pandoc-2.7.3-2019-06-11 + * Wed Jan 29 2020 Fedora Release Engineering - 2.5-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild diff --git a/sources b/sources index 9fc6bb5..edd797a 100644 --- a/sources +++ b/sources @@ -1,4 +1,6 @@ SHA512 (unicode-transforms-0.3.6.tar.gz) = f9dfa47447766194d4d2d5c363bdddbd91443c44be985a46918298c2b32e8706656ee2bbfcb61063f6c0a23af3ff4309a5288aae1feb956efef79469f88c5b4b SHA512 (HsYAML-0.1.2.0.tar.gz) = 540123f547e4f76241a1282f87f45b0af282076a6edcd73c52a5362b5f5bcc50b92fef0c6a611ebdca25f8b5e9a9825911d42d2b9be75e9bbea214a3718dd9c3 -SHA512 (pandoc-2.5.tar.gz) = 40a47680437288253888c6b943192bfcfa402d4bf797962aaa15b8fc43d0ab1887f717c724f71c901c97dcb9bb42322bbb54fdbd9906f0da1187e95b50cfca92 SHA512 (bitarray-0.0.1.1.tar.gz) = 4b51ef2be989949e4ab8b9cab194c2bb5f3895abf9881ddf6009dd234c2c7d01edf01dc4ae96312a36f0b3d43f1b2b975eeaa738f66ccc2ab9a1a10e07582602 +SHA512 (hslua-module-system-0.2.1.tar.gz) = 296d2ee41760d8ee6025562c408f16e78468a9ca53910982fd346a9cf7b8c6df3340fd2d0a7f6ff5fc41c98f0724a733f0ed8bd64cdd18acfb65aa044cd4a99b +SHA512 (ipynb-0.1.tar.gz) = 8717dac6496905afc5e8735abc3b3a4a90b171253b035efa0751a6311b901caad563fdfeaa455987c1307d0532273ab80be37256562143db575f13c326843bf4 +SHA512 (pandoc-2.7.3.tar.gz) = 7db610ed1f5bad7ae91b9c89b210500c0e2f8660982cf424080ea8a603ca1891187bbf6e4a48144b48716fd0131d204e953175a82668be44c39898041bac9740 From 644fc416781f504bedab66b3a77fc8be81991ea5 Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Sun, 23 Feb 2020 07:19:32 +0800 Subject: [PATCH 145/165] bump release --- pandoc.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pandoc.spec b/pandoc.spec index c553f3d..c300c9e 100644 --- a/pandoc.spec +++ b/pandoc.spec @@ -15,7 +15,7 @@ Name: %{pkg_name} Version: 2.7.3 # can only be reset when all subpkgs bumped -Release: 2%{?dist} +Release: 3%{?dist} Summary: Conversion between markup formats License: GPLv2+ @@ -270,7 +270,7 @@ install -m 0644 -p -D man/pandoc.1 %{buildroot}%{_mandir}/man1/pandoc.1 %changelog -* Fri Feb 14 2020 Jens Petersen - 2.7.3-2 +* Sun Feb 23 2020 Jens Petersen - 2.7.3-3 - https://pandoc.org/releases.html#pandoc-2.7.3-2019-06-11 * Wed Jan 29 2020 Fedora Release Engineering - 2.5-2 From ade153ea0b6aa163eebab940a694a60d98e48544 Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Thu, 4 Jun 2020 19:29:25 +0800 Subject: [PATCH 146/165] refresh to cabal-rpm-2.0.5 --- pandoc.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pandoc.spec b/pandoc.spec index c300c9e..33fa497 100644 --- a/pandoc.spec +++ b/pandoc.spec @@ -1,5 +1,5 @@ -# generated by cabal-rpm-2.0.2 --subpackage -# https://fedoraproject.org/wiki/Packaging:Haskell +# generated by cabal-rpm-2.0.5 --subpackage +# https://docs.fedoraproject.org/en-US/packaging-guidelines/Haskell/ %global pkg_name pandoc %global pkgver %{pkg_name}-%{version} From 140700a3ba60d7e77720e2988d8c87954ac225e6 Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Wed, 10 Jun 2020 14:41:49 +0800 Subject: [PATCH 147/165] update to 2.9.1.1 with additional deps --- .gitignore | 7 +++++++ pandoc.spec | 57 ++++++++++++++++++++++++++++++++++++++--------------- sources | 10 +++++++--- 3 files changed, 55 insertions(+), 19 deletions(-) diff --git a/.gitignore b/.gitignore index b3273b7..13abf10 100644 --- a/.gitignore +++ b/.gitignore @@ -31,3 +31,10 @@ /hslua-module-system-0.2.1.tar.gz /ipynb-0.1.tar.gz /pandoc-2.7.3.tar.gz +/HsYAML-0.2.1.0.tar.gz +/doclayout-0.2.0.1.tar.gz +/emojis-0.1.tar.gz +/ipynb-0.1.0.1.tar.gz +/jira-wiki-markup-1.0.0.tar.gz +/pandoc-2.9.1.1.tar.gz +/text-conversions-0.3.0.tar.gz diff --git a/pandoc.spec b/pandoc.spec index 33fa497..4dd5b9a 100644 --- a/pandoc.spec +++ b/pandoc.spec @@ -4,18 +4,22 @@ %global pkg_name pandoc %global pkgver %{pkg_name}-%{version} -%global HsYAML HsYAML-0.1.2.0 +%global HsYAML HsYAML-0.2.1.0 %global unicodetransforms unicode-transforms-0.3.6 # needed by unicode-transforms %global bitarray bitarray-0.0.1.1 +%global doclayout doclayout-0.2.0.1 +%global emojis emojis-0.1 %global hsluamodulesystem hslua-module-system-0.2.1 -%global ipynb ipynb-0.1 -%global subpkgs %{HsYAML} %{bitarray} %{unicodetransforms} %{hsluamodulesystem} %{ipynb} +%global ipynb ipynb-0.1.0.1 +%global jirawikimarkup jira-wiki-markup-1.0.0 +%global textconversions text-conversions-0.3.0 +%global subpkgs %{HsYAML} %{bitarray} %{unicodetransforms} %{hsluamodulesystem} %{ipynb} %{doclayout} %{emojis} %{jirawikimarkup} %{textconversions} Name: %{pkg_name} -Version: 2.7.3 +Version: 2.9.1.1 # can only be reset when all subpkgs bumped -Release: 3%{?dist} +Release: 4%{?dist} Summary: Conversion between markup formats License: GPLv2+ @@ -27,6 +31,10 @@ Source2: https://hackage.haskell.org/package/%{unicodetransforms}/%{unico Source3: https://hackage.haskell.org/package/%{bitarray}/%{bitarray}.tar.gz Source4: https://hackage.haskell.org/package/%{hsluamodulesystem}/%{hsluamodulesystem}.tar.gz Source5: https://hackage.haskell.org/package/%{ipynb}/%{ipynb}.tar.gz +Source6: https://hackage.haskell.org/package/%{doclayout}/%{doclayout}.tar.gz +Source7: https://hackage.haskell.org/package/%{emojis}/%{emojis}.tar.gz +Source8: https://hackage.haskell.org/package/%{jirawikimarkup}/%{jirawikimarkup}.tar.gz +Source9: https://hackage.haskell.org/package/%{textconversions}/%{textconversions}.tar.gz # End cabal-rpm sources # Begin cabal-rpm deps: @@ -52,7 +60,9 @@ BuildRequires: ghc-containers-prof BuildRequires: ghc-data-default-prof BuildRequires: ghc-deepseq-prof BuildRequires: ghc-directory-prof +#BuildRequires: ghc-doclayout-prof BuildRequires: ghc-doctemplates-prof +#BuildRequires: ghc-emojis-prof BuildRequires: ghc-exceptions-prof BuildRequires: ghc-filepath-prof BuildRequires: ghc-haddock-library-prof @@ -63,6 +73,7 @@ BuildRequires: ghc-http-client-prof BuildRequires: ghc-http-client-tls-prof BuildRequires: ghc-http-types-prof #BuildRequires: ghc-ipynb-prof +#BuildRequires: ghc-jira-wiki-markup-prof BuildRequires: ghc-mtl-prof BuildRequires: ghc-network-prof BuildRequires: ghc-network-uri-prof @@ -73,12 +84,14 @@ BuildRequires: ghc-random-prof BuildRequires: ghc-safe-prof BuildRequires: ghc-scientific-prof BuildRequires: ghc-skylighting-prof +BuildRequires: ghc-skylighting-core-prof BuildRequires: ghc-split-prof BuildRequires: ghc-syb-prof BuildRequires: ghc-tagsoup-prof BuildRequires: ghc-temporary-prof BuildRequires: ghc-texmath-prof BuildRequires: ghc-text-prof +#BuildRequires: ghc-text-conversions-prof BuildRequires: ghc-time-prof #BuildRequires: ghc-unicode-transforms-prof BuildRequires: ghc-unix-prof @@ -90,21 +103,25 @@ BuildRequires: ghc-zlib-prof Requires: %{name}-common = %{version}-%{release} # for missing dep 'bitarray': BuildRequires: ghc-array-prof +# for missing dep 'text-conversions': +BuildRequires: ghc-base16-bytestring-prof +BuildRequires: ghc-errors-prof # End cabal-rpm deps %description Pandoc is a Haskell library for converting from one markup format to another, and a command-line tool that uses this library. It can read several dialects of Markdown and (subsets of) HTML, reStructuredText, LaTeX, DocBook, JATS, -MediaWiki markup, DokuWiki markup, TWiki markup, TikiWiki markup, Creole 1.0, -Haddock markup, OPML, Emacs Org-Mode, Emacs Muse, txt2tags, ipynb (Jupyter -notebooks), Vimwiki, Word Docx, ODT, EPUB, FictionBook2, roff man, and Textile, -and it can write Markdown, reStructuredText, XHTML, HTML 5, LaTeX, ConTeXt, -DocBook, JATS, OPML, TEI, OpenDocument, ODT, Word docx, PowerPoint pptx, RTF, -MediaWiki, DokuWiki, XWiki, ZimWiki, Textile, Jira, roff man, roff ms, plain -text, Emacs Org-Mode, AsciiDoc, Haddock markup, EPUB (v2 and v3), ipynb, -FictionBook2, InDesign ICML, Muse, LaTeX beamer slides, and several kinds of -HTML/JavaScript slide shows (S5, Slidy, Slideous, DZSlides, reveal.js). +MediaWiki markup, DokuWiki markup, TWiki markup, TikiWiki markup, Jira markup, +Creole 1.0, Haddock markup, OPML, Emacs Org-Mode, Emacs Muse, txt2tags, ipynb +(Jupyter notebooks), Vimwiki, Word Docx, ODT, EPUB, FictionBook2, roff man, and +Textile, and it can write Markdown, reStructuredText, XHTML, HTML 5, LaTeX, +ConTeXt, DocBook, JATS, OPML, TEI, OpenDocument, ODT, Word docx, PowerPoint +pptx, RTF, MediaWiki, DokuWiki, XWiki, ZimWiki, Textile, Jira, roff man, roff +ms, plain text, Emacs Org-Mode, AsciiDoc, Haddock markup, EPUB (v2 and v3), +ipynb, FictionBook2, InDesign ICML, Muse, LaTeX beamer slides, and several +kinds of HTML/JavaScript slide shows (S5, Slidy, Slideous, DZSlides, +reveal.js). In contrast to most existing tools for converting Markdown to HTML, pandoc has a modular design: it consists of a set of readers, which parse text in a given @@ -191,6 +208,10 @@ This package provides the Haskell %{name} profiling library. %ghc_lib_subpackage %{bitarray} %ghc_lib_subpackage %{hsluamodulesystem} %ghc_lib_subpackage %{ipynb} +%ghc_lib_subpackage %{doclayout} +%ghc_lib_subpackage %{emojis} +%ghc_lib_subpackage %{jirawikimarkup} +%ghc_lib_subpackage %{textconversions} %endif %global version %{main_version} @@ -198,7 +219,7 @@ This package provides the Haskell %{name} profiling library. %prep # Begin cabal-rpm setup: -%setup -q -a1 -a2 -a3 -a4 -a5 +%setup -q -a1 -a2 -a3 -a4 -a5 -a6 -a7 -a8 -a9 # End cabal-rpm setup @@ -245,7 +266,7 @@ install -m 0644 -p -D man/pandoc.1 %{buildroot}%{_mandir}/man1/pandoc.1 %files common # Begin cabal-rpm files: %license COPYING.md -%doc AUTHORS.md BUGS CONTRIBUTING.md README.md changelog +%doc AUTHORS.md BUGS CONTRIBUTING.md README.md changelog.md %{_datadir}/%{pkgver} # End cabal-rpm files @@ -270,6 +291,10 @@ install -m 0644 -p -D man/pandoc.1 %{buildroot}%{_mandir}/man1/pandoc.1 %changelog +* Wed Jun 10 2020 Jens Petersen - 2.9.1.1-4 +- https://pandoc.org/releases.html#pandoc-2.9.1.1-2020-01-05 +- new deps: doclayout, emojis, jira-wiki-markup, text-conversions + * Sun Feb 23 2020 Jens Petersen - 2.7.3-3 - https://pandoc.org/releases.html#pandoc-2.7.3-2019-06-11 diff --git a/sources b/sources index edd797a..61d3ea4 100644 --- a/sources +++ b/sources @@ -1,6 +1,10 @@ SHA512 (unicode-transforms-0.3.6.tar.gz) = f9dfa47447766194d4d2d5c363bdddbd91443c44be985a46918298c2b32e8706656ee2bbfcb61063f6c0a23af3ff4309a5288aae1feb956efef79469f88c5b4b -SHA512 (HsYAML-0.1.2.0.tar.gz) = 540123f547e4f76241a1282f87f45b0af282076a6edcd73c52a5362b5f5bcc50b92fef0c6a611ebdca25f8b5e9a9825911d42d2b9be75e9bbea214a3718dd9c3 +SHA512 (HsYAML-0.2.1.0.tar.gz) = f8ad41a99e48183835093ad8bf6a3fbdf4b9ad9df3bea46b12efd55a9555c22bd2595c72b1ac2e73379ab47e21f6cbf9022412db8971e1c7c02a32e824f53304 SHA512 (bitarray-0.0.1.1.tar.gz) = 4b51ef2be989949e4ab8b9cab194c2bb5f3895abf9881ddf6009dd234c2c7d01edf01dc4ae96312a36f0b3d43f1b2b975eeaa738f66ccc2ab9a1a10e07582602 +SHA512 (doclayout-0.2.0.1.tar.gz) = 1a5f847106762a6808c5dd1512a30a3d9cac0c0b4d5f0a9c35c5eb9c6326fe49117c0f317f5b7ff63363c3fbc2c3a9689194aa74e5f21b16045614909d439d9e +SHA512 (emojis-0.1.tar.gz) = 587c67bff3f77c362b16c93889762a9aad6fb5250c0bced45f5053f59dd6a11ab2886e53f286bbc4de2b8793be133708b1f9c5d4d52bcef1820f5a7c1ecfa7d2 SHA512 (hslua-module-system-0.2.1.tar.gz) = 296d2ee41760d8ee6025562c408f16e78468a9ca53910982fd346a9cf7b8c6df3340fd2d0a7f6ff5fc41c98f0724a733f0ed8bd64cdd18acfb65aa044cd4a99b -SHA512 (ipynb-0.1.tar.gz) = 8717dac6496905afc5e8735abc3b3a4a90b171253b035efa0751a6311b901caad563fdfeaa455987c1307d0532273ab80be37256562143db575f13c326843bf4 -SHA512 (pandoc-2.7.3.tar.gz) = 7db610ed1f5bad7ae91b9c89b210500c0e2f8660982cf424080ea8a603ca1891187bbf6e4a48144b48716fd0131d204e953175a82668be44c39898041bac9740 +SHA512 (ipynb-0.1.0.1.tar.gz) = b1e547ac9353c84619832c723586146d2fd72c85c75d11b9ff99c16852ae2dfd1a2d61382ab9cc54bc9ad2bf8e1c3c0a8dc50d49c034d525e7a3393057a0275b +SHA512 (jira-wiki-markup-1.0.0.tar.gz) = 74df439b64939ebad80ecdc2888829d78a8ae030a855de8e50a8b0076e036c79e5a96eb07a943fc211645c8a89bf508c170b2af0c923ca8f53f4b5cd401a7549 +SHA512 (pandoc-2.9.1.1.tar.gz) = de9afcaa1dfa3c253e5a108a3ea30771d90b820f9a033753fc1bce89293ec6c847073eb77ab6682a746d4719ba258ab36e299b6b330da50f49399fc5fcf54002 +SHA512 (text-conversions-0.3.0.tar.gz) = 767816f953468932ab579d0cbdd20f7bbe1fc72c4ed8a857bc7bfa52a2d07abafc2065e9844ddea49f44bcf32b06e5c1abd64a222498cc6435129f2b36c036ec From 6686ce0b6af764748d103af83fb8132f418898d3 Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Wed, 17 Jun 2020 01:12:53 +0800 Subject: [PATCH 148/165] move HsYAML, doclayout and text-conversions to ghc-doctemplates --- .gitignore | 3 --- pandoc.spec | 29 ++++++++++------------------- sources | 3 --- 3 files changed, 10 insertions(+), 25 deletions(-) diff --git a/.gitignore b/.gitignore index 13abf10..b5f4ad5 100644 --- a/.gitignore +++ b/.gitignore @@ -31,10 +31,7 @@ /hslua-module-system-0.2.1.tar.gz /ipynb-0.1.tar.gz /pandoc-2.7.3.tar.gz -/HsYAML-0.2.1.0.tar.gz -/doclayout-0.2.0.1.tar.gz /emojis-0.1.tar.gz /ipynb-0.1.0.1.tar.gz /jira-wiki-markup-1.0.0.tar.gz /pandoc-2.9.1.1.tar.gz -/text-conversions-0.3.0.tar.gz diff --git a/pandoc.spec b/pandoc.spec index 4dd5b9a..693b92f 100644 --- a/pandoc.spec +++ b/pandoc.spec @@ -4,16 +4,13 @@ %global pkg_name pandoc %global pkgver %{pkg_name}-%{version} -%global HsYAML HsYAML-0.2.1.0 %global unicodetransforms unicode-transforms-0.3.6 # needed by unicode-transforms %global bitarray bitarray-0.0.1.1 -%global doclayout doclayout-0.2.0.1 %global emojis emojis-0.1 %global hsluamodulesystem hslua-module-system-0.2.1 %global ipynb ipynb-0.1.0.1 %global jirawikimarkup jira-wiki-markup-1.0.0 -%global textconversions text-conversions-0.3.0 %global subpkgs %{HsYAML} %{bitarray} %{unicodetransforms} %{hsluamodulesystem} %{ipynb} %{doclayout} %{emojis} %{jirawikimarkup} %{textconversions} Name: %{pkg_name} @@ -26,15 +23,12 @@ License: GPLv2+ Url: https://hackage.haskell.org/package/%{name} # Begin cabal-rpm sources: Source0: https://hackage.haskell.org/package/%{pkgver}/%{pkgver}.tar.gz -Source1: https://hackage.haskell.org/package/%{HsYAML}/%{HsYAML}.tar.gz -Source2: https://hackage.haskell.org/package/%{unicodetransforms}/%{unicodetransforms}.tar.gz -Source3: https://hackage.haskell.org/package/%{bitarray}/%{bitarray}.tar.gz -Source4: https://hackage.haskell.org/package/%{hsluamodulesystem}/%{hsluamodulesystem}.tar.gz -Source5: https://hackage.haskell.org/package/%{ipynb}/%{ipynb}.tar.gz -Source6: https://hackage.haskell.org/package/%{doclayout}/%{doclayout}.tar.gz -Source7: https://hackage.haskell.org/package/%{emojis}/%{emojis}.tar.gz -Source8: https://hackage.haskell.org/package/%{jirawikimarkup}/%{jirawikimarkup}.tar.gz -Source9: https://hackage.haskell.org/package/%{textconversions}/%{textconversions}.tar.gz +Source1: https://hackage.haskell.org/package/%{unicodetransforms}/%{unicodetransforms}.tar.gz +Source2: https://hackage.haskell.org/package/%{bitarray}/%{bitarray}.tar.gz +Source3: https://hackage.haskell.org/package/%{hsluamodulesystem}/%{hsluamodulesystem}.tar.gz +Source4: https://hackage.haskell.org/package/%{ipynb}/%{ipynb}.tar.gz +Source5: https://hackage.haskell.org/package/%{emojis}/%{emojis}.tar.gz +Source6: https://hackage.haskell.org/package/%{jirawikimarkup}/%{jirawikimarkup}.tar.gz # End cabal-rpm sources # Begin cabal-rpm deps: @@ -42,7 +36,7 @@ BuildRequires: ghc-Cabal-devel BuildRequires: ghc-rpm-macros-extra BuildRequires: ghc-Glob-prof BuildRequires: ghc-HTTP-prof -#BuildRequires: ghc-HsYAML-prof +BuildRequires: ghc-HsYAML-prof BuildRequires: ghc-JuicyPixels-prof BuildRequires: ghc-SHA-prof BuildRequires: ghc-aeson-prof @@ -60,7 +54,7 @@ BuildRequires: ghc-containers-prof BuildRequires: ghc-data-default-prof BuildRequires: ghc-deepseq-prof BuildRequires: ghc-directory-prof -#BuildRequires: ghc-doclayout-prof +BuildRequires: ghc-doclayout-prof BuildRequires: ghc-doctemplates-prof #BuildRequires: ghc-emojis-prof BuildRequires: ghc-exceptions-prof @@ -91,7 +85,7 @@ BuildRequires: ghc-tagsoup-prof BuildRequires: ghc-temporary-prof BuildRequires: ghc-texmath-prof BuildRequires: ghc-text-prof -#BuildRequires: ghc-text-conversions-prof +BuildRequires: ghc-text-conversions-prof BuildRequires: ghc-time-prof #BuildRequires: ghc-unicode-transforms-prof BuildRequires: ghc-unix-prof @@ -203,15 +197,12 @@ This package provides the Haskell %{name} profiling library. %global main_version %{version} %if %{defined ghclibdir} -%ghc_lib_subpackage %{HsYAML} %ghc_lib_subpackage %{unicodetransforms} %ghc_lib_subpackage %{bitarray} %ghc_lib_subpackage %{hsluamodulesystem} %ghc_lib_subpackage %{ipynb} -%ghc_lib_subpackage %{doclayout} %ghc_lib_subpackage %{emojis} %ghc_lib_subpackage %{jirawikimarkup} -%ghc_lib_subpackage %{textconversions} %endif %global version %{main_version} @@ -219,7 +210,7 @@ This package provides the Haskell %{name} profiling library. %prep # Begin cabal-rpm setup: -%setup -q -a1 -a2 -a3 -a4 -a5 -a6 -a7 -a8 -a9 +%setup -q -a1 -a2 -a3 -a4 -a5 -a6 # End cabal-rpm setup diff --git a/sources b/sources index 61d3ea4..98bc9e2 100644 --- a/sources +++ b/sources @@ -1,10 +1,7 @@ SHA512 (unicode-transforms-0.3.6.tar.gz) = f9dfa47447766194d4d2d5c363bdddbd91443c44be985a46918298c2b32e8706656ee2bbfcb61063f6c0a23af3ff4309a5288aae1feb956efef79469f88c5b4b -SHA512 (HsYAML-0.2.1.0.tar.gz) = f8ad41a99e48183835093ad8bf6a3fbdf4b9ad9df3bea46b12efd55a9555c22bd2595c72b1ac2e73379ab47e21f6cbf9022412db8971e1c7c02a32e824f53304 SHA512 (bitarray-0.0.1.1.tar.gz) = 4b51ef2be989949e4ab8b9cab194c2bb5f3895abf9881ddf6009dd234c2c7d01edf01dc4ae96312a36f0b3d43f1b2b975eeaa738f66ccc2ab9a1a10e07582602 -SHA512 (doclayout-0.2.0.1.tar.gz) = 1a5f847106762a6808c5dd1512a30a3d9cac0c0b4d5f0a9c35c5eb9c6326fe49117c0f317f5b7ff63363c3fbc2c3a9689194aa74e5f21b16045614909d439d9e SHA512 (emojis-0.1.tar.gz) = 587c67bff3f77c362b16c93889762a9aad6fb5250c0bced45f5053f59dd6a11ab2886e53f286bbc4de2b8793be133708b1f9c5d4d52bcef1820f5a7c1ecfa7d2 SHA512 (hslua-module-system-0.2.1.tar.gz) = 296d2ee41760d8ee6025562c408f16e78468a9ca53910982fd346a9cf7b8c6df3340fd2d0a7f6ff5fc41c98f0724a733f0ed8bd64cdd18acfb65aa044cd4a99b SHA512 (ipynb-0.1.0.1.tar.gz) = b1e547ac9353c84619832c723586146d2fd72c85c75d11b9ff99c16852ae2dfd1a2d61382ab9cc54bc9ad2bf8e1c3c0a8dc50d49c034d525e7a3393057a0275b SHA512 (jira-wiki-markup-1.0.0.tar.gz) = 74df439b64939ebad80ecdc2888829d78a8ae030a855de8e50a8b0076e036c79e5a96eb07a943fc211645c8a89bf508c170b2af0c923ca8f53f4b5cd401a7549 SHA512 (pandoc-2.9.1.1.tar.gz) = de9afcaa1dfa3c253e5a108a3ea30771d90b820f9a033753fc1bce89293ec6c847073eb77ab6682a746d4719ba258ab36e299b6b330da50f49399fc5fcf54002 -SHA512 (text-conversions-0.3.0.tar.gz) = 767816f953468932ab579d0cbdd20f7bbe1fc72c4ed8a857bc7bfa52a2d07abafc2065e9844ddea49f44bcf32b06e5c1abd64a222498cc6435129f2b36c036ec From 9ca395e8748a78f5d7195e21d8fac0359318aed4 Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Fri, 19 Jun 2020 16:58:03 +0800 Subject: [PATCH 149/165] refresh to cabal-rpm-2.0.6 --- pandoc.spec | 12 +----------- 1 file changed, 1 insertion(+), 11 deletions(-) diff --git a/pandoc.spec b/pandoc.spec index 693b92f..5e128e3 100644 --- a/pandoc.spec +++ b/pandoc.spec @@ -1,4 +1,4 @@ -# generated by cabal-rpm-2.0.5 --subpackage +# generated by cabal-rpm-2.0.6 --subpackage # https://docs.fedoraproject.org/en-US/packaging-guidelines/Haskell/ %global pkg_name pandoc @@ -236,16 +236,6 @@ ln -s pandoc %{buildroot}%{_bindir}/hsmarkdown install -m 0644 -p -D man/pandoc.1 %{buildroot}%{_mandir}/man1/pandoc.1 -%if 0%{?fedora} < 31 || 0%{?rhel} < 8 -%post -n ghc-%{name}-devel -%ghc_pkg_recache - - -%postun -n ghc-%{name}-devel -%ghc_pkg_recache -%endif - - %files # Begin cabal-rpm files: %{_bindir}/%{name} From 5362f5350ea077def7a0e72da451db3036bcd314 Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Sat, 20 Jun 2020 18:30:24 +0800 Subject: [PATCH 150/165] update to 2.9.2.1 --- .gitignore | 3 +++ pandoc.spec | 60 +++++++++++++++++++++++++++++++++++++++-------------- sources | 7 ++++--- 3 files changed, 52 insertions(+), 18 deletions(-) diff --git a/.gitignore b/.gitignore index b5f4ad5..a7c5dcf 100644 --- a/.gitignore +++ b/.gitignore @@ -35,3 +35,6 @@ /ipynb-0.1.0.1.tar.gz /jira-wiki-markup-1.0.0.tar.gz /pandoc-2.9.1.1.tar.gz +/pandoc-2.9.2.1.tar.gz +/base-noprelude-4.13.0.0.tar.gz +/jira-wiki-markup-1.1.4.tar.gz diff --git a/pandoc.spec b/pandoc.spec index 5e128e3..0b6f519 100644 --- a/pandoc.spec +++ b/pandoc.spec @@ -7,16 +7,19 @@ %global unicodetransforms unicode-transforms-0.3.6 # needed by unicode-transforms %global bitarray bitarray-0.0.1.1 -%global emojis emojis-0.1 %global hsluamodulesystem hslua-module-system-0.2.1 %global ipynb ipynb-0.1.0.1 -%global jirawikimarkup jira-wiki-markup-1.0.0 -%global subpkgs %{HsYAML} %{bitarray} %{unicodetransforms} %{hsluamodulesystem} %{ipynb} %{doclayout} %{emojis} %{jirawikimarkup} %{textconversions} +%global emojis emojis-0.1 +%global jirawikimarkup jira-wiki-markup-1.1.4 +%global basenoprelude base-noprelude-4.13.0.0 +%global subpkgs %{bitarray} %{unicodetransforms} %{hsluamodulesystem} %{ipynb} %{emojis} %{jirawikimarkup} %{basenoprelude} + +# testsuite missing deps: base-noprelude tasty-golden tasty-lua Name: %{pkg_name} -Version: 2.9.1.1 +Version: 2.9.2.1 # can only be reset when all subpkgs bumped -Release: 4%{?dist} +Release: 5%{?dist} Summary: Conversion between markup formats License: GPLv2+ @@ -29,6 +32,7 @@ Source3: https://hackage.haskell.org/package/%{hsluamodulesystem}/%{hslua Source4: https://hackage.haskell.org/package/%{ipynb}/%{ipynb}.tar.gz Source5: https://hackage.haskell.org/package/%{emojis}/%{emojis}.tar.gz Source6: https://hackage.haskell.org/package/%{jirawikimarkup}/%{jirawikimarkup}.tar.gz +Source7: https://hackage.haskell.org/package/%{basenoprelude}/%{basenoprelude}.tar.gz # End cabal-rpm sources # Begin cabal-rpm deps: @@ -42,7 +46,8 @@ BuildRequires: ghc-SHA-prof BuildRequires: ghc-aeson-prof BuildRequires: ghc-aeson-pretty-prof BuildRequires: ghc-attoparsec-prof -BuildRequires: ghc-base-prof +BuildRequires: ghc-base-compat-prof +#BuildRequires: ghc-base-noprelude-prof BuildRequires: ghc-base64-bytestring-prof BuildRequires: ghc-binary-prof BuildRequires: ghc-blaze-html-prof @@ -95,9 +100,25 @@ BuildRequires: ghc-xml-prof BuildRequires: ghc-zip-archive-prof BuildRequires: ghc-zlib-prof Requires: %{name}-common = %{version}-%{release} +# for missing dep 'unicode-transforms': +BuildRequires: ghc-base-prof # for missing dep 'bitarray': BuildRequires: ghc-array-prof +BuildRequires: ghc-base-prof +# for missing dep 'hslua-module-system': +BuildRequires: ghc-base-prof +# for missing dep 'ipynb': +BuildRequires: ghc-base-prof +# for missing dep 'emojis': +BuildRequires: ghc-base-prof +# for missing dep 'jira-wiki-markup': +BuildRequires: ghc-base-prof +# for missing dep 'base-noprelude': +BuildRequires: ghc-base-prof +# for missing dep 'doclayout': +BuildRequires: ghc-base-prof # for missing dep 'text-conversions': +BuildRequires: ghc-base-prof BuildRequires: ghc-base16-bytestring-prof BuildRequires: ghc-errors-prof # End cabal-rpm deps @@ -108,13 +129,13 @@ and a command-line tool that uses this library. It can read several dialects of Markdown and (subsets of) HTML, reStructuredText, LaTeX, DocBook, JATS, MediaWiki markup, DokuWiki markup, TWiki markup, TikiWiki markup, Jira markup, Creole 1.0, Haddock markup, OPML, Emacs Org-Mode, Emacs Muse, txt2tags, ipynb -(Jupyter notebooks), Vimwiki, Word Docx, ODT, EPUB, FictionBook2, roff man, and -Textile, and it can write Markdown, reStructuredText, XHTML, HTML 5, LaTeX, -ConTeXt, DocBook, JATS, OPML, TEI, OpenDocument, ODT, Word docx, PowerPoint -pptx, RTF, MediaWiki, DokuWiki, XWiki, ZimWiki, Textile, Jira, roff man, roff -ms, plain text, Emacs Org-Mode, AsciiDoc, Haddock markup, EPUB (v2 and v3), -ipynb, FictionBook2, InDesign ICML, Muse, LaTeX beamer slides, and several -kinds of HTML/JavaScript slide shows (S5, Slidy, Slideous, DZSlides, +(Jupyter notebooks), Vimwiki, Word Docx, ODT, EPUB, FictionBook2, roff man, +Textile, and CSV, and it can write Markdown, reStructuredText, XHTML, HTML 5, +LaTeX, ConTeXt, DocBook, JATS, OPML, TEI, OpenDocument, ODT, Word docx, +PowerPoint pptx, RTF, MediaWiki, DokuWiki, XWiki, ZimWiki, Textile, Jira, roff +man, roff ms, plain text, Emacs Org-Mode, AsciiDoc, Haddock markup, EPUB (v2 +and v3), ipynb, FictionBook2, InDesign ICML, Muse, LaTeX beamer slides, and +several kinds of HTML/JavaScript slide shows (S5, Slidy, Slideous, DZSlides, reveal.js). In contrast to most existing tools for converting Markdown to HTML, pandoc has @@ -203,6 +224,7 @@ This package provides the Haskell %{name} profiling library. %ghc_lib_subpackage %{ipynb} %ghc_lib_subpackage %{emojis} %ghc_lib_subpackage %{jirawikimarkup} +%ghc_lib_subpackage -m %{basenoprelude} %endif %global version %{main_version} @@ -210,7 +232,7 @@ This package provides the Haskell %{name} profiling library. %prep # Begin cabal-rpm setup: -%setup -q -a1 -a2 -a3 -a4 -a5 -a6 +%setup -q -a1 -a2 -a3 -a4 -a5 -a6 -a7 # End cabal-rpm setup @@ -235,6 +257,10 @@ ln -s pandoc %{buildroot}%{_bindir}/hsmarkdown install -m 0644 -p -D man/pandoc.1 %{buildroot}%{_mandir}/man1/pandoc.1 +echo %{_bindir}/jira-wiki-markup >> %{jirawikimarkup}/ghc-jira-wiki-markup.files +mv %{buildroot}%{_defaultlicensedir}/ghc-base-noprelude{,-devel} +echo "%%license %{basenoprelude}/LICENSE" >> %{basenoprelude}/ghc-base-noprelude-devel.files + %files # Begin cabal-rpm files: @@ -272,8 +298,12 @@ install -m 0644 -p -D man/pandoc.1 %{buildroot}%{_mandir}/man1/pandoc.1 %changelog +* Fri Jun 19 2020 Jens Petersen - 2.9.2.1-5 +- https://hackage.haskell.org/package/pandoc-2.9.2.1/changelog +- subpackage base-noprelude + * Wed Jun 10 2020 Jens Petersen - 2.9.1.1-4 -- https://pandoc.org/releases.html#pandoc-2.9.1.1-2020-01-05 +- https://hackage.haskell.org/package/pandoc-2.9.1.1/changelog - new deps: doclayout, emojis, jira-wiki-markup, text-conversions * Sun Feb 23 2020 Jens Petersen - 2.7.3-3 diff --git a/sources b/sources index 98bc9e2..547946d 100644 --- a/sources +++ b/sources @@ -1,7 +1,8 @@ -SHA512 (unicode-transforms-0.3.6.tar.gz) = f9dfa47447766194d4d2d5c363bdddbd91443c44be985a46918298c2b32e8706656ee2bbfcb61063f6c0a23af3ff4309a5288aae1feb956efef79469f88c5b4b +SHA512 (base-noprelude-4.13.0.0.tar.gz) = 658ff8e23648d490d97de1083a8412194076f8a0a07fe5843d0d68887225294f296ad2e1c32b9bae3fa32e1f94261aaeb350eec47642edb35ca5ba1dd1a69ecf SHA512 (bitarray-0.0.1.1.tar.gz) = 4b51ef2be989949e4ab8b9cab194c2bb5f3895abf9881ddf6009dd234c2c7d01edf01dc4ae96312a36f0b3d43f1b2b975eeaa738f66ccc2ab9a1a10e07582602 SHA512 (emojis-0.1.tar.gz) = 587c67bff3f77c362b16c93889762a9aad6fb5250c0bced45f5053f59dd6a11ab2886e53f286bbc4de2b8793be133708b1f9c5d4d52bcef1820f5a7c1ecfa7d2 SHA512 (hslua-module-system-0.2.1.tar.gz) = 296d2ee41760d8ee6025562c408f16e78468a9ca53910982fd346a9cf7b8c6df3340fd2d0a7f6ff5fc41c98f0724a733f0ed8bd64cdd18acfb65aa044cd4a99b SHA512 (ipynb-0.1.0.1.tar.gz) = b1e547ac9353c84619832c723586146d2fd72c85c75d11b9ff99c16852ae2dfd1a2d61382ab9cc54bc9ad2bf8e1c3c0a8dc50d49c034d525e7a3393057a0275b -SHA512 (jira-wiki-markup-1.0.0.tar.gz) = 74df439b64939ebad80ecdc2888829d78a8ae030a855de8e50a8b0076e036c79e5a96eb07a943fc211645c8a89bf508c170b2af0c923ca8f53f4b5cd401a7549 -SHA512 (pandoc-2.9.1.1.tar.gz) = de9afcaa1dfa3c253e5a108a3ea30771d90b820f9a033753fc1bce89293ec6c847073eb77ab6682a746d4719ba258ab36e299b6b330da50f49399fc5fcf54002 +SHA512 (jira-wiki-markup-1.1.4.tar.gz) = 89a89ca7bc43598c77328cbf93ce6215a446322a6ce5d5bbcb1180cf664be56e26e61d49332006988b27d460ac2a32af466fb974af6b52e2f5d9e69f4821474f +SHA512 (pandoc-2.9.2.1.tar.gz) = 35ac491a7e0a2f6d8fe0f2c2ffe265748b13920904e974f88c92b3f82edb2f1c03e28ebef1bc344ead13d566117a5e50707a68edc49f95159157f974210b23b2 +SHA512 (unicode-transforms-0.3.6.tar.gz) = f9dfa47447766194d4d2d5c363bdddbd91443c44be985a46918298c2b32e8706656ee2bbfcb61063f6c0a23af3ff4309a5288aae1feb956efef79469f88c5b4b From 4c8e791c5a7aa4483bd8fbbd99afadc3ea9a5324 Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Thu, 16 Jul 2020 01:00:16 +0800 Subject: [PATCH 151/165] bitarray and unicode-transforms were packaged --- pandoc.spec | 29 +++++++++-------------------- sources | 2 -- 2 files changed, 9 insertions(+), 22 deletions(-) diff --git a/pandoc.spec b/pandoc.spec index 0b6f519..9867d10 100644 --- a/pandoc.spec +++ b/pandoc.spec @@ -4,15 +4,12 @@ %global pkg_name pandoc %global pkgver %{pkg_name}-%{version} -%global unicodetransforms unicode-transforms-0.3.6 -# needed by unicode-transforms -%global bitarray bitarray-0.0.1.1 %global hsluamodulesystem hslua-module-system-0.2.1 %global ipynb ipynb-0.1.0.1 %global emojis emojis-0.1 %global jirawikimarkup jira-wiki-markup-1.1.4 %global basenoprelude base-noprelude-4.13.0.0 -%global subpkgs %{bitarray} %{unicodetransforms} %{hsluamodulesystem} %{ipynb} %{emojis} %{jirawikimarkup} %{basenoprelude} +%global subpkgs %{hsluamodulesystem} %{ipynb} %{emojis} %{jirawikimarkup} %{basenoprelude} # testsuite missing deps: base-noprelude tasty-golden tasty-lua @@ -26,13 +23,11 @@ License: GPLv2+ Url: https://hackage.haskell.org/package/%{name} # Begin cabal-rpm sources: Source0: https://hackage.haskell.org/package/%{pkgver}/%{pkgver}.tar.gz -Source1: https://hackage.haskell.org/package/%{unicodetransforms}/%{unicodetransforms}.tar.gz -Source2: https://hackage.haskell.org/package/%{bitarray}/%{bitarray}.tar.gz -Source3: https://hackage.haskell.org/package/%{hsluamodulesystem}/%{hsluamodulesystem}.tar.gz -Source4: https://hackage.haskell.org/package/%{ipynb}/%{ipynb}.tar.gz -Source5: https://hackage.haskell.org/package/%{emojis}/%{emojis}.tar.gz -Source6: https://hackage.haskell.org/package/%{jirawikimarkup}/%{jirawikimarkup}.tar.gz -Source7: https://hackage.haskell.org/package/%{basenoprelude}/%{basenoprelude}.tar.gz +Source1: https://hackage.haskell.org/package/%{hsluamodulesystem}/%{hsluamodulesystem}.tar.gz +Source2: https://hackage.haskell.org/package/%{ipynb}/%{ipynb}.tar.gz +Source3: https://hackage.haskell.org/package/%{emojis}/%{emojis}.tar.gz +Source4: https://hackage.haskell.org/package/%{jirawikimarkup}/%{jirawikimarkup}.tar.gz +Source5: https://hackage.haskell.org/package/%{basenoprelude}/%{basenoprelude}.tar.gz # End cabal-rpm sources # Begin cabal-rpm deps: @@ -92,7 +87,7 @@ BuildRequires: ghc-texmath-prof BuildRequires: ghc-text-prof BuildRequires: ghc-text-conversions-prof BuildRequires: ghc-time-prof -#BuildRequires: ghc-unicode-transforms-prof +BuildRequires: ghc-unicode-transforms-prof BuildRequires: ghc-unix-prof BuildRequires: ghc-unordered-containers-prof BuildRequires: ghc-vector-prof @@ -100,11 +95,6 @@ BuildRequires: ghc-xml-prof BuildRequires: ghc-zip-archive-prof BuildRequires: ghc-zlib-prof Requires: %{name}-common = %{version}-%{release} -# for missing dep 'unicode-transforms': -BuildRequires: ghc-base-prof -# for missing dep 'bitarray': -BuildRequires: ghc-array-prof -BuildRequires: ghc-base-prof # for missing dep 'hslua-module-system': BuildRequires: ghc-base-prof # for missing dep 'ipynb': @@ -218,8 +208,6 @@ This package provides the Haskell %{name} profiling library. %global main_version %{version} %if %{defined ghclibdir} -%ghc_lib_subpackage %{unicodetransforms} -%ghc_lib_subpackage %{bitarray} %ghc_lib_subpackage %{hsluamodulesystem} %ghc_lib_subpackage %{ipynb} %ghc_lib_subpackage %{emojis} @@ -232,7 +220,7 @@ This package provides the Haskell %{name} profiling library. %prep # Begin cabal-rpm setup: -%setup -q -a1 -a2 -a3 -a4 -a5 -a6 -a7 +%setup -q -a1 -a2 -a3 -a4 -a5 # End cabal-rpm setup @@ -301,6 +289,7 @@ echo "%%license %{basenoprelude}/LICENSE" >> %{basenoprelude}/ghc-base-noprelude * Fri Jun 19 2020 Jens Petersen - 2.9.2.1-5 - https://hackage.haskell.org/package/pandoc-2.9.2.1/changelog - subpackage base-noprelude +- bitarray and unicode-transforms were packaged * Wed Jun 10 2020 Jens Petersen - 2.9.1.1-4 - https://hackage.haskell.org/package/pandoc-2.9.1.1/changelog diff --git a/sources b/sources index 547946d..4e55f9f 100644 --- a/sources +++ b/sources @@ -1,8 +1,6 @@ SHA512 (base-noprelude-4.13.0.0.tar.gz) = 658ff8e23648d490d97de1083a8412194076f8a0a07fe5843d0d68887225294f296ad2e1c32b9bae3fa32e1f94261aaeb350eec47642edb35ca5ba1dd1a69ecf -SHA512 (bitarray-0.0.1.1.tar.gz) = 4b51ef2be989949e4ab8b9cab194c2bb5f3895abf9881ddf6009dd234c2c7d01edf01dc4ae96312a36f0b3d43f1b2b975eeaa738f66ccc2ab9a1a10e07582602 SHA512 (emojis-0.1.tar.gz) = 587c67bff3f77c362b16c93889762a9aad6fb5250c0bced45f5053f59dd6a11ab2886e53f286bbc4de2b8793be133708b1f9c5d4d52bcef1820f5a7c1ecfa7d2 SHA512 (hslua-module-system-0.2.1.tar.gz) = 296d2ee41760d8ee6025562c408f16e78468a9ca53910982fd346a9cf7b8c6df3340fd2d0a7f6ff5fc41c98f0724a733f0ed8bd64cdd18acfb65aa044cd4a99b SHA512 (ipynb-0.1.0.1.tar.gz) = b1e547ac9353c84619832c723586146d2fd72c85c75d11b9ff99c16852ae2dfd1a2d61382ab9cc54bc9ad2bf8e1c3c0a8dc50d49c034d525e7a3393057a0275b SHA512 (jira-wiki-markup-1.1.4.tar.gz) = 89a89ca7bc43598c77328cbf93ce6215a446322a6ce5d5bbcb1180cf664be56e26e61d49332006988b27d460ac2a32af466fb974af6b52e2f5d9e69f4821474f SHA512 (pandoc-2.9.2.1.tar.gz) = 35ac491a7e0a2f6d8fe0f2c2ffe265748b13920904e974f88c92b3f82edb2f1c03e28ebef1bc344ead13d566117a5e50707a68edc49f95159157f974210b23b2 -SHA512 (unicode-transforms-0.3.6.tar.gz) = f9dfa47447766194d4d2d5c363bdddbd91443c44be985a46918298c2b32e8706656ee2bbfcb61063f6c0a23af3ff4309a5288aae1feb956efef79469f88c5b4b From c7e112910cef585bdbba62de735bb5b1cd1f9f1a Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Sun, 19 Jul 2020 16:00:06 +0800 Subject: [PATCH 152/165] try to reduce compile-time memory utilization on armv7hl --- pandoc.spec | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/pandoc.spec b/pandoc.spec index 9867d10..2a28035 100644 --- a/pandoc.spec +++ b/pandoc.spec @@ -227,6 +227,12 @@ This package provides the Haskell %{name} profiling library. %build # Begin cabal-rpm build: %ghc_libs_build %{subpkgs} +%ifarch armv7hl +# https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=965121 +# [101 of 166] Compiling Text.Pandoc.Writers.LaTeX +# ghc: out of memory (requested 1048576 bytes) +%define cabal_configure_options --ghc-options="-optc--param -optcggc-min-expand=5" +%endif %ghc_lib_build # End cabal-rpm build From e8bf28a0d49f8eabb56c3eed41546e0334ac6ec1 Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Sun, 19 Jul 2020 21:39:16 +0800 Subject: [PATCH 153/165] try -O0 for armv7hl --- pandoc.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pandoc.spec b/pandoc.spec index 2a28035..afbc128 100644 --- a/pandoc.spec +++ b/pandoc.spec @@ -231,7 +231,7 @@ This package provides the Haskell %{name} profiling library. # https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=965121 # [101 of 166] Compiling Text.Pandoc.Writers.LaTeX # ghc: out of memory (requested 1048576 bytes) -%define cabal_configure_options --ghc-options="-optc--param -optcggc-min-expand=5" +%define cabal_configure_options --ghc-options="-O0" %endif %ghc_lib_build # End cabal-rpm build From 035914c5f9643a5aabddf9b3d107f9c903ec92a1 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Tue, 28 Jul 2020 13:07:47 +0000 Subject: [PATCH 154/165] - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- pandoc.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pandoc.spec b/pandoc.spec index afbc128..3ef9263 100644 --- a/pandoc.spec +++ b/pandoc.spec @@ -16,7 +16,7 @@ Name: %{pkg_name} Version: 2.9.2.1 # can only be reset when all subpkgs bumped -Release: 5%{?dist} +Release: 6%{?dist} Summary: Conversion between markup formats License: GPLv2+ @@ -292,6 +292,9 @@ echo "%%license %{basenoprelude}/LICENSE" >> %{basenoprelude}/ghc-base-noprelude %changelog +* Tue Jul 28 2020 Fedora Release Engineering - 2.9.2.1-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + * Fri Jun 19 2020 Jens Petersen - 2.9.2.1-5 - https://hackage.haskell.org/package/pandoc-2.9.2.1/changelog - subpackage base-noprelude From 7285fff84f11227518a57f3e53164d7ba5c3a020 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 1 Aug 2020 06:58:34 +0000 Subject: [PATCH 155/165] - Second attempt - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- pandoc.spec | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/pandoc.spec b/pandoc.spec index 3ef9263..e328b74 100644 --- a/pandoc.spec +++ b/pandoc.spec @@ -16,7 +16,7 @@ Name: %{pkg_name} Version: 2.9.2.1 # can only be reset when all subpkgs bumped -Release: 6%{?dist} +Release: 7%{?dist} Summary: Conversion between markup formats License: GPLv2+ @@ -292,6 +292,10 @@ echo "%%license %{basenoprelude}/LICENSE" >> %{basenoprelude}/ghc-base-noprelude %changelog +* Sat Aug 01 2020 Fedora Release Engineering - 2.9.2.1-7 +- Second attempt - Rebuilt for + https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + * Tue Jul 28 2020 Fedora Release Engineering - 2.9.2.1-6 - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild From 84e0d230b85f3c844dd7ff296c35c027796e0eff Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Sat, 19 Sep 2020 21:12:58 +0800 Subject: [PATCH 156/165] bump release --- pandoc.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pandoc.spec b/pandoc.spec index e328b74..28d0d8c 100644 --- a/pandoc.spec +++ b/pandoc.spec @@ -16,7 +16,7 @@ Name: %{pkg_name} Version: 2.9.2.1 # can only be reset when all subpkgs bumped -Release: 7%{?dist} +Release: 8%{?dist} Summary: Conversion between markup formats License: GPLv2+ @@ -292,6 +292,9 @@ echo "%%license %{basenoprelude}/LICENSE" >> %{basenoprelude}/ghc-base-noprelude %changelog +* Sat Sep 19 21:12:58 +08 2020 Jens Petersen - 2.9.2.1-8 +- rebuild + * Sat Aug 01 2020 Fedora Release Engineering - 2.9.2.1-7 - Second attempt - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild From cc3c2f0324a493be52ceb12178d290986b6e68b8 Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Sun, 20 Sep 2020 16:47:51 +0800 Subject: [PATCH 157/165] expand the changelog for cmark-gfm rebuild --- pandoc.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pandoc.spec b/pandoc.spec index 28d0d8c..b545f7e 100644 --- a/pandoc.spec +++ b/pandoc.spec @@ -293,7 +293,7 @@ echo "%%license %{basenoprelude}/LICENSE" >> %{basenoprelude}/ghc-base-noprelude %changelog * Sat Sep 19 21:12:58 +08 2020 Jens Petersen - 2.9.2.1-8 -- rebuild +- rebuild for cmark-gfm-0.2.2: fixes exponential parse (#1854329) * Sat Aug 01 2020 Fedora Release Engineering - 2.9.2.1-7 - Second attempt - Rebuilt for From c8c20686f960adf75709d9284dd986f353f27a84 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Tue, 26 Jan 2021 22:54:59 +0000 Subject: [PATCH 158/165] - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- pandoc.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pandoc.spec b/pandoc.spec index b545f7e..c858a44 100644 --- a/pandoc.spec +++ b/pandoc.spec @@ -16,7 +16,7 @@ Name: %{pkg_name} Version: 2.9.2.1 # can only be reset when all subpkgs bumped -Release: 8%{?dist} +Release: 9%{?dist} Summary: Conversion between markup formats License: GPLv2+ @@ -292,6 +292,9 @@ echo "%%license %{basenoprelude}/LICENSE" >> %{basenoprelude}/ghc-base-noprelude %changelog +* Tue Jan 26 2021 Fedora Release Engineering - 2.9.2.1-9 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + * Sat Sep 19 21:12:58 +08 2020 Jens Petersen - 2.9.2.1-8 - rebuild for cmark-gfm-0.2.2: fixes exponential parse (#1854329) From ef7372ea4b18d66fa5ecc5e620ae37c45533b30f Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 22 Jul 2021 17:40:24 +0000 Subject: [PATCH 159/165] - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- pandoc.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pandoc.spec b/pandoc.spec index c858a44..40cb773 100644 --- a/pandoc.spec +++ b/pandoc.spec @@ -16,7 +16,7 @@ Name: %{pkg_name} Version: 2.9.2.1 # can only be reset when all subpkgs bumped -Release: 9%{?dist} +Release: 10%{?dist} Summary: Conversion between markup formats License: GPLv2+ @@ -292,6 +292,9 @@ echo "%%license %{basenoprelude}/LICENSE" >> %{basenoprelude}/ghc-base-noprelude %changelog +* Thu Jul 22 2021 Fedora Release Engineering - 2.9.2.1-10 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + * Tue Jan 26 2021 Fedora Release Engineering - 2.9.2.1-9 - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild From b846a25358b01759686fbe1e4758400ba0ab3a96 Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Thu, 5 Aug 2021 13:08:05 +0800 Subject: [PATCH 160/165] create bash-completion file in post-install --- pandoc.spec | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/pandoc.spec b/pandoc.spec index 40cb773..557b2ce 100644 --- a/pandoc.spec +++ b/pandoc.spec @@ -255,6 +255,13 @@ echo %{_bindir}/jira-wiki-markup >> %{jirawikimarkup}/ghc-jira-wiki-markup.files mv %{buildroot}%{_defaultlicensedir}/ghc-base-noprelude{,-devel} echo "%%license %{basenoprelude}/LICENSE" >> %{basenoprelude}/ghc-base-noprelude-devel.files +mkdir -p %{buildroot}%{_datadir}/bash-completion/completions/ +touch %{buildroot}%{_datadir}/bash-completion/completions/%{name} + + +%post +%{_bindir}%{name} --bash-completion > %{_datadir}/bash-completion/completions/%{name} + %files # Begin cabal-rpm files: @@ -262,6 +269,7 @@ echo "%%license %{basenoprelude}/LICENSE" >> %{basenoprelude}/ghc-base-noprelude # End cabal-rpm files %{_bindir}/hsmarkdown %{_mandir}/man1/pandoc.1* +%ghost %{_datadir}/bash-completion/completions/%{name} %files common @@ -292,6 +300,9 @@ echo "%%license %{basenoprelude}/LICENSE" >> %{basenoprelude}/ghc-base-noprelude %changelog +* Thu Aug 5 2021 Jens Petersen - 2.9.2.1-10 +- create bash-completion file in post-install + * Thu Jul 22 2021 Fedora Release Engineering - 2.9.2.1-10 - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild From 06543ecaeb5b8f7eff2ee408870d9ec5bdbf6b9f Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Thu, 5 Aug 2021 13:09:22 +0800 Subject: [PATCH 161/165] update to 2.11.4 --- .gitignore | 9 ++++++ pandoc.spec | 91 +++++++++++++++++++++++++++++------------------------ sources | 13 +++++--- 3 files changed, 67 insertions(+), 46 deletions(-) diff --git a/.gitignore b/.gitignore index a7c5dcf..2da338b 100644 --- a/.gitignore +++ b/.gitignore @@ -38,3 +38,12 @@ /pandoc-2.9.2.1.tar.gz /base-noprelude-4.13.0.0.tar.gz /jira-wiki-markup-1.1.4.tar.gz +/pandoc-2.11.4.tar.gz +/hslua-module-system-0.2.2.1.tar.gz +/jira-wiki-markup-1.3.3.tar.gz +/citeproc-0.3.0.7.tar.gz +/commonmark-0.1.1.4.tar.gz +/commonmark-extensions-0.2.0.4.tar.gz +/commonmark-pandoc-0.2.0.1.tar.gz +/jira-wiki-markup-1.3.4.tar.gz +/citeproc-0.3.0.9.tar.gz diff --git a/pandoc.spec b/pandoc.spec index 557b2ce..3210321 100644 --- a/pandoc.spec +++ b/pandoc.spec @@ -1,22 +1,25 @@ -# generated by cabal-rpm-2.0.6 --subpackage +# generated by cabal-rpm-2.0.9 --subpackage # https://docs.fedoraproject.org/en-US/packaging-guidelines/Haskell/ %global pkg_name pandoc %global pkgver %{pkg_name}-%{version} -%global hsluamodulesystem hslua-module-system-0.2.1 +%global hsluamodulesystem hslua-module-system-0.2.2.1 %global ipynb ipynb-0.1.0.1 %global emojis emojis-0.1 -%global jirawikimarkup jira-wiki-markup-1.1.4 -%global basenoprelude base-noprelude-4.13.0.0 -%global subpkgs %{hsluamodulesystem} %{ipynb} %{emojis} %{jirawikimarkup} %{basenoprelude} +%global jirawikimarkup jira-wiki-markup-1.3.4 +%global citeproc citeproc-0.3.0.9 +%global commonmark commonmark-0.1.1.4 +%global commonmarkextensions commonmark-extensions-0.2.0.4 +%global commonmarkpandoc commonmark-pandoc-0.2.0.1 +%global subpkgs %{hsluamodulesystem} %{ipynb} %{emojis} %{jirawikimarkup} %{citeproc} %{commonmark} %{commonmarkextensions} %{commonmarkpandoc} -# testsuite missing deps: base-noprelude tasty-golden tasty-lua +# testsuite missing deps: tasty-golden tasty-lua Name: %{pkg_name} -Version: 2.9.2.1 +Version: 2.11.4 # can only be reset when all subpkgs bumped -Release: 10%{?dist} +Release: 12%{?dist} Summary: Conversion between markup formats License: GPLv2+ @@ -27,7 +30,10 @@ Source1: https://hackage.haskell.org/package/%{hsluamodulesystem}/%{hslua Source2: https://hackage.haskell.org/package/%{ipynb}/%{ipynb}.tar.gz Source3: https://hackage.haskell.org/package/%{emojis}/%{emojis}.tar.gz Source4: https://hackage.haskell.org/package/%{jirawikimarkup}/%{jirawikimarkup}.tar.gz -Source5: https://hackage.haskell.org/package/%{basenoprelude}/%{basenoprelude}.tar.gz +Source5: https://hackage.haskell.org/package/%{citeproc}/%{citeproc}.tar.gz +Source6: https://hackage.haskell.org/package/%{commonmark}/%{commonmark}.tar.gz +Source7: https://hackage.haskell.org/package/%{commonmarkextensions}/%{commonmarkextensions}.tar.gz +Source8: https://hackage.haskell.org/package/%{commonmarkpandoc}/%{commonmarkpandoc}.tar.gz # End cabal-rpm sources # Begin cabal-rpm deps: @@ -41,15 +47,18 @@ BuildRequires: ghc-SHA-prof BuildRequires: ghc-aeson-prof BuildRequires: ghc-aeson-pretty-prof BuildRequires: ghc-attoparsec-prof -BuildRequires: ghc-base-compat-prof -#BuildRequires: ghc-base-noprelude-prof +BuildRequires: ghc-base-prof BuildRequires: ghc-base64-bytestring-prof BuildRequires: ghc-binary-prof BuildRequires: ghc-blaze-html-prof BuildRequires: ghc-blaze-markup-prof BuildRequires: ghc-bytestring-prof BuildRequires: ghc-case-insensitive-prof -BuildRequires: ghc-cmark-gfm-prof +#BuildRequires: ghc-citeproc-prof +#BuildRequires: ghc-commonmark-prof +#BuildRequires: ghc-commonmark-extensions-prof +#BuildRequires: ghc-commonmark-pandoc-prof +BuildRequires: ghc-connection-prof BuildRequires: ghc-containers-prof BuildRequires: ghc-data-default-prof BuildRequires: ghc-deepseq-prof @@ -58,6 +67,7 @@ BuildRequires: ghc-doclayout-prof BuildRequires: ghc-doctemplates-prof #BuildRequires: ghc-emojis-prof BuildRequires: ghc-exceptions-prof +BuildRequires: ghc-file-embed-prof BuildRequires: ghc-filepath-prof BuildRequires: ghc-haddock-library-prof BuildRequires: ghc-hslua-prof @@ -90,27 +100,20 @@ BuildRequires: ghc-time-prof BuildRequires: ghc-unicode-transforms-prof BuildRequires: ghc-unix-prof BuildRequires: ghc-unordered-containers-prof -BuildRequires: ghc-vector-prof BuildRequires: ghc-xml-prof BuildRequires: ghc-zip-archive-prof BuildRequires: ghc-zlib-prof Requires: %{name}-common = %{version}-%{release} -# for missing dep 'hslua-module-system': -BuildRequires: ghc-base-prof -# for missing dep 'ipynb': -BuildRequires: ghc-base-prof -# for missing dep 'emojis': -BuildRequires: ghc-base-prof -# for missing dep 'jira-wiki-markup': -BuildRequires: ghc-base-prof -# for missing dep 'base-noprelude': -BuildRequires: ghc-base-prof -# for missing dep 'doclayout': -BuildRequires: ghc-base-prof -# for missing dep 'text-conversions': -BuildRequires: ghc-base-prof -BuildRequires: ghc-base16-bytestring-prof -BuildRequires: ghc-errors-prof +# for missing dep 'citeproc': +BuildRequires: ghc-rfc5051-prof +BuildRequires: ghc-transformers-prof +BuildRequires: ghc-uniplate-prof +BuildRequires: ghc-vector-prof +BuildRequires: ghc-xml-conduit-prof +# for missing dep 'commonmark': +BuildRequires: ghc-transformers-prof +# for missing dep 'commonmark-extensions': +BuildRequires: ghc-transformers-prof # End cabal-rpm deps %description @@ -120,13 +123,13 @@ Markdown and (subsets of) HTML, reStructuredText, LaTeX, DocBook, JATS, MediaWiki markup, DokuWiki markup, TWiki markup, TikiWiki markup, Jira markup, Creole 1.0, Haddock markup, OPML, Emacs Org-Mode, Emacs Muse, txt2tags, ipynb (Jupyter notebooks), Vimwiki, Word Docx, ODT, EPUB, FictionBook2, roff man, -Textile, and CSV, and it can write Markdown, reStructuredText, XHTML, HTML 5, -LaTeX, ConTeXt, DocBook, JATS, OPML, TEI, OpenDocument, ODT, Word docx, -PowerPoint pptx, RTF, MediaWiki, DokuWiki, XWiki, ZimWiki, Textile, Jira, roff -man, roff ms, plain text, Emacs Org-Mode, AsciiDoc, Haddock markup, EPUB (v2 -and v3), ipynb, FictionBook2, InDesign ICML, Muse, LaTeX beamer slides, and -several kinds of HTML/JavaScript slide shows (S5, Slidy, Slideous, DZSlides, -reveal.js). +Textile, BibTeX, BibLaTeX, CSL JSON, , and CSV, and it can write Markdown, +reStructuredText, XHTML, HTML 5, LaTeX, ConTeXt, DocBook, JATS, OPML, TEI, +OpenDocument, ODT, Word docx, PowerPoint pptx, RTF, MediaWiki, DokuWiki, XWiki, +ZimWiki, Textile, Jira, roff man, roff ms, plain text, Emacs Org-Mode, +AsciiDoc, Haddock markup, EPUB (v2 and v3), ipynb, FictionBook2, InDesign ICML, +Muse, CSL JSON, LaTeX beamer slides, and several kinds of HTML/JavaScript slide +shows (S5, Slidy, Slideous, DZSlides, reveal.js). In contrast to most existing tools for converting Markdown to HTML, pandoc has a modular design: it consists of a set of readers, which parse text in a given @@ -188,6 +191,7 @@ or texlive-collection-luatex respectively. %package -n ghc-%{name}-doc Summary: Haskell %{name} library documentation BuildArch: noarch +Requires: ghc-filesystem %description -n ghc-%{name}-doc This package provides the Haskell %{name} library documentation. @@ -212,7 +216,10 @@ This package provides the Haskell %{name} profiling library. %ghc_lib_subpackage %{ipynb} %ghc_lib_subpackage %{emojis} %ghc_lib_subpackage %{jirawikimarkup} -%ghc_lib_subpackage -m %{basenoprelude} +%ghc_lib_subpackage %{citeproc} +%ghc_lib_subpackage %{commonmark} +%ghc_lib_subpackage %{commonmarkextensions} +%ghc_lib_subpackage %{commonmarkpandoc} %endif %global version %{main_version} @@ -220,7 +227,7 @@ This package provides the Haskell %{name} profiling library. %prep # Begin cabal-rpm setup: -%setup -q -a1 -a2 -a3 -a4 -a5 +%setup -q -a1 -a2 -a3 -a4 -a5 -a6 -a7 -a8 # End cabal-rpm setup @@ -252,8 +259,6 @@ ln -s pandoc %{buildroot}%{_bindir}/hsmarkdown install -m 0644 -p -D man/pandoc.1 %{buildroot}%{_mandir}/man1/pandoc.1 echo %{_bindir}/jira-wiki-markup >> %{jirawikimarkup}/ghc-jira-wiki-markup.files -mv %{buildroot}%{_defaultlicensedir}/ghc-base-noprelude{,-devel} -echo "%%license %{basenoprelude}/LICENSE" >> %{basenoprelude}/ghc-base-noprelude-devel.files mkdir -p %{buildroot}%{_datadir}/bash-completion/completions/ touch %{buildroot}%{_datadir}/bash-completion/completions/%{name} @@ -300,7 +305,11 @@ touch %{buildroot}%{_datadir}/bash-completion/completions/%{name} %changelog -* Thu Aug 5 2021 Jens Petersen - 2.9.2.1-10 +* Thu Aug 5 2021 Jens Petersen - 2.11.4-12 +- update to 2.11.4 +- drop base-noprelude + +* Thu Aug 5 2021 Jens Petersen - 2.9.2.1-11 - create bash-completion file in post-install * Thu Jul 22 2021 Fedora Release Engineering - 2.9.2.1-10 diff --git a/sources b/sources index 4e55f9f..6897501 100644 --- a/sources +++ b/sources @@ -1,6 +1,9 @@ -SHA512 (base-noprelude-4.13.0.0.tar.gz) = 658ff8e23648d490d97de1083a8412194076f8a0a07fe5843d0d68887225294f296ad2e1c32b9bae3fa32e1f94261aaeb350eec47642edb35ca5ba1dd1a69ecf -SHA512 (emojis-0.1.tar.gz) = 587c67bff3f77c362b16c93889762a9aad6fb5250c0bced45f5053f59dd6a11ab2886e53f286bbc4de2b8793be133708b1f9c5d4d52bcef1820f5a7c1ecfa7d2 -SHA512 (hslua-module-system-0.2.1.tar.gz) = 296d2ee41760d8ee6025562c408f16e78468a9ca53910982fd346a9cf7b8c6df3340fd2d0a7f6ff5fc41c98f0724a733f0ed8bd64cdd18acfb65aa044cd4a99b +SHA512 (pandoc-2.11.4.tar.gz) = ec07c76f3bf71d38bf5a70f2d13b5e60232e1581eb9fddc302b0e15a3cea4dd60d520de249fd5108eb1afa3d853ceefae1651c4f5a82c25ed74c94ab9700aa70 +SHA512 (hslua-module-system-0.2.2.1.tar.gz) = 66cf57b8c80605bdfa5145fc61dbe59b66dd67a82a8365006b80e2ab74a71fff0fdf0ffa690daab66e82b8ad086adbcd622a6844b2107c0b9719b8cdabdf542b SHA512 (ipynb-0.1.0.1.tar.gz) = b1e547ac9353c84619832c723586146d2fd72c85c75d11b9ff99c16852ae2dfd1a2d61382ab9cc54bc9ad2bf8e1c3c0a8dc50d49c034d525e7a3393057a0275b -SHA512 (jira-wiki-markup-1.1.4.tar.gz) = 89a89ca7bc43598c77328cbf93ce6215a446322a6ce5d5bbcb1180cf664be56e26e61d49332006988b27d460ac2a32af466fb974af6b52e2f5d9e69f4821474f -SHA512 (pandoc-2.9.2.1.tar.gz) = 35ac491a7e0a2f6d8fe0f2c2ffe265748b13920904e974f88c92b3f82edb2f1c03e28ebef1bc344ead13d566117a5e50707a68edc49f95159157f974210b23b2 +SHA512 (emojis-0.1.tar.gz) = 587c67bff3f77c362b16c93889762a9aad6fb5250c0bced45f5053f59dd6a11ab2886e53f286bbc4de2b8793be133708b1f9c5d4d52bcef1820f5a7c1ecfa7d2 +SHA512 (jira-wiki-markup-1.3.4.tar.gz) = 762ebecfd8fd903ae348a9f09fa8c610e48a5a8b1b5177a749cb51f94d01d7fdf6f8e078f48797ae94ad8e352d06841189c649ef5131b41470d1390a3e23f481 +SHA512 (citeproc-0.3.0.9.tar.gz) = 48341417e955f8ee4f6ea5e446e37907ed7b75858418c248504d93496b64147d67d7ba5e35ca9033a528982a7650d3013574f5e8686acc085f267e3d6a44b93f +SHA512 (commonmark-0.1.1.4.tar.gz) = d8f8f652a78d6fcc0b623f6750f3735c22d623a3a8e423384ff0778993c0ac65e986bfb37ba939d0c4cda3db95af2289520883579d82372af5cf5e5bb0540657 +SHA512 (commonmark-extensions-0.2.0.4.tar.gz) = 2e595dd6bfc582a783d42ae612a64917470b9fa737d9c445e83e30f7cf7500cd4d3ab5f254268cf9d7434dcd03bdaa88cd38bc4fc50d1423a2792e0d21ffe6e3 +SHA512 (commonmark-pandoc-0.2.0.1.tar.gz) = 5162a987085d5204af27d4b073fedf4d678f5e0325a12f96c611899f3c484e576d7b667271c480837b9d4593e9950828e9398a33c63b5e829016019ecfc7bb6d From c4c0514b94c838c255714b0964ecd4273564b2f6 Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Sun, 8 Aug 2021 18:36:12 +0800 Subject: [PATCH 162/165] update to 2.14.0.3 --- .gitignore | 8 ++++++++ pandoc.spec | 39 ++++++++++++++++++++++++++------------- sources | 14 ++++++++------ 3 files changed, 42 insertions(+), 19 deletions(-) diff --git a/.gitignore b/.gitignore index 2da338b..e75c505 100644 --- a/.gitignore +++ b/.gitignore @@ -47,3 +47,11 @@ /commonmark-pandoc-0.2.0.1.tar.gz /jira-wiki-markup-1.3.4.tar.gz /citeproc-0.3.0.9.tar.gz +/pandoc-2.14.0.3.tar.gz +/jira-wiki-markup-1.4.0.tar.gz +/citeproc-0.4.0.1.tar.gz +/commonmark-0.2.1.tar.gz +/commonmark-extensions-0.2.1.2.tar.gz +/commonmark-pandoc-0.2.1.1.tar.gz +/hslua-module-path-0.1.0.1.tar.gz +/unicode-collation-0.1.3.tar.gz diff --git a/pandoc.spec b/pandoc.spec index 3210321..f63ca7e 100644 --- a/pandoc.spec +++ b/pandoc.spec @@ -1,4 +1,4 @@ -# generated by cabal-rpm-2.0.9 --subpackage +# generated by cabal-rpm-2.0.10 --subpackage # https://docs.fedoraproject.org/en-US/packaging-guidelines/Haskell/ %global pkg_name pandoc @@ -7,19 +7,21 @@ %global hsluamodulesystem hslua-module-system-0.2.2.1 %global ipynb ipynb-0.1.0.1 %global emojis emojis-0.1 -%global jirawikimarkup jira-wiki-markup-1.3.4 -%global citeproc citeproc-0.3.0.9 -%global commonmark commonmark-0.1.1.4 -%global commonmarkextensions commonmark-extensions-0.2.0.4 -%global commonmarkpandoc commonmark-pandoc-0.2.0.1 -%global subpkgs %{hsluamodulesystem} %{ipynb} %{emojis} %{jirawikimarkup} %{citeproc} %{commonmark} %{commonmarkextensions} %{commonmarkpandoc} +%global jirawikimarkup jira-wiki-markup-1.4.0 +%global citeproc citeproc-0.4.0.1 +%global commonmark commonmark-0.2.1 +%global commonmarkextensions commonmark-extensions-0.2.1.2 +%global commonmarkpandoc commonmark-pandoc-0.2.1.1 +%global hsluamodulepath hslua-module-path-0.1.0.1 +%global unicodecollation unicode-collation-0.1.3 +%global subpkgs %{hsluamodulesystem} %{ipynb} %{emojis} %{jirawikimarkup} %{unicodecollation} %{citeproc} %{commonmark} %{commonmarkextensions} %{commonmarkpandoc} %{hsluamodulepath} # testsuite missing deps: tasty-golden tasty-lua Name: %{pkg_name} -Version: 2.11.4 +Version: 2.14.0.3 # can only be reset when all subpkgs bumped -Release: 12%{?dist} +Release: 13%{?dist} Summary: Conversion between markup formats License: GPLv2+ @@ -34,6 +36,8 @@ Source5: https://hackage.haskell.org/package/%{citeproc}/%{citeproc}.tar. Source6: https://hackage.haskell.org/package/%{commonmark}/%{commonmark}.tar.gz Source7: https://hackage.haskell.org/package/%{commonmarkextensions}/%{commonmarkextensions}.tar.gz Source8: https://hackage.haskell.org/package/%{commonmarkpandoc}/%{commonmarkpandoc}.tar.gz +Source9: https://hackage.haskell.org/package/%{hsluamodulepath}/%{hsluamodulepath}.tar.gz +Source10: https://hackage.haskell.org/package/%{unicodecollation}/%{unicodecollation}.tar.gz # End cabal-rpm sources # Begin cabal-rpm deps: @@ -46,6 +50,7 @@ BuildRequires: ghc-JuicyPixels-prof BuildRequires: ghc-SHA-prof BuildRequires: ghc-aeson-prof BuildRequires: ghc-aeson-pretty-prof +BuildRequires: ghc-array-prof BuildRequires: ghc-attoparsec-prof BuildRequires: ghc-base-prof BuildRequires: ghc-base64-bytestring-prof @@ -71,6 +76,7 @@ BuildRequires: ghc-file-embed-prof BuildRequires: ghc-filepath-prof BuildRequires: ghc-haddock-library-prof BuildRequires: ghc-hslua-prof +#BuildRequires: ghc-hslua-module-path-prof #BuildRequires: ghc-hslua-module-system-prof BuildRequires: ghc-hslua-module-text-prof BuildRequires: ghc-http-client-prof @@ -97,23 +103,26 @@ BuildRequires: ghc-texmath-prof BuildRequires: ghc-text-prof BuildRequires: ghc-text-conversions-prof BuildRequires: ghc-time-prof +#BuildRequires: ghc-unicode-collation-prof BuildRequires: ghc-unicode-transforms-prof BuildRequires: ghc-unix-prof BuildRequires: ghc-unordered-containers-prof BuildRequires: ghc-xml-prof +BuildRequires: ghc-xml-conduit-prof BuildRequires: ghc-zip-archive-prof BuildRequires: ghc-zlib-prof Requires: %{name}-common = %{version}-%{release} # for missing dep 'citeproc': -BuildRequires: ghc-rfc5051-prof BuildRequires: ghc-transformers-prof BuildRequires: ghc-uniplate-prof BuildRequires: ghc-vector-prof -BuildRequires: ghc-xml-conduit-prof # for missing dep 'commonmark': BuildRequires: ghc-transformers-prof # for missing dep 'commonmark-extensions': BuildRequires: ghc-transformers-prof +# for missing dep 'unicode-collation': +BuildRequires: ghc-template-haskell-prof +BuildRequires: ghc-th-lift-instances-prof # End cabal-rpm deps %description @@ -220,6 +229,8 @@ This package provides the Haskell %{name} profiling library. %ghc_lib_subpackage %{commonmark} %ghc_lib_subpackage %{commonmarkextensions} %ghc_lib_subpackage %{commonmarkpandoc} +%ghc_lib_subpackage %{hsluamodulepath} +%ghc_lib_subpackage %{unicodecollation} %endif %global version %{main_version} @@ -227,7 +238,7 @@ This package provides the Haskell %{name} profiling library. %prep # Begin cabal-rpm setup: -%setup -q -a1 -a2 -a3 -a4 -a5 -a6 -a7 -a8 +%setup -q -a1 -a2 -a3 -a4 -a5 -a6 -a7 -a8 -a9 -a10 # End cabal-rpm setup @@ -248,7 +259,6 @@ This package provides the Haskell %{name} profiling library. # Begin cabal-rpm install %ghc_libs_install %{subpkgs} %ghc_lib_install -%ghc_fix_rpath %{pkgver} mv %{buildroot}%{_ghcdocdir}{,-common} # End cabal-rpm install @@ -305,6 +315,9 @@ touch %{buildroot}%{_datadir}/bash-completion/completions/%{name} %changelog +* Thu Aug 5 2021 Jens Petersen - 2.14.0.3-13 +- update to 2.14.0.3 + * Thu Aug 5 2021 Jens Petersen - 2.11.4-12 - update to 2.11.4 - drop base-noprelude diff --git a/sources b/sources index 6897501..ec17ed9 100644 --- a/sources +++ b/sources @@ -1,9 +1,11 @@ -SHA512 (pandoc-2.11.4.tar.gz) = ec07c76f3bf71d38bf5a70f2d13b5e60232e1581eb9fddc302b0e15a3cea4dd60d520de249fd5108eb1afa3d853ceefae1651c4f5a82c25ed74c94ab9700aa70 +SHA512 (pandoc-2.14.0.3.tar.gz) = 38ac4f35ac6483e30e234cf5df74795c80594425092fe059cd870d8b8af15249d88655c13477346a7eaf51a0152078e30915867fb55b7cef801074c618f3c262 SHA512 (hslua-module-system-0.2.2.1.tar.gz) = 66cf57b8c80605bdfa5145fc61dbe59b66dd67a82a8365006b80e2ab74a71fff0fdf0ffa690daab66e82b8ad086adbcd622a6844b2107c0b9719b8cdabdf542b SHA512 (ipynb-0.1.0.1.tar.gz) = b1e547ac9353c84619832c723586146d2fd72c85c75d11b9ff99c16852ae2dfd1a2d61382ab9cc54bc9ad2bf8e1c3c0a8dc50d49c034d525e7a3393057a0275b SHA512 (emojis-0.1.tar.gz) = 587c67bff3f77c362b16c93889762a9aad6fb5250c0bced45f5053f59dd6a11ab2886e53f286bbc4de2b8793be133708b1f9c5d4d52bcef1820f5a7c1ecfa7d2 -SHA512 (jira-wiki-markup-1.3.4.tar.gz) = 762ebecfd8fd903ae348a9f09fa8c610e48a5a8b1b5177a749cb51f94d01d7fdf6f8e078f48797ae94ad8e352d06841189c649ef5131b41470d1390a3e23f481 -SHA512 (citeproc-0.3.0.9.tar.gz) = 48341417e955f8ee4f6ea5e446e37907ed7b75858418c248504d93496b64147d67d7ba5e35ca9033a528982a7650d3013574f5e8686acc085f267e3d6a44b93f -SHA512 (commonmark-0.1.1.4.tar.gz) = d8f8f652a78d6fcc0b623f6750f3735c22d623a3a8e423384ff0778993c0ac65e986bfb37ba939d0c4cda3db95af2289520883579d82372af5cf5e5bb0540657 -SHA512 (commonmark-extensions-0.2.0.4.tar.gz) = 2e595dd6bfc582a783d42ae612a64917470b9fa737d9c445e83e30f7cf7500cd4d3ab5f254268cf9d7434dcd03bdaa88cd38bc4fc50d1423a2792e0d21ffe6e3 -SHA512 (commonmark-pandoc-0.2.0.1.tar.gz) = 5162a987085d5204af27d4b073fedf4d678f5e0325a12f96c611899f3c484e576d7b667271c480837b9d4593e9950828e9398a33c63b5e829016019ecfc7bb6d +SHA512 (jira-wiki-markup-1.4.0.tar.gz) = f20bf4b5242657a34cae1aeeb88ba6de61748ccc212243ae6a6d5a4defc3e2ad25445705a87a55d5cb3b6378f5f500887bf509459a66741a75a49025e1549750 +SHA512 (citeproc-0.4.0.1.tar.gz) = 1d9d166a0915eba722c4e6b0af6f987dd48f850f3649c873ecfc6cf4eda4cfea2749c853efd2880e28214eb2e19410a741a950a3532994e6cc9c0dc567e01757 +SHA512 (commonmark-0.2.1.tar.gz) = b91a02d44c95d1691fe8df8e380e4754cda98d0b3c5ec93163a71ecf596c5a5ac9bb54d618a13427211837c80e4e83c4a3dcc7b9ef18655ff0dadddc6121d665 +SHA512 (commonmark-extensions-0.2.1.2.tar.gz) = f2a41ad2f71d67512affc0c5882d86256e7b9f7dce1194c8a6708ba5dfbb0807d8dbdd8a7972c6c2e0a0dcf6695fe68cd1430488756222dc1a545671e0aa10e1 +SHA512 (commonmark-pandoc-0.2.1.1.tar.gz) = fe3dfee3eec4e400c896db5427a6f228b94b71e7bb6d6ace6eead0fe2a495d931e355649f1652cc3b3a928b8abd22f37e6005b3a43d3c95e255c858c89246842 +SHA512 (hslua-module-path-0.1.0.1.tar.gz) = b6448d187ffff02340612c69d28fde429186de44874f52a01b3b3cc77cfe7a105426b4cdbe8e27b13620869a64ac0893abbfc5ffd7d2d500008efb94af00a3bb +SHA512 (unicode-collation-0.1.3.tar.gz) = ad952a10ee259f9c8d43b3d04a4bc4f093de51d3254092b168c79811a0ded2fdf7004a291e999c5f11a8f6971444e7745b471534343ab294325293d1a23b21bc From 345618ff6d9885e72567f690f5470c0d6b70eb96 Mon Sep 17 00:00:00 2001 From: Orion Poplawski Date: Tue, 10 Aug 2021 17:03:31 -0600 Subject: [PATCH 163/165] Fix path in %post --- pandoc.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/pandoc.spec b/pandoc.spec index f63ca7e..c5a350f 100644 --- a/pandoc.spec +++ b/pandoc.spec @@ -21,7 +21,7 @@ Name: %{pkg_name} Version: 2.14.0.3 # can only be reset when all subpkgs bumped -Release: 13%{?dist} +Release: 14%{?dist} Summary: Conversion between markup formats License: GPLv2+ @@ -275,7 +275,7 @@ touch %{buildroot}%{_datadir}/bash-completion/completions/%{name} %post -%{_bindir}%{name} --bash-completion > %{_datadir}/bash-completion/completions/%{name} +%{_bindir}/%{name} --bash-completion > %{_datadir}/bash-completion/completions/%{name} %files @@ -315,6 +315,9 @@ touch %{buildroot}%{_datadir}/bash-completion/completions/%{name} %changelog +* Tue Aug 10 2021 Orion Poplawski - 2.14.0.3-14 +- Fix path in %%post + * Thu Aug 5 2021 Jens Petersen - 2.14.0.3-13 - update to 2.14.0.3 From be22262effd1e95fa25e4bbf1ac78035a99c0750 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= Date: Sat, 8 Jan 2022 11:12:20 +0100 Subject: [PATCH 164/165] Rebuilt for https://fedoraproject.org/wiki/Changes/LIBFFI34 --- pandoc.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pandoc.spec b/pandoc.spec index c5a350f..3e6e6fe 100644 --- a/pandoc.spec +++ b/pandoc.spec @@ -21,7 +21,7 @@ Name: %{pkg_name} Version: 2.14.0.3 # can only be reset when all subpkgs bumped -Release: 14%{?dist} +Release: 15%{?dist} Summary: Conversion between markup formats License: GPLv2+ @@ -315,6 +315,9 @@ touch %{buildroot}%{_datadir}/bash-completion/completions/%{name} %changelog +* Sat Jan 08 2022 Miro Hrončok - 2.14.0.3-15 +- Rebuilt for https://fedoraproject.org/wiki/Changes/LIBFFI34 + * Tue Aug 10 2021 Orion Poplawski - 2.14.0.3-14 - Fix path in %%post From 0b8637175181899be8c7aceaf520c7a092d09e8a Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 20 Jan 2022 22:50:39 +0000 Subject: [PATCH 165/165] - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- pandoc.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pandoc.spec b/pandoc.spec index 3e6e6fe..76471a9 100644 --- a/pandoc.spec +++ b/pandoc.spec @@ -21,7 +21,7 @@ Name: %{pkg_name} Version: 2.14.0.3 # can only be reset when all subpkgs bumped -Release: 15%{?dist} +Release: 16%{?dist} Summary: Conversion between markup formats License: GPLv2+ @@ -315,6 +315,9 @@ touch %{buildroot}%{_datadir}/bash-completion/completions/%{name} %changelog +* Thu Jan 20 2022 Fedora Release Engineering - 2.14.0.3-16 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + * Sat Jan 08 2022 Miro Hrončok - 2.14.0.3-15 - Rebuilt for https://fedoraproject.org/wiki/Changes/LIBFFI34