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