The package rpms/ghc-gtk3.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-gtk3.git/commit/?id=f12c82acd....
Change:
+ExcludeArch: ppc64le
Thanks.
Full change:
============
commit 727674928066a387982dc171a32a0245bb760fc1
Author: Jens Petersen <petersen(a)redhat.com>
Date: Tue Oct 8 20:40:31 2019 +0800
quote patch1 macro
diff --git a/ghc-gtk3.spec b/ghc-gtk3.spec
index 59aedf3..8213b57 100644
--- a/ghc-gtk3.spec
+++ b/ghc-gtk3.spec
@@ -85,7 +85,7 @@ This package provides the Haskell %{pkg_name} profiling library.
%ifarch ppc64 ppc64le
%patch0 -p1 -b .orig
%endif
-patch1 -p2 -b .orig
+%patch1 -p2 -b .orig
%build
commit 4962629eef92fe88ba4187a872a0b6dd89b8eebe
Author: Jens Petersen <petersen(a)redhat.com>
Date: Tue Oct 8 13:25:40 2019 +0800
patch by peti for glib-2.61 __attribute__ error
https://github.com/gtk2hs/gtk2hs/pull/282
diff --git a/cc0d8e8ef9bdffc776182a1f92225750bfea8f57.patch
b/cc0d8e8ef9bdffc776182a1f92225750bfea8f57.patch
new file mode 100644
index 0000000..a11fed4
--- /dev/null
+++ b/cc0d8e8ef9bdffc776182a1f92225750bfea8f57.patch
@@ -0,0 +1,26 @@
+From cc0d8e8ef9bdffc776182a1f92225750bfea8f57 Mon Sep 17 00:00:00 2001
+From: Peter Simons <simons(a)cryp.to>
+Date: Mon, 7 Oct 2019 13:48:53 +0200
+Subject: [PATCH] gtk3: ignore the __attribute__(A) annotation introduced in
+ glib-2.61.2
+
+---
+ gtk/gtk3.cabal | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/gtk/gtk3.cabal b/gtk/gtk3.cabal
+index 10a27cd9..c297b20f 100644
+--- a/gtk/gtk3.cabal
++++ b/gtk/gtk3.cabal
+@@ -372,9 +372,9 @@ Library
+ -- needs to be imported from this module:
+ x-Signals-Import: Graphics.UI.Gtk.General.Threading
+ include-dirs: .
+- cpp-options: -DDISABLE_DEPRECATED -U__BLOCKS__
++ cpp-options: -DDISABLE_DEPRECATED -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: -DWIN32 -fno-exceptions
+ cc-options: -fno-exceptions
diff --git a/ghc-gtk3.spec b/ghc-gtk3.spec
index 5b70d46..59aedf3 100644
--- a/ghc-gtk3.spec
+++ b/ghc-gtk3.spec
@@ -15,6 +15,7 @@ Url:
https://hackage.haskell.org/package/%{pkg_name}
Source0:
https://hackage.haskell.org/package/%{pkgver}/%{pkgver}.tar.gz
# End cabal-rpm sources
Patch0: gtk3-Debian-ppc64-work-around-pixel-define.patch
+Patch1:
https://github.com/gtk2hs/gtk2hs/commit/cc0d8e8ef9bdffc776182a1f92225750b...
# Begin cabal-rpm deps:
BuildRequires: ghc-Cabal-devel
@@ -84,6 +85,7 @@ This package provides the Haskell %{pkg_name} profiling library.
%ifarch ppc64 ppc64le
%patch0 -p1 -b .orig
%endif
+patch1 -p2 -b .orig
%build
commit 1f534ac7d549fb6d84e6714dae6d896e36f996c9
Author: Jens Petersen <petersen(a)redhat.com>
Date: Tue Oct 8 11:34:38 2019 +0800
move demo to new doc subpkg
diff --git a/ghc-gtk3.spec b/ghc-gtk3.spec
index 7b15028..5b70d46 100644
--- a/ghc-gtk3.spec
+++ b/ghc-gtk3.spec
@@ -108,11 +108,11 @@ rm -r %{buildroot}%{_datadir}/%{pkg_name}-%{version}
%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}/%{pkg_name}-%{version}
* Tue Oct 8 2019 Jens Petersen <petersen(a)redhat.com> - 0.15.1-1
- update to 0.15.1
- exclude ppc64le because of #1737587
+- move demo/ to new doc subpkg
* Thu Jul 25 2019 Fedora Release Engineering <releng(a)fedoraproject.org> - 0.14.9-4
- Rebuilt for
https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
commit f12c82acd86252d22bc263af04e9e2366c064204
Author: Jens Petersen <petersen(a)redhat.com>
Date: Tue Oct 8 11:34:24 2019 +0800
exclude ppc64le because of #1737587
diff --git a/ghc-gtk3.spec b/ghc-gtk3.spec
index 3a7bd57..7b15028 100644
--- a/ghc-gtk3.spec
+++ b/ghc-gtk3.spec
@@ -33,6 +33,7 @@ BuildRequires: ghc-text-prof
BuildRequires: pkgconfig(gthread-2.0)
BuildRequires: pkgconfig(gtk+-3.0)
# End cabal-rpm deps
+ExcludeArch: ppc64le
%description
This is the core library of the Gtk2Hs suite of libraries for Haskell based on
@@ -121,8 +122,9 @@ rm -r %{buildroot}%{_datadir}/%{pkg_name}-%{version}
%changelog
-* Thu Jul 25 2019 Jens Petersen <petersen(a)redhat.com> - 0.15.1-1
+* Tue Oct 8 2019 Jens Petersen <petersen(a)redhat.com> - 0.15.1-1
- update to 0.15.1
+- exclude ppc64le because of #1737587
* Thu Jul 25 2019 Fedora Release Engineering <releng(a)fedoraproject.org> - 0.14.9-4
- Rebuilt for
https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
commit acff17308008e50860a5910780d09b302a3830f4
Author: Jens Petersen <petersen(a)redhat.com>
Date: Mon Aug 5 18:29:28 2019 +0800
BR prof for lib and static for executable
diff --git a/ghc-gtk3.spec b/ghc-gtk3.spec
index dcb2250..3a7bd57 100644
--- a/ghc-gtk3.spec
+++ b/ghc-gtk3.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 gtk3
@@ -19,22 +19,17 @@ Patch0: gtk3-Debian-ppc64-work-around-pixel-define.patch
# Begin cabal-rpm deps:
BuildRequires: ghc-Cabal-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
-BuildRequires: ghc-array-devel
-BuildRequires: ghc-bytestring-devel
-BuildRequires: ghc-cairo-devel
-BuildRequires: ghc-containers-devel
-BuildRequires: ghc-gio-devel
-BuildRequires: ghc-glib-devel
-BuildRequires: ghc-mtl-devel
-BuildRequires: ghc-pango-devel
-BuildRequires: ghc-text-devel
+BuildRequires: ghc-array-prof
+BuildRequires: ghc-base-prof
+BuildRequires: ghc-bytestring-prof
+BuildRequires: ghc-cairo-prof
+BuildRequires: ghc-containers-prof
+BuildRequires: ghc-gio-prof
+BuildRequires: ghc-glib-prof
+BuildRequires: ghc-mtl-prof
+BuildRequires: ghc-pango-prof
+BuildRequires: ghc-text-prof
BuildRequires: pkgconfig(gthread-2.0)
BuildRequires: pkgconfig(gtk+-3.0)
# End cabal-rpm deps
@@ -48,6 +43,7 @@ graphical user interfaces.
%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
commit 169c57c6eca6b127ce59a4b26aeab727c553390f
Author: Jens Petersen <petersen(a)redhat.com>
Date: Thu Jul 25 15:49:26 2019 +0000
update to 0.15.1
diff --git a/.gitignore b/.gitignore
index 2490a26..8f07047 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,3 +4,4 @@
/gtk3-0.14.6.tar.gz
/gtk3-0.14.8.tar.gz
/gtk3-0.14.9.tar.gz
+/gtk3-0.15.1.tar.gz
diff --git a/ghc-gtk3.spec b/ghc-gtk3.spec
index 8544e50..dcb2250 100644
--- a/ghc-gtk3.spec
+++ b/ghc-gtk3.spec
@@ -5,8 +5,8 @@
%global pkgver %{pkg_name}-%{version}
Name: ghc-%{pkg_name}
-Version: 0.14.9
-Release: 4%{?dist}
+Version: 0.15.1
+Release: 1%{?dist}
Summary: Binding to the Gtk+ 3 graphical user interface library
License: LGPLv2+
@@ -125,6 +125,9 @@ rm -r %{buildroot}%{_datadir}/%{pkg_name}-%{version}
%changelog
+* Thu Jul 25 2019 Jens Petersen <petersen(a)redhat.com> - 0.15.1-1
+- update to 0.15.1
+
* Thu Jul 25 2019 Fedora Release Engineering <releng(a)fedoraproject.org> - 0.14.9-4
- Rebuilt for
https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
diff --git a/sources b/sources
index cb6fad8..cbb835d 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (gtk3-0.14.9.tar.gz) =
aaf2a257c74f5b0a569d0e61aef535e2f0c8158feb34bed523c7aff31cf155098f93d3a88ba49bea906ae669bf63fb0486f4c747a620c2199c2e7859486e7270
+SHA512 (gtk3-0.15.1.tar.gz) =
98e825865c65fc49d573144328b40b397e7491dcfc8e7bc8b128f2665d60b670a54255c4170fc7ada3f8891c54418a5d852fd5cb74be48068eb8f862b80aa201
commit c7223d8e01449077b52c6ce0ce74677eab9d989f
Author: Jens Petersen <petersen(a)redhat.com>
Date: Thu Jul 25 04:23:32 2019 +0000
refresh to cabal-rpm-1.0.0: lib doc/prof subpkgs and bin static BRs
diff --git a/ghc-gtk3.spec b/ghc-gtk3.spec
index 93ff031..8544e50 100644
--- a/ghc-gtk3.spec
+++ b/ghc-gtk3.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 gtk3
@@ -18,6 +18,13 @@ Patch0: gtk3-Debian-ppc64-work-around-pixel-define.patch
# Begin cabal-rpm deps:
BuildRequires: ghc-Cabal-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
BuildRequires: ghc-array-devel
BuildRequires: ghc-bytestring-devel
@@ -25,7 +32,6 @@ BuildRequires: ghc-cairo-devel
BuildRequires: ghc-containers-devel
BuildRequires: ghc-gio-devel
BuildRequires: ghc-glib-devel
-BuildRequires: ghc-gtk2hs-buildtools-devel
BuildRequires: ghc-mtl-devel
BuildRequires: ghc-pango-devel
BuildRequires: ghc-text-devel
@@ -42,11 +48,8 @@ graphical user interfaces.
%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:
@@ -58,6 +61,25 @@ Requires: pkgconfig(gtk+-3.0)
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 +104,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 +114,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.14.9-4
- Rebuilt for
https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild