From ee99a4d9eab96c52b9c6bd11a2b83bd637079ab8 Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Fri, 7 Feb 2020 00:30:15 +0800 Subject: [PATCH] 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