The package rpms/gpick.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/gpick.git/commit/?id=a013ebea5ebf....
Change:
-ExcludeArch: ppc64 ppc64le aarch64 armv7hl s390x
Thanks.
Full change:
============
commit 2a5b7c5d220a7392df009727c3995135ab529dd6
Author: Luya Tshimbalanga <luya(a)fedoraproject.org>
Date: Tue Sep 24 00:55:02 2019 -0700
Clean up files
Patch to include string C header due to gcc 10+
Drop ExcludeArch
diff --git a/.gitignore b/.gitignore
index ab05111..3afae49 100644
--- a/.gitignore
+++ b/.gitignore
@@ -7,3 +7,4 @@
/gpick-0.2.6rc1.tar.gz
/enable_gtk3.patch
/gpick-0.2.6rc1-3b17cf9.tar.gz
+/include.patch
diff --git a/sources b/sources
index ddf9f1c..61843f9 100644
--- a/sources
+++ b/sources
@@ -1 +1,2 @@
SHA512 (gpick-0.2.6rc1-3b17cf9.tar.gz) =
756a3a669d6f3d7c912dd9c502417958807e8b1614ef5549f6b589841b8ea4dd8c5d99e2b0d81cdd0aef861e99704c3b3137c394527c09f8ace3bd46dd9267e3
+SHA512 (include.patch) =
d9a63e2db39f2aaa5ee5a98bfba29148c7c23a882abeabbbe099b34fbbae704bf085d127ea45f362e5a0979ec1457bda431428f91e892552280d79254eab52cf
commit a013ebea5ebf6dac4a66aef307b77366e31a143a
Author: Luya Tshimbalanga <luya(a)fedoraproject.org>
Date: Tue Sep 24 00:54:27 2019 -0700
Clean up files
Patch to include string C header due to gcc 10+
Drop ExcludeArch
diff --git a/gpick-patch0-verbose-compile.patch b/gpick-patch0-verbose-compile.patch
deleted file mode 100644
index 6a50839..0000000
--- a/gpick-patch0-verbose-compile.patch
+++ /dev/null
@@ -1,21 +0,0 @@
---- ./SConscript.verbose 2012-08-04 23:16:47.912902259 +0200
-+++ ./SConscript 2012-08-04 23:17:09.836037307 +0200
-@@ -73,17 +73,6 @@ if not env.GetOption('clean'):
-
- Decider('MD5-timestamp')
-
--env.Replace(
-- SHCCCOMSTR = "Compiling ==> $TARGET",
-- SHCXXCOMSTR = "Compiling ==> $TARGET",
-- CCCOMSTR = "Compiling ==> $TARGET",
-- CXXCOMSTR = "Compiling ==> $TARGET",
-- SHLINKCOMSTR = "Linking shared ==> $TARGET",
-- LINKCOMSTR = "Linking ==> $TARGET",
-- LDMODULECOMSTR = "Linking module ==> $TARGET",
-- ARCOMSTR = "Linking static ==> $TARGET",
-- TARCOMSTR = "Archiving ==> $TARGET"
-- )
-
- if not (os.environ.has_key('CFLAGS') or os.environ.has_key('CXXFLAGS')
or os.environ.has_key('LDFLAGS')):
- if env['DEBUG']:
-
diff --git a/gpick-patch1-fix-svn-release-detect.patch
b/gpick-patch1-fix-svn-release-detect.patch
deleted file mode 100644
index 2151746..0000000
--- a/gpick-patch1-fix-svn-release-detect.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-diff -up ./tools/gpick.py.svnfix ./tools/gpick.py
---- ./tools/gpick.py.svnfix 2012-08-05 00:11:16.526842856 +0200
-+++ ./tools/gpick.py 2012-08-05 00:27:42.413448691 +0200
-@@ -99,8 +99,11 @@ class GpickEnvironment(SConsEnvironment)
-
- def GetVersionInfo(self):
- try:
-- svn_revision = subprocess.Popen(['svnversion', '-n',
self.GetLaunchDir()], shell=False, stdout=subprocess.PIPE).communicate()[0]
-- svn_revision = str(svn_revision)
-+ if not os.path.isdir(self.GetLaunchDir() + '/.svn'):
-+ svn_revision=""
-+ else:
-+ svn_revision = subprocess.Popen(['svnversion', '-n',
self.GetLaunchDir()], shell=False, stdout=subprocess.PIPE).communicate()[0]
-+ svn_revision = str(svn_revision)
- if svn_revision=="exported":
- svn_revision=""
- svn_revision=svn_revision.replace(':','.')
diff --git a/gpick-patch2-fix-system-lualib-detect.patch
b/gpick-patch2-fix-system-lualib-detect.patch
deleted file mode 100644
index 3281e37..0000000
--- a/gpick-patch2-fix-system-lualib-detect.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -up ./SConscript.lua ./SConscript
---- ./SConscript.lua 2012-08-05 01:04:44.948167427 +0200
-+++ ./SConscript 2012-08-05 01:04:58.134242746 +0200
-@@ -60,7 +60,7 @@ if not env.GetOption('clean'):
- }
-
- if not env['INTERNAL_LUA']:
-- libs['LUA_PC'] = {'checks':{'lua':'>= 5.1',
'lua5.1':'>= 5.1'}},
-+ libs['LUA_PC'] = {'checks':{'lua':'>= 5.1',
'lua5.1':'>= 5.1'}}
- if env['WITH_UNIQUE']==True:
- libs['UNIQUE_PC'] = {'checks':{'unique-1.0':'>=
1.0.8'}}
- elif env['WITH_DBUSGLIB']==True:
diff --git a/gpick.spec b/gpick.spec
index 0b5c7d3..a12ad12 100644
--- a/gpick.spec
+++ b/gpick.spec
@@ -15,6 +15,9 @@
Source:
https://github.com/thezbyg/%{name}/archive/%{commit}/%{name}-%{version}
%{!?shortcommit:
Source:
https://github.com/thezbyg/%{name}/archive/%{name}-%{version}rc1.tar.gz#/...
+# This patch addresses the changes from GCC 10+
+# eliminating header indirection
+Patch: include.patch
BuildRequires: gcc-c++
BuildRequires: boost-devel
@@ -31,11 +34,6 @@ BuildRequires: pkgconfig(dbus-glib-1)
BuildRequires: pkgconfig(gtk+-3.0)
BuildRequires: ragel
-# Regression on other arches with F26 mass rebuild
-# Temporarily exclude them
-#
https://bugzilla.redhat.com/show_bug.cgi?id=1419949
-ExcludeArch: ppc64 ppc64le aarch64 armv7hl s390x
-
%description
Advanced color picker
@@ -48,9 +46,9 @@ The %{name}-libs package contains shared library for %{name}.
%prep
%{?shortcommit:
-%autosetup -n %{name}-%{commit}}
+%autosetup -p1 -n %{name}-%{commit}}
%{!?shortcommit:
-%autosetup -n %{name}-%{version}rc1}
+%autosetup -p1 -n %{name}-%{version}rc1}
mkdir .git
# Delete external libraries and only use system dependencies to build GPick
@@ -94,6 +92,11 @@ appstream-util validate-relax --nonet
%{buildroot}%{_metainfodir}/%{name}.appdat
%{_libdir}/*.so
%changelog
+* Mon Sep 23 2019 Luya Tshimbalanga <luya(a)fedoraproject.org> -
0.2.6-0.rc1.20181011git.2
+- Clean up files
+- Patch to include string C header due to gcc 10+
+- Drop ExcludeArch
+
* Thu Jul 25 2019 Fedora Release Engineering <releng(a)fedoraproject.org> -
0.2.6-0.rc1.20181011git.1.1
- Rebuilt for
https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild