From d622a3a9edabea161974b06ca9b378464dc4bee9 Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Sat, 23 Feb 2019 09:37:18 +0800 Subject: [PATCH] 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