The package rpms/ghc-doctemplates.git has added or updated architecture specific content
in its
spec file (ExclusiveArch/ExcludeArch or %ifarch/%ifnarch) in commit(s):
https://src.fedoraproject.org/cgit/rpms/ghc-doctemplates.git/commit/?id=1....
Change:
-%ifnarch s390x
Thanks.
Full change:
============
commit 337e38d15369289ced8a02ed0726132c57639f46
Author: Jens Petersen <petersen(a)redhat.com>
Date: Sat Jul 18 21:36:00 2020 +0800
HsYAML was packaged
diff --git a/.gitignore b/.gitignore
index 1de164f..25bdcbe 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,7 +4,6 @@
/doctemplates-0.8.tar.gz
/doclayout-0.2.0.1.tar.gz
/text-conversions-0.3.0.tar.gz
-/HsYAML-0.2.1.0.tar.gz
/errors-2.3.0.tar.gz
/doctemplates-0.8.2.tar.gz
/doclayout-0.3.tar.gz
diff --git a/ghc-doctemplates.spec b/ghc-doctemplates.spec
index 4321809..0ec4b74 100644
--- a/ghc-doctemplates.spec
+++ b/ghc-doctemplates.spec
@@ -4,11 +4,10 @@
%global pkg_name doctemplates
%global pkgver %{pkg_name}-%{version}
-%global HsYAML HsYAML-0.2.1.0
%global doclayout doclayout-0.3
%global errors errors-2.3.0
%global textconversions text-conversions-0.3.0
-%global subpkgs %{HsYAML} %{doclayout} %{errors} %{textconversions}
+%global subpkgs %{doclayout} %{errors} %{textconversions}
# testsuite missing deps: doclayout tasty-golden
@@ -22,16 +21,15 @@ License: BSD
Url:
https://hackage.haskell.org/package/%{pkg_name}
# Begin cabal-rpm sources:
Source0:
https://hackage.haskell.org/package/%{pkgver}/%{pkgver}.tar.gz
-Source1:
https://hackage.haskell.org/package/%{HsYAML}/%{HsYAML}.tar.gz
-Source2:
https://hackage.haskell.org/package/%{doclayout}/%{doclayout}.tar.gz
-Source3:
https://hackage.haskell.org/package/%{errors}/%{errors}.tar.gz
-Source4:
https://hackage.haskell.org/package/%{textconversions}/%{textconversions}...
+Source1:
https://hackage.haskell.org/package/%{doclayout}/%{doclayout}.tar.gz
+Source2:
https://hackage.haskell.org/package/%{errors}/%{errors}.tar.gz
+Source3:
https://hackage.haskell.org/package/%{textconversions}/%{textconversions}...
# End cabal-rpm sources
# Begin cabal-rpm deps:
BuildRequires: ghc-Cabal-devel
BuildRequires: ghc-rpm-macros-extra
-#BuildRequires: ghc-HsYAML-prof
+BuildRequires: ghc-HsYAML-prof
BuildRequires: ghc-aeson-prof
BuildRequires: ghc-base-prof
BuildRequires: ghc-containers-prof
@@ -45,9 +43,6 @@ BuildRequires: ghc-text-prof
#BuildRequires: ghc-text-conversions-prof
BuildRequires: ghc-unordered-containers-prof
BuildRequires: ghc-vector-prof
-# for missing dep 'HsYAML':
-BuildRequires: ghc-bytestring-prof
-BuildRequires: ghc-deepseq-prof
# for missing dep 'errors':
BuildRequires: ghc-exceptions-prof
BuildRequires: ghc-transformers-prof
@@ -102,7 +97,6 @@ This package provides the Haskell %{pkg_name} profiling library.
%global main_version %{version}
%if %{defined ghclibdir}
-%ghc_lib_subpackage %{HsYAML}
%ghc_lib_subpackage %{doclayout}
%ghc_lib_subpackage %{errors}
%ghc_lib_subpackage %{textconversions}
@@ -113,7 +107,7 @@ This package provides the Haskell %{pkg_name} profiling library.
%prep
# Begin cabal-rpm setup:
-%setup -q -n %{pkgver} -a1 -a2 -a3 -a4
+%setup -q -n %{pkgver} -a1 -a2 -a3
# End cabal-rpm setup
@@ -132,6 +126,7 @@ This package provides the Haskell %{pkg_name} profiling library.
rm %{buildroot}%{_datadir}/%{pkgver}/{README.md,changelog.md}
# End cabal-rpm install
+rm %{buildroot}%{_datadir}/%{doclayout}/{README.md,changelog.md}
%files -f %{name}.files
@@ -161,7 +156,7 @@ rm %{buildroot}%{_datadir}/%{pkgver}/{README.md,changelog.md}
* Sun Jun 07 2020 Jens Petersen <petersen(a)redhat.com> - 0.8-1
- update to 0.8
-- subpackage HsYAML, doclayout, text-conversions, and errors
+- subpackage doclayout, text-conversions, and errors
* Wed Feb 19 2020 Jens Petersen <petersen(a)redhat.com> - 0.2.2.1-7
- refresh to cabal-rpm-2.0.2
commit 79c88cad8dfe835c7dc45f1531efbf933796915f
Author: Jens Petersen <petersen(a)redhat.com>
Date: Fri Jun 19 23:55:24 2020 +0800
update to 0.8.2
diff --git a/.gitignore b/.gitignore
index 0bfc6c6..1de164f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -6,3 +6,5 @@
/text-conversions-0.3.0.tar.gz
/HsYAML-0.2.1.0.tar.gz
/errors-2.3.0.tar.gz
+/doctemplates-0.8.2.tar.gz
+/doclayout-0.3.tar.gz
diff --git a/ghc-doctemplates.spec b/ghc-doctemplates.spec
index 497d9cf..4321809 100644
--- a/ghc-doctemplates.spec
+++ b/ghc-doctemplates.spec
@@ -5,7 +5,7 @@
%global pkgver %{pkg_name}-%{version}
%global HsYAML HsYAML-0.2.1.0
-%global doclayout doclayout-0.2.0.1
+%global doclayout doclayout-0.3
%global errors errors-2.3.0
%global textconversions text-conversions-0.3.0
%global subpkgs %{HsYAML} %{doclayout} %{errors} %{textconversions}
@@ -13,9 +13,9 @@
# testsuite missing deps: doclayout tasty-golden
Name: ghc-%{pkg_name}
-Version: 0.8
+Version: 0.8.2
# can only be reset when all subpkgs bumped
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: Pandoc-style document templates
License: BSD
@@ -156,6 +156,9 @@ rm %{buildroot}%{_datadir}/%{pkgver}/{README.md,changelog.md}
%changelog
+* Fri Jun 19 2020 Jens Petersen <petersen(a)redhat.com> - 0.8.2-2
+- update to 0.8.2
+
* Sun Jun 07 2020 Jens Petersen <petersen(a)redhat.com> - 0.8-1
- update to 0.8
- subpackage HsYAML, doclayout, text-conversions, and errors
diff --git a/sources b/sources
index 27ba5d0..4a43866 100644
--- a/sources
+++ b/sources
@@ -1,5 +1,4 @@
-SHA512 (HsYAML-0.2.1.0.tar.gz) =
f8ad41a99e48183835093ad8bf6a3fbdf4b9ad9df3bea46b12efd55a9555c22bd2595c72b1ac2e73379ab47e21f6cbf9022412db8971e1c7c02a32e824f53304
-SHA512 (doclayout-0.2.0.1.tar.gz) =
1a5f847106762a6808c5dd1512a30a3d9cac0c0b4d5f0a9c35c5eb9c6326fe49117c0f317f5b7ff63363c3fbc2c3a9689194aa74e5f21b16045614909d439d9e
-SHA512 (doctemplates-0.8.tar.gz) =
1e83c890c69980cf0ac814b0654427df548f98b47f483d766996b53f0035119ae284fdd33e7145607a199cf13a3a99a6572fb4ad7787217b6232bc96d763efcf
+SHA512 (doclayout-0.3.tar.gz) =
ccb8c41977c5cea47294157c812a31b3be5bddc872915d8baf0d9063d597429606d83e4f7cf9e4aea9b1e1416cbcf732fbbcd71b6659de6510c661f9225d33d0
+SHA512 (doctemplates-0.8.2.tar.gz) =
1e1dbb8f8a2980b342ef3b5c2c0fefa8d0bf220d5ca1332de3dbdf30ab3243fd6f4d12816fa25851498a26c25c5fba1bc2aa6f16eafca11c65bc125a203b90ad
SHA512 (errors-2.3.0.tar.gz) =
dddfc63505fd7023c4a669b3cc3d736cf7ecb774b53dcdfeee2d203dcdf4684f5d149a1c217134de214b64af4e154a3ef08b315615c85a1c734ceb42e80823b4
SHA512 (text-conversions-0.3.0.tar.gz) =
767816f953468932ab579d0cbdd20f7bbe1fc72c4ed8a857bc7bfa52a2d07abafc2065e9844ddea49f44bcf32b06e5c1abd64a222498cc6435129f2b36c036ec
commit 47973fe24cdfd1bad2bd400ada599e527f414cb2
Author: Jens Petersen <petersen(a)redhat.com>
Date: Fri Jun 19 16:54:44 2020 +0800
refresh to cabal-rpm-2.0.6
diff --git a/ghc-doctemplates.spec b/ghc-doctemplates.spec
index ab6b040..497d9cf 100644
--- a/ghc-doctemplates.spec
+++ b/ghc-doctemplates.spec
@@ -1,4 +1,4 @@
-# generated by cabal-rpm-2.0.5 --subpackage
+# generated by cabal-rpm-2.0.6 --subpackage
#
https://docs.fedoraproject.org/en-US/packaging-guidelines/Haskell/
%global pkg_name doctemplates
@@ -134,16 +134,6 @@ rm %{buildroot}%{_datadir}/%{pkgver}/{README.md,changelog.md}
# End cabal-rpm install
-%if 0%{?fedora} < 31 || 0%{?rhel} < 8
-%post devel
-%ghc_pkg_recache
-
-
-%postun devel
-%ghc_pkg_recache
-%endif
-
-
%files -f %{name}.files
# Begin cabal-rpm files:
%license LICENSE
commit 1c5c01add8098ff4eb6a431568c774b7905bd41c
Author: Jens Petersen <petersen(a)redhat.com>
Date: Mon Jun 8 01:57:04 2020 +0800
update to 0.8 with 4 additional deps
diff --git a/.gitignore b/.gitignore
index c14fb77..0bfc6c6 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,8 @@
/doctemplates-0.1.0.2.tar.gz
/doctemplates-0.2.1.tar.gz
/doctemplates-0.2.2.1.tar.gz
+/doctemplates-0.8.tar.gz
+/doclayout-0.2.0.1.tar.gz
+/text-conversions-0.3.0.tar.gz
+/HsYAML-0.2.1.0.tar.gz
+/errors-2.3.0.tar.gz
diff --git a/ghc-doctemplates.spec b/ghc-doctemplates.spec
index 0adddcc..ab6b040 100644
--- a/ghc-doctemplates.spec
+++ b/ghc-doctemplates.spec
@@ -1,49 +1,68 @@
-# generated by cabal-rpm-2.0.5
+# generated by cabal-rpm-2.0.5 --subpackage
#
https://docs.fedoraproject.org/en-US/packaging-guidelines/Haskell/
%global pkg_name doctemplates
%global pkgver %{pkg_name}-%{version}
-%ifnarch s390x
-%bcond_without tests
-%else
-%bcond_with tests
-%endif
+%global HsYAML HsYAML-0.2.1.0
+%global doclayout doclayout-0.2.0.1
+%global errors errors-2.3.0
+%global textconversions text-conversions-0.3.0
+%global subpkgs %{HsYAML} %{doclayout} %{errors} %{textconversions}
+
+# testsuite missing deps: doclayout tasty-golden
Name: ghc-%{pkg_name}
-Version: 0.2.2.1
-Release: 7%{?dist}
+Version: 0.8
+# can only be reset when all subpkgs bumped
+Release: 1%{?dist}
Summary: Pandoc-style document templates
License: BSD
Url:
https://hackage.haskell.org/package/%{pkg_name}
# Begin cabal-rpm sources:
Source0:
https://hackage.haskell.org/package/%{pkgver}/%{pkgver}.tar.gz
+Source1:
https://hackage.haskell.org/package/%{HsYAML}/%{HsYAML}.tar.gz
+Source2:
https://hackage.haskell.org/package/%{doclayout}/%{doclayout}.tar.gz
+Source3:
https://hackage.haskell.org/package/%{errors}/%{errors}.tar.gz
+Source4:
https://hackage.haskell.org/package/%{textconversions}/%{textconversions}...
# End cabal-rpm sources
# Begin cabal-rpm deps:
BuildRequires: ghc-Cabal-devel
-BuildRequires: ghc-rpm-macros
+BuildRequires: ghc-rpm-macros-extra
+#BuildRequires: ghc-HsYAML-prof
BuildRequires: ghc-aeson-prof
BuildRequires: ghc-base-prof
-BuildRequires: ghc-blaze-html-prof
-BuildRequires: ghc-blaze-markup-prof
-BuildRequires: ghc-bytestring-prof
BuildRequires: ghc-containers-prof
+#BuildRequires: ghc-doclayout-prof
+BuildRequires: ghc-filepath-prof
+BuildRequires: ghc-mtl-prof
BuildRequires: ghc-parsec-prof
+BuildRequires: ghc-safe-prof
BuildRequires: ghc-scientific-prof
BuildRequires: ghc-text-prof
+#BuildRequires: ghc-text-conversions-prof
BuildRequires: ghc-unordered-containers-prof
BuildRequires: ghc-vector-prof
-%if %{with tests}
-BuildRequires: ghc-hspec-devel
-%endif
+# for missing dep 'HsYAML':
+BuildRequires: ghc-bytestring-prof
+BuildRequires: ghc-deepseq-prof
+# for missing dep 'errors':
+BuildRequires: ghc-exceptions-prof
+BuildRequires: ghc-transformers-prof
+BuildRequires: ghc-transformers-compat-prof
+# for missing dep 'text-conversions':
+BuildRequires: ghc-base16-bytestring-prof
+BuildRequires: ghc-base64-bytestring-prof
+BuildRequires: ghc-bytestring-prof
# End cabal-rpm deps
%description
-This is the templating system used by pandoc. It was formerly
-a module in pandoc. It has been split off to make it easier
-to use independently.
+This is the text templating system used by pandoc. It supports variable
+interpolation, iteration, tests for non-blank values, pipes, and partials.
+Templates are rendered to doclayout Docs, and variable values may come from a
+variety of different sources, including aeson Values.
%package devel
@@ -80,30 +99,41 @@ This package provides the Haskell %{pkg_name} profiling library.
%endif
+%global main_version %{version}
+
+%if %{defined ghclibdir}
+%ghc_lib_subpackage %{HsYAML}
+%ghc_lib_subpackage %{doclayout}
+%ghc_lib_subpackage %{errors}
+%ghc_lib_subpackage %{textconversions}
+%endif
+
+%global version %{main_version}
+
+
%prep
# Begin cabal-rpm setup:
-%setup -q -n %{pkgver}
+%setup -q -n %{pkgver} -a1 -a2 -a3 -a4
# End cabal-rpm setup
%build
# Begin cabal-rpm build:
+%ghc_libs_build %{subpkgs}
%ghc_lib_build
# End cabal-rpm build
%install
# Begin cabal-rpm install
+%ghc_libs_install %{subpkgs}
%ghc_lib_install
+%ghc_fix_rpath %{pkgver}
-rm %{buildroot}%{_datadir}/%{pkgver}/README.md
+rm %{buildroot}%{_datadir}/%{pkgver}/{README.md,changelog.md}
# End cabal-rpm install
-%check
-%cabal_test
-
-
%if 0%{?fedora} < 31 || 0%{?rhel} < 8
%post devel
%ghc_pkg_recache
@@ -121,7 +151,7 @@ rm %{buildroot}%{_datadir}/%{pkgver}/README.md
%files devel -f %{name}-devel.files
-%doc README.md
+%doc README.md changelog.md
%if %{with haddock}
@@ -136,6 +166,10 @@ rm %{buildroot}%{_datadir}/%{pkgver}/README.md
%changelog
+* Sun Jun 07 2020 Jens Petersen <petersen(a)redhat.com> - 0.8-1
+- update to 0.8
+- subpackage HsYAML, doclayout, text-conversions, and errors
+
* Wed Feb 19 2020 Jens Petersen <petersen(a)redhat.com> - 0.2.2.1-7
- refresh to cabal-rpm-2.0.2
diff --git a/sources b/sources
index 1dbb2fb..27ba5d0 100644
--- a/sources
+++ b/sources
@@ -1 +1,5 @@
-SHA512 (doctemplates-0.2.2.1.tar.gz) =
e1ad0d61dc97a69febf55ad76ee05e6696b76b0df5ee925072e934b977d1ca4c8d9ce0bc9acb311ec1992ce783e86fcaec93a93fc47fecffbd0071f002013485
+SHA512 (HsYAML-0.2.1.0.tar.gz) =
f8ad41a99e48183835093ad8bf6a3fbdf4b9ad9df3bea46b12efd55a9555c22bd2595c72b1ac2e73379ab47e21f6cbf9022412db8971e1c7c02a32e824f53304
+SHA512 (doclayout-0.2.0.1.tar.gz) =
1a5f847106762a6808c5dd1512a30a3d9cac0c0b4d5f0a9c35c5eb9c6326fe49117c0f317f5b7ff63363c3fbc2c3a9689194aa74e5f21b16045614909d439d9e
+SHA512 (doctemplates-0.8.tar.gz) =
1e83c890c69980cf0ac814b0654427df548f98b47f483d766996b53f0035119ae284fdd33e7145607a199cf13a3a99a6572fb4ad7787217b6232bc96d763efcf
+SHA512 (errors-2.3.0.tar.gz) =
dddfc63505fd7023c4a669b3cc3d736cf7ecb774b53dcdfeee2d203dcdf4684f5d149a1c217134de214b64af4e154a3ef08b315615c85a1c734ceb42e80823b4
+SHA512 (text-conversions-0.3.0.tar.gz) =
767816f953468932ab579d0cbdd20f7bbe1fc72c4ed8a857bc7bfa52a2d07abafc2065e9844ddea49f44bcf32b06e5c1abd64a222498cc6435129f2b36c036ec
commit 9c99eabdcac5abc32e668893456424d43e586285
Author: Jens Petersen <petersen(a)redhat.com>
Date: Thu Jun 4 19:26:07 2020 +0800
refresh to cabal-rpm-2.0.5
diff --git a/ghc-doctemplates.spec b/ghc-doctemplates.spec
index 2353627..0adddcc 100644
--- a/ghc-doctemplates.spec
+++ b/ghc-doctemplates.spec
@@ -1,5 +1,5 @@
-# generated by cabal-rpm-2.0.2
-#
https://fedoraproject.org/wiki/Packaging:Haskell
+# generated by cabal-rpm-2.0.5
+#
https://docs.fedoraproject.org/en-US/packaging-guidelines/Haskell/
%global pkg_name doctemplates
%global pkgver %{pkg_name}-%{version}