Clean up files
Patch to include string C header due to gcc 10+ Drop ExcludeArch
This commit is contained in:
parent
4065aaffcc
commit
a013ebea5e
|
@ -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']:
|
||||
|
|
@ -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(':','.')
|
|
@ -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:
|
17
gpick.spec
17
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#/%{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@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@fedoraproject.org> - 0.2.6-0.rc1.20181011git.1.1
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
|
||||
|
||||
|
|
Loading…
Reference in New Issue