doc-templates is now packaged in Fedora

pandoc.spec

@@ -4,23 +4,19 @@
 %global pkg_name pandoc
 %global pkgver %{pkg_name}-%{version}
 
-%global doctemplates doctemplates-0.1.0.2
-%global subpkgs %{doctemplates}
-
 %bcond_with tests
 
 Name:           %{pkg_name}
 Version:        1.19.1
-Release:        3%{?dist}
+Release:        6%{?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/%{doctemplates}/%{doctemplates}.tar.gz
 
 BuildRequires:  ghc-Cabal-devel
-BuildRequires:  ghc-rpm-macros-extra
+BuildRequires:  ghc-rpm-macros
 # Begin cabal-rpm deps:
 BuildRequires:  chrpath
 BuildRequires:  ghc-HTTP-devel
@@ -38,7 +34,7 @@ BuildRequires:  ghc-containers-devel
 BuildRequires:  ghc-data-default-devel
 BuildRequires:  ghc-deepseq-devel
 BuildRequires:  ghc-directory-devel
-#BuildRequires:  ghc-doctemplates-devel
+BuildRequires:  ghc-doctemplates-devel
 BuildRequires:  ghc-extensible-exceptions-devel
 BuildRequires:  ghc-filemanip-devel
 BuildRequires:  ghc-filepath-devel
@@ -140,29 +136,17 @@ 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 %{doctemplates}
-%endif
-
-%global version %{main_version}
-
-
 %prep
-%setup -q -a1
+%setup -q
 cabal-tweak-dep-ver directory '< 1.3' '< 1.4'
 
 
 %build
-%ghc_libs_build %{subpkgs}
 %ghc_lib_build
 
 
 %install
-%ghc_libs_install %{subpkgs}
 %ghc_lib_install
-%ghc_fix_rpath %{subpkgs} %{pkgver}
 
 rm %{buildroot}%{_datadir}/%{pkgver}/COPYRIGHT
 
@@ -207,6 +191,9 @@ echo "%%doc %{doctemplates}/README.md" >> %{doctemplates}/ghc-doctemplates-devel
 
 
 %changelog
+* Sun Oct 22 2017 Jens Petersen <petersen@fedoraproject.org> - 1.19.1-6
+- doc-templates is now packaged in Fedora
+
 * Tue Oct 10 2017 Jens Petersen <petersen@redhat.com> - 1.19.1-3
 - enable https (#1497456)
 

sources

@@ -1,2 +1 @@
 SHA512 (pandoc-1.19.1.tar.gz) = b113f632350ee745f3646b9788299a06818bb7ae5ab36f66e63bd6331f684886ece923c2632bd2726a48e66217dddf17b1fdd4182fd502f498b744620117c4af
-SHA512 (doctemplates-0.1.0.2.tar.gz) = 043cc1ff32c7b1b9ac2d528d647c08769ec6ffbf3cbf080422b6f435737030ed4085735ab9c1974bbae87099a31614b66ae800fefab7120e9add5ab03815c430