The package rpms/ghc-pango.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-pango.git/commit/?id=a040e9f0....
Change:
+ExcludeArch: ppc64le
Thanks.
Full change:
============
commit 80ff99d5a42288c32cd863ff8c022b74ecbcf0b2
Author: Jens Petersen <petersen(a)redhat.com>
Date: Tue Oct 8 13:22:51 2019 +0800
patch by peti for glib-2.61 __attribute__ error
https://github.com/gtk2hs/gtk2hs/pull/282
diff --git a/0a6016e89ce98415bb395ca0cfafeaacf3b3fce6.patch
b/0a6016e89ce98415bb395ca0cfafeaacf3b3fce6.patch
new file mode 100644
index 0000000..6bf09d4
--- /dev/null
+++ b/0a6016e89ce98415bb395ca0cfafeaacf3b3fce6.patch
@@ -0,0 +1,26 @@
+From 0a6016e89ce98415bb395ca0cfafeaacf3b3fce6 Mon Sep 17 00:00:00 2001
+From: Peter Simons <simons(a)cryp.to>
+Date: Sun, 6 Oct 2019 12:34:25 +0200
+Subject: [PATCH] pango: ignore the __attribute__(A) annotation introduced in
+ glib-2.61.2
+
+---
+ pango/pango.cabal | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/pango/pango.cabal b/pango/pango.cabal
+index 2eef515b..836e457f 100644
+--- a/pango/pango.cabal
++++ b/pango/pango.cabal
+@@ -78,9 +78,9 @@ Library
+ x-c2hs-Header: hspango.h
+ includes: hspango.h
+ include-dirs: .
+- cpp-options: -U__BLOCKS__
++ cpp-options: -U__BLOCKS__ -D__attribute__(A)=
+ if os(darwin) || os(freebsd)
+- cpp-options: -D__attribute__(A)= -D_Nullable= -D_Nonnull= -D_Noreturn=
++ cpp-options: -D_Nullable= -D_Nonnull= -D_Noreturn=
+ if os(windows)
+ cpp-options: -D__USE_MINGW_ANSI_STDIO=1
+ -- Pango 1.26 has a mysterious bug that makes it go into an infinite
diff --git a/ghc-pango.spec b/ghc-pango.spec
index 5ef100b..522e6d2 100644
--- a/ghc-pango.spec
+++ b/ghc-pango.spec
@@ -14,6 +14,7 @@ Url:
https://hackage.haskell.org/package/%{pkg_name}
# Begin cabal-rpm sources:
Source0:
https://hackage.haskell.org/package/%{pkgver}/%{pkgver}.tar.gz
# End cabal-rpm sources
+Patch0:
https://github.com/gtk2hs/gtk2hs/commit/0a6016e89ce98415bb395ca0cfafeaacf...
# Begin cabal-rpm deps:
BuildRequires: ghc-Cabal-devel
@@ -84,6 +85,7 @@ This package provides the Haskell %{pkg_name} profiling library.
# Begin cabal-rpm setup:
%setup -q -n %{pkgver}
# End cabal-rpm setup
+%patch0 -p2 -b .orig
%build
commit 85fbf17fb931e9b52d0eec3ad3a67d082b740e39
Author: Jens Petersen <petersen(a)redhat.com>
Date: Tue Oct 8 11:39:08 2019 +0800
move demo to new doc subpkg
diff --git a/ghc-pango.spec b/ghc-pango.spec
index ac49659..5ef100b 100644
--- a/ghc-pango.spec
+++ b/ghc-pango.spec
@@ -108,11 +108,11 @@ rm -r %{buildroot}%{_datadir}/%{pkgver}
%files devel -f %{name}-devel.files
-%doc demo
%if %{with haddock}
%files doc -f %{name}-doc.files
+%doc demo
%endif
@@ -125,6 +125,7 @@ rm -r %{buildroot}%{_datadir}/%{pkgver}
* Tue Oct 8 2019 Jens Petersen <petersen(a)redhat.com> - 0.13.6.0-1
- update to 0.13.6.0
- exclude ppc64le because of #1737587
+- move demo to doc subpkg
* Thu Jul 25 2019 Fedora Release Engineering <releng(a)fedoraproject.org> -
0.13.5.0-4
- Rebuilt for
https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
commit a040e9f0c81aa823a914bb6bafeb01dcb6e16017
Author: Jens Petersen <petersen(a)redhat.com>
Date: Tue Oct 8 11:38:59 2019 +0800
exclude ppc64le because of #1737587
diff --git a/ghc-pango.spec b/ghc-pango.spec
index 28a16e6..ac49659 100644
--- a/ghc-pango.spec
+++ b/ghc-pango.spec
@@ -34,6 +34,7 @@ BuildRequires: pkgconfig(cairo)
BuildRequires: pkgconfig(pango)
BuildRequires: pkgconfig(pangocairo)
# End cabal-rpm deps
+ExcludeArch: ppc64le
%description
This package provides a wrapper around the Pango C library that allows
@@ -121,8 +122,9 @@ rm -r %{buildroot}%{_datadir}/%{pkgver}
%changelog
-* Thu Jul 25 2019 Jens Petersen <petersen(a)redhat.com> - 0.13.6.0-1
+* Tue Oct 8 2019 Jens Petersen <petersen(a)redhat.com> - 0.13.6.0-1
- update to 0.13.6.0
+- exclude ppc64le because of #1737587
* Thu Jul 25 2019 Fedora Release Engineering <releng(a)fedoraproject.org> -
0.13.5.0-4
- Rebuilt for
https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
commit 3f258b3437df9c994c53fb220672467edc127e28
Author: Jens Petersen <petersen(a)redhat.com>
Date: Mon Aug 5 18:30:58 2019 +0800
BR prof for lib and static for executable
diff --git a/ghc-pango.spec b/ghc-pango.spec
index d0bf48d..28a16e6 100644
--- a/ghc-pango.spec
+++ b/ghc-pango.spec
@@ -1,4 +1,4 @@
-# generated by cabal-rpm-1.0.0
+# generated by cabal-rpm-1.0.1
#
https://fedoraproject.org/wiki/Packaging:Haskell
%global pkg_name pango
@@ -16,27 +16,20 @@ Source0:
https://hackage.haskell.org/package/%{pkgver}/%{pkgver}.tar.gz
# End cabal-rpm sources
# Begin cabal-rpm deps:
-# Setup
BuildRequires: ghc-Cabal-devel
BuildRequires: ghc-filepath-devel
BuildRequires: ghc-gtk2hs-buildtools-devel
-%if %{with haddock}
-BuildRequires: ghc-doc
-%endif
-%if %{with ghc_prof}
-BuildRequires: ghc-prof
-%endif
BuildRequires: ghc-rpm-macros
-# Build
-BuildRequires: ghc-array-devel
-BuildRequires: ghc-cairo-devel
-BuildRequires: ghc-containers-devel
-BuildRequires: ghc-directory-devel
-BuildRequires: ghc-glib-devel
-BuildRequires: ghc-mtl-devel
-BuildRequires: ghc-pretty-devel
-BuildRequires: ghc-process-devel
-BuildRequires: ghc-text-devel
+BuildRequires: ghc-array-prof
+BuildRequires: ghc-base-prof
+BuildRequires: ghc-cairo-prof
+BuildRequires: ghc-containers-prof
+BuildRequires: ghc-directory-prof
+BuildRequires: ghc-glib-prof
+BuildRequires: ghc-mtl-prof
+BuildRequires: ghc-pretty-prof
+BuildRequires: ghc-process-prof
+BuildRequires: ghc-text-prof
BuildRequires: pkgconfig(cairo)
BuildRequires: pkgconfig(pango)
BuildRequires: pkgconfig(pangocairo)
@@ -52,6 +45,7 @@ on-screen.
%package devel
Summary: Haskell %{pkg_name} library development files
Provides: %{name}-static = %{version}-%{release}
+Provides: %{name}-static%{?_isa} = %{version}-%{release}
%if %{defined ghc_version}
Requires: ghc-compiler = %{ghc_version}
%endif
@@ -103,7 +97,7 @@ This package provides the Haskell %{pkg_name} profiling library.
# End cabal-rpm install
# demo files
-rm -r %{buildroot}%{_datadir}/%{pkg_name}-%{version}
+rm -r %{buildroot}%{_datadir}/%{pkgver}
%files -f %{name}.files
commit fcd619e1ca8bf594b57d072920f373155f36a345
Author: Jens Petersen <petersen(a)redhat.com>
Date: Thu Jul 25 16:19:55 2019 +0000
update to 0.13.6.0
diff --git a/.gitignore b/.gitignore
index 62d1beb..4b26188 100644
--- a/.gitignore
+++ b/.gitignore
@@ -12,3 +12,4 @@
/pango-0.13.3.1.tar.gz
/pango-0.13.4.0.tar.gz
/pango-0.13.5.0.tar.gz
+/pango-0.13.6.0.tar.gz
diff --git a/ghc-pango.spec b/ghc-pango.spec
index 871b0d8..d0bf48d 100644
--- a/ghc-pango.spec
+++ b/ghc-pango.spec
@@ -5,8 +5,8 @@
%global pkgver %{pkg_name}-%{version}
Name: ghc-%{pkg_name}
-Version: 0.13.5.0
-Release: 4%{?dist}
+Version: 0.13.6.0
+Release: 1%{?dist}
Summary: Binding to the Pango text rendering engine
License: LGPLv2+
@@ -127,6 +127,9 @@ rm -r %{buildroot}%{_datadir}/%{pkg_name}-%{version}
%changelog
+* Thu Jul 25 2019 Jens Petersen <petersen(a)redhat.com> - 0.13.6.0-1
+- update to 0.13.6.0
+
* Thu Jul 25 2019 Fedora Release Engineering <releng(a)fedoraproject.org> -
0.13.5.0-4
- Rebuilt for
https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
diff --git a/sources b/sources
index b1a8455..a31c754 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (pango-0.13.5.0.tar.gz) =
d1d6e61118f193d0849e44a2f589391e36f9e6bc80cbf45071d01384e12f600158cad11a49b194388baa1c8c8941a16f8b147a67982016bd9b95035a5f108827
+SHA512 (pango-0.13.6.0.tar.gz) =
03a3e133499d202e6d6b1471db287ef1f0f8933b6112e367ce20450d171e8713ffe0caea46ba60fc7ead6c47548cd8bcaf1fe39bb2423099f1c2980484864a8d
commit 8c76bc4b1e5fac4c49d8b9189e875c1a7f5efba8
Author: Jens Petersen <petersen(a)redhat.com>
Date: Thu Jul 25 04:25:02 2019 +0000
refresh to cabal-rpm-1.0.0: lib doc/prof subpkgs and bin static BRs
diff --git a/ghc-pango.spec b/ghc-pango.spec
index 52a3a15..871b0d8 100644
--- a/ghc-pango.spec
+++ b/ghc-pango.spec
@@ -1,4 +1,4 @@
-# generated by cabal-rpm-0.13
+# generated by cabal-rpm-1.0.0
#
https://fedoraproject.org/wiki/Packaging:Haskell
%global pkg_name pango
@@ -16,15 +16,23 @@ Source0:
https://hackage.haskell.org/package/%{pkgver}/%{pkgver}.tar.gz
# End cabal-rpm sources
# Begin cabal-rpm deps:
+# Setup
BuildRequires: ghc-Cabal-devel
+BuildRequires: ghc-filepath-devel
+BuildRequires: ghc-gtk2hs-buildtools-devel
+%if %{with haddock}
+BuildRequires: ghc-doc
+%endif
+%if %{with ghc_prof}
+BuildRequires: ghc-prof
+%endif
BuildRequires: ghc-rpm-macros
+# Build
BuildRequires: ghc-array-devel
BuildRequires: ghc-cairo-devel
BuildRequires: ghc-containers-devel
BuildRequires: ghc-directory-devel
-BuildRequires: ghc-filepath-devel
BuildRequires: ghc-glib-devel
-BuildRequires: ghc-gtk2hs-buildtools-devel
BuildRequires: ghc-mtl-devel
BuildRequires: ghc-pretty-devel
BuildRequires: ghc-process-devel
@@ -44,11 +52,8 @@ on-screen.
%package devel
Summary: Haskell %{pkg_name} library development files
Provides: %{name}-static = %{version}-%{release}
-Provides: %{name}-doc = %{version}-%{release}
%if %{defined ghc_version}
Requires: ghc-compiler = %{ghc_version}
-Requires(post): ghc-compiler = %{ghc_version}
-Requires(postun): ghc-compiler = %{ghc_version}
%endif
Requires: %{name}%{?_isa} = %{version}-%{release}
# Begin cabal-rpm deps:
@@ -61,6 +66,25 @@ Requires: pkgconfig(pangocairo)
This package provides the Haskell %{pkg_name} library development files.
+%if %{with haddock}
+%package doc
+Summary: Haskell %{pkg_name} library documentation
+
+%description doc
+This package provides the Haskell %{pkg_name} library documentation.
+%endif
+
+
+%if %{with ghc_prof}
+%package prof
+Summary: Haskell %{pkg_name} profiling library
+Requires: %{name}-devel%{?_isa} = %{version}-%{release}
+
+%description prof
+This package provides the Haskell %{pkg_name} profiling library.
+%endif
+
+
%prep
# Begin cabal-rpm setup:
%setup -q -n %{pkgver}
@@ -82,14 +106,6 @@ This package provides the Haskell %{pkg_name} library development
files.
rm -r %{buildroot}%{_datadir}/%{pkg_name}-%{version}
-%post devel
-%ghc_pkg_recache
-
-
-%postun devel
-%ghc_pkg_recache
-
-
%files -f %{name}.files
# Begin cabal-rpm files:
%license COPYING
@@ -100,6 +116,16 @@ rm -r %{buildroot}%{_datadir}/%{pkg_name}-%{version}
%doc demo
+%if %{with haddock}
+%files doc -f %{name}-doc.files
+%endif
+
+
+%if %{with ghc_prof}
+%files prof -f %{name}-prof.files
+%endif
+
+
%changelog
* Thu Jul 25 2019 Fedora Release Engineering <releng(a)fedoraproject.org> -
0.13.5.0-4
- Rebuilt for
https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild