The package rpms/ghc-gtk.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-gtk.git/commit/?id=8654b14596....
Change:
+ExcludeArch: ppc64le
Thanks.
Full change:
============
commit d2f623db84d4dc82ee795f825a82664e6b6bada1
Author: Jens Petersen <petersen(a)redhat.com>
Date: Tue Oct 8 13:31:49 2019 +0800
patch by peti for glib-2.61 __attribute__ error
https://github.com/gtk2hs/gtk2hs/pull/282
diff --git a/a09720ae8fdc2f9391ba88308312e42d091a4f88.patch
b/a09720ae8fdc2f9391ba88308312e42d091a4f88.patch
new file mode 100644
index 0000000..701defc
--- /dev/null
+++ b/a09720ae8fdc2f9391ba88308312e42d091a4f88.patch
@@ -0,0 +1,26 @@
+From a09720ae8fdc2f9391ba88308312e42d091a4f88 Mon Sep 17 00:00:00 2001
+From: Peter Simons <simons(a)cryp.to>
+Date: Mon, 7 Oct 2019 14:08:40 +0200
+Subject: [PATCH] gtk: ignore the __attribute__(A) annotation introduced in
+ glib-2.61.2
+
+---
+ gtk/gtk.cabal-renamed | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/gtk/gtk.cabal-renamed b/gtk/gtk.cabal-renamed
+index bc2c69f0..695fe443 100644
+--- a/gtk/gtk.cabal
++++ b/gtk/gtk.cabal
+@@ -381,9 +381,9 @@ Library
+ -- needs to be imported from this module:
+ x-Signals-Import: Graphics.UI.Gtk.General.Threading
+ 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=
++ cpp-options: -D_Nullable= -D_Nonnull=
+ if !flag(deprecated)
+ cpp-options: -DDISABLE_DEPRECATED
+ else
diff --git a/ghc-gtk.spec b/ghc-gtk.spec
index 1182789..9d02e90 100644
--- a/ghc-gtk.spec
+++ b/ghc-gtk.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: gtk-Debian-ppc64-work-around-pixel-define.patch
+Patch1:
https://github.com/gtk2hs/gtk2hs/commit/a09720ae8fdc2f9391ba88308312e42d0...
# Begin cabal-rpm deps:
BuildRequires: ghc-Cabal-devel
@@ -88,6 +89,7 @@ This package provides the Haskell %{pkg_name} profiling library.
%ifarch ppc64 ppc64le
%patch0 -p1 -b .orig
%endif
+%patch1 -p2 -b .orig
%build
commit 1041181006d26ba6c00604bdda1a20e6653e6363
Author: Jens Petersen <petersen(a)redhat.com>
Date: Tue Oct 8 11:31:44 2019 +0800
move demo to new doc subpkg
diff --git a/ghc-gtk.spec b/ghc-gtk.spec
index fe9bf41..1182789 100644
--- a/ghc-gtk.spec
+++ b/ghc-gtk.spec
@@ -112,11 +112,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
commit 8654b14596ce1e2050260d082ff248ca5854970b
Author: Jens Petersen <petersen(a)redhat.com>
Date: Tue Oct 8 11:31:31 2019 +0800
exclude ppc64le because of #1737587
diff --git a/ghc-gtk.spec b/ghc-gtk.spec
index d20a3f8..fe9bf41 100644
--- a/ghc-gtk.spec
+++ b/ghc-gtk.spec
@@ -35,6 +35,7 @@ BuildRequires: pkgconfig(gtk+-2.0)
# End cabal-rpm deps
# linking libHSgtk.so needs cc1plus
BuildRequires: gcc-c++
+ExcludeArch: ppc64le
%description
This is the core library of the Gtk2Hs suite of libraries for Haskell based on
@@ -57,7 +58,6 @@ Requires: pkgconfig(gtk+-2.0)
Obsoletes: ghc-gtkglext-devel < 0.11, ghc-soegtk-devel < 0.11, ghc-vte-devel <
0.11
Obsoletes: ghc-gtkglext-prof < 0.11, ghc-soegtk-prof < 0.11, ghc-vte-prof <
0.11
-
%description devel
This package provides the Haskell %{pkg_name} library development files.
@@ -128,6 +128,7 @@ rm -r %{buildroot}%{_datadir}/%{pkg_name}-%{version}
%changelog
* Thu Jul 25 2019 Jens Petersen <petersen(a)redhat.com> - 0.15.2-1
- update to 0.15.2
+- exclude ppc64le because of #1737587
* Thu Jul 25 2019 Fedora Release Engineering <releng(a)fedoraproject.org> -
0.14.10-4
- Rebuilt for
https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
commit 4355662335247d52911ee7ea8601ba95350a6624
Author: Jens Petersen <petersen(a)redhat.com>
Date: Mon Aug 5 18:29:27 2019 +0800
BR prof for lib and static for executable
diff --git a/ghc-gtk.spec b/ghc-gtk.spec
index d098da4..d20a3f8 100644
--- a/ghc-gtk.spec
+++ b/ghc-gtk.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 gtk
@@ -19,22 +19,17 @@ Patch0: gtk-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+-2.0)
# End cabal-rpm deps
@@ -50,6 +45,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 d86072f2552114f8c3fdf9331b93640e53b8e926
Author: Jens Petersen <petersen(a)redhat.com>
Date: Thu Jul 25 15:48:53 2019 +0000
update to 0.15.2
diff --git a/.gitignore b/.gitignore
index 2da79c7..9138b7c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -14,3 +14,4 @@
/gtk-0.14.6.tar.gz
/gtk-0.14.7.tar.gz
/gtk-0.14.10.tar.gz
+/gtk-0.15.2.tar.gz
diff --git a/ghc-gtk.spec b/ghc-gtk.spec
index 1c9a40b..d098da4 100644
--- a/ghc-gtk.spec
+++ b/ghc-gtk.spec
@@ -5,8 +5,8 @@
%global pkgver %{pkg_name}-%{version}
Name: ghc-%{pkg_name}
-Version: 0.14.10
-Release: 4%{?dist}
+Version: 0.15.2
+Release: 1%{?dist}
Summary: Binding to the Gtk+ graphical user interface library
License: LGPLv2+
@@ -130,6 +130,9 @@ rm -r %{buildroot}%{_datadir}/%{pkg_name}-%{version}
%changelog
+* Thu Jul 25 2019 Jens Petersen <petersen(a)redhat.com> - 0.15.2-1
+- update to 0.15.2
+
* Thu Jul 25 2019 Fedora Release Engineering <releng(a)fedoraproject.org> -
0.14.10-4
- Rebuilt for
https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
diff --git a/sources b/sources
index e95d9ef..198a748 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (gtk-0.14.10.tar.gz) =
857fa71391e4bc8d884f5bb5e4f072ebd35b6bbcdc3901b6e28e03e79f4732d56430cf395aabc6007d3f7b1e991dcf0c6e21c9b84ccde96b1943d26ad37243eb
+SHA512 (gtk-0.15.2.tar.gz) =
73ca25f0a76b5da3f22f3936e8502996166ffe32a4a0473875c44256839ef7242727c7a6b959dd1380f919f22d1cbb915f32a9ba9e00741d9f4e2108c77eca3d
commit e6a3ff445acd0b6f2fdaeaa4df08d0a03dbee063
Author: Jens Petersen <petersen(a)redhat.com>
Date: Thu Jul 25 04:23:31 2019 +0000
refresh to cabal-rpm-1.0.0: lib doc/prof subpkgs and bin static BRs
diff --git a/ghc-gtk.spec b/ghc-gtk.spec
index 66be899..1c9a40b 100644
--- a/ghc-gtk.spec
+++ b/ghc-gtk.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 gtk
@@ -18,6 +18,13 @@ Patch0: gtk-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
@@ -44,11 +50,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:
@@ -63,6 +66,25 @@ Obsoletes: ghc-gtkglext-prof < 0.11, ghc-soegtk-prof < 0.11,
ghc-vte-prof < 0.11
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}
@@ -87,14 +109,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
@@ -105,6 +119,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.10-4
- Rebuilt for
https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild