rpms
/
pandoc
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

cmark-gfm and hslua-module-text are now packaged

This commit is contained in:
Jens Petersen 2018-05-31 00:02:24 +09:00
parent 4ebab17573
commit 61a2894808
2 changed files with 8 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
pandoc.spec
View File

@ -4,26 +4,19 @@
%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: 2%{?dist}
Release: 3%{?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-extra
BuildRequires: ghc-rpm-macros
# Begin cabal-rpm deps:
BuildRequires: chrpath
BuildRequires: ghc-Glob-devel
@ -38,7 +31,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
@ -47,7 +40,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
@ -148,27 +141,15 @@ 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 -a1 -a2
%setup -q
%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}
@ -212,6 +193,9 @@ install -m 0644 -p -D man/pandoc.1 %{buildroot}%{_mandir}/man1/pandoc.1
%changelog
* Thu May 31 2018 Jens Petersen <petersen@redhat.com> - 2.0.6-3
- no longer subpackage cmark-gfm and hslua-module-text
* Thu Feb 08 2018 Fedora Release Engineering <releng@fedoraproject.org> - 2.0.6-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild

2
sources
View File

@ -1,3 +1 @@
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