subpackage new deps: cmark-gfm and hslua-module-text

.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

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 <petersen@redhat.com> - 2.0.6-1
 - update to 2.0.6
+- subpackage 2 new deps
 
 * Mon Dec 11 2017 Jens Petersen <petersen@redhat.com> - 1.19.2.4-2
 - refresh to cabal-rpm-0.12

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