static executable; common subpackage; refresh to cabal-rpm-0.13

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}
+# End cabal-rpm install
-mv %{buildroot}%{_ghclicensedir}/{,ghc-}%{name}
 
 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
+%doc AUTHORS.md BUGS CONTRIBUTING.md README.md
-%attr(755,root,root) %{_bindir}/%{name}
+%{_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 <petersen@redhat.com> - 2.1.2-2
+- rebuild for static executable
+- resurrect common subpackage
+
 * Sat Jul 28 2018 Jens Petersen <petersen@redhat.com> - 2.1.2-1
 - update to 2.1.2