The package rpms/ghc-gio.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-gio.git/commit/?id=355cd1f4fe....
Change:
+ExcludeArch: ppc64le
Thanks.
Full change:
============
commit cf9236783c03ea1b8f4fd6b8255e7a16641edcdb
Author: Jens Petersen <petersen(a)redhat.com>
Date: Tue Oct 8 13:27:52 2019 +0800
patch by peti for glib-2.61 __attribute__ error
https://github.com/gtk2hs/gtk2hs/pull/282
diff --git a/f0f7cf524f1beaf227d8cce140abdf7c45efc8c6.patch
b/f0f7cf524f1beaf227d8cce140abdf7c45efc8c6.patch
new file mode 100644
index 0000000..500f0c4
--- /dev/null
+++ b/f0f7cf524f1beaf227d8cce140abdf7c45efc8c6.patch
@@ -0,0 +1,28 @@
+From f0f7cf524f1beaf227d8cce140abdf7c45efc8c6 Mon Sep 17 00:00:00 2001
+From: Peter Simons <simons(a)cryp.to>
+Date: Mon, 7 Oct 2019 14:00:54 +0200
+Subject: [PATCH] gio: ignore the __attribute__(A) annotation introduced in
+ glib-2.61.2
+
+---
+ gio/gio.cabal | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/gio/gio.cabal b/gio/gio.cabal
+index be64b529..47a880a3 100644
+--- a/gio/gio.cabal
++++ b/gio/gio.cabal
+@@ -80,10 +80,10 @@ Library
+
+ default-language: Haskell98
+ default-extensions: ForeignFunctionInterface
+-
+- cpp-options: -U__BLOCKS__ -Ubool
++
++ cpp-options: -U__BLOCKS__ -Ubool -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=
+
+ x-Signals-File: System/GIO/Signals.chs
+ x-Signals-Modname: System.GIO.Signals
diff --git a/ghc-gio.spec b/ghc-gio.spec
index 1923c06..0c1a157 100644
--- a/ghc-gio.spec
+++ b/ghc-gio.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/f0f7cf524f1beaf227d8cce140abdf7c4...
# Begin cabal-rpm deps:
BuildRequires: ghc-Cabal-devel
@@ -76,6 +77,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 85096ba88c77aa8cbb81f8418d1968c65fa25a6e
Author: Jens Petersen <petersen(a)redhat.com>
Date: Tue Oct 8 11:24:40 2019 +0800
move the demo to doc subpkg
diff --git a/ghc-gio.spec b/ghc-gio.spec
index 597d9ac..1923c06 100644
--- a/ghc-gio.spec
+++ b/ghc-gio.spec
@@ -100,11 +100,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 355cd1f4fed42dafd8cc6bc9d4829a9623a66634
Author: Jens Petersen <petersen(a)redhat.com>
Date: Tue Oct 8 11:22:07 2019 +0800
exclude ppc64le, because of #1737587
diff --git a/ghc-gio.spec b/ghc-gio.spec
index fef9247..597d9ac 100644
--- a/ghc-gio.spec
+++ b/ghc-gio.spec
@@ -27,6 +27,7 @@ BuildRequires: ghc-glib-prof
BuildRequires: ghc-mtl-prof
BuildRequires: pkgconfig(gio-2.0)
# End cabal-rpm deps
+ExcludeArch: ppc64le
%description
GIO is striving to provide a modern, easy-to-use VFS API that sits at the right
@@ -115,6 +116,7 @@ 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
+- exclude ppc64le (#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 0df8882a52730b2fed79a37039b81cc8f9311b85
Author: Jens Petersen <petersen(a)redhat.com>
Date: Mon Aug 5 18:29:25 2019 +0800
BR prof for lib and static for executable
diff --git a/ghc-gio.spec b/ghc-gio.spec
index becf769..fef9247 100644
--- a/ghc-gio.spec
+++ b/ghc-gio.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 gio
@@ -18,18 +18,13 @@ Source0:
https://hackage.haskell.org/package/%{pkgver}/%{pkgver}.tar.gz
# 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-containers-devel
-BuildRequires: ghc-glib-devel
-BuildRequires: ghc-mtl-devel
+BuildRequires: ghc-array-prof
+BuildRequires: ghc-base-prof
+BuildRequires: ghc-bytestring-prof
+BuildRequires: ghc-containers-prof
+BuildRequires: ghc-glib-prof
+BuildRequires: ghc-mtl-prof
BuildRequires: pkgconfig(gio-2.0)
# End cabal-rpm deps
@@ -44,6 +39,7 @@ cloning the POSIX API, but providing higher-level, document-centric
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 919776b7681a77f3c43540fc54913712924fcc39
Author: Jens Petersen <petersen(a)redhat.com>
Date: Thu Jul 25 15:47:49 2019 +0000
update to 0.13.6.0
diff --git a/.gitignore b/.gitignore
index b195434..8fb91f8 100644
--- a/.gitignore
+++ b/.gitignore
@@ -13,3 +13,4 @@
/gio-0.13.3.1.tar.gz
/gio-0.13.4.1.tar.gz
/gio-0.13.5.0.tar.gz
+/gio-0.13.6.0.tar.gz
diff --git a/ghc-gio.spec b/ghc-gio.spec
index 3bd4ebf..becf769 100644
--- a/ghc-gio.spec
+++ b/ghc-gio.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 GIO
License: LGPLv2+
@@ -117,6 +117,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 095814f..d9d1e2b 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (gio-0.13.5.0.tar.gz) =
08ad3f867a8f57d12f9327e014a3f483962d0115d7c1b6e185b50b2f47692f5d584fb883f64575f0a94830f43d64c4d57ce236f13699fa8d04b841cc08436cf5
+SHA512 (gio-0.13.6.0.tar.gz) =
d9bd77f887d7112d878b7349b7c79dcaf483ac5567d9fea0e902c161700eeb9be9b574584b440ccd580c504b1b76b0bc2b4d6d30de2c3b1a05c72c8f67790de9
commit 1415082f0e2f864addc4c7d8f78089869d613347
Author: Jens Petersen <petersen(a)redhat.com>
Date: Thu Jul 25 04:23:29 2019 +0000
refresh to cabal-rpm-1.0.0: lib doc/prof subpkgs and bin static BRs
diff --git a/ghc-gio.spec b/ghc-gio.spec
index d753166..3bd4ebf 100644
--- a/ghc-gio.spec
+++ b/ghc-gio.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 gio
@@ -17,12 +17,18 @@ Source0:
https://hackage.haskell.org/package/%{pkgver}/%{pkgver}.tar.gz
# 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-containers-devel
BuildRequires: ghc-glib-devel
-BuildRequires: ghc-gtk2hs-buildtools-devel
BuildRequires: ghc-mtl-devel
BuildRequires: pkgconfig(gio-2.0)
# End cabal-rpm deps
@@ -38,11 +44,8 @@ cloning the POSIX API, but providing higher-level, document-centric
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:
@@ -53,6 +56,25 @@ Requires: pkgconfig(gio-2.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}
@@ -74,14 +96,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
@@ -92,6 +106,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