[gpick] imported srpm file
Luya Tshimbalanga
luya at fedoraproject.org
Thu Apr 18 17:04:01 UTC 2013
commit e0759ff2e1e8ae719a1fe4a0f26525567f18acae
Author: Luya Tshimbalanga <luya at fedoraproject.org>
Date: Thu Apr 18 09:57:10 2013 -0700
imported srpm file
.gitignore | 1 +
gpick-patch0-verbose-compile.patch | 21 +++++++
gpick-patch1-fix-svn-release-detect.patch | 17 ++++++
gpick-patch2-fix-system-lualib-detect.patch | 12 ++++
gpick.spec | 84 +++++++++++++++++++++++++++
sources | 1 +
6 files changed, 136 insertions(+), 0 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index e69de29..2ee8874 100644
--- a/.gitignore
+++ b/.gitignore
@@ -0,0 +1 @@
+/gpick_0.2.4.tar.gz
diff --git a/gpick-patch0-verbose-compile.patch b/gpick-patch0-verbose-compile.patch
new file mode 100644
index 0000000..6a50839
--- /dev/null
+++ b/gpick-patch0-verbose-compile.patch
@@ -0,0 +1,21 @@
+--- ./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
new file mode 100644
index 0000000..2151746
--- /dev/null
+++ b/gpick-patch1-fix-svn-release-detect.patch
@@ -0,0 +1,17 @@
+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
new file mode 100644
index 0000000..3281e37
--- /dev/null
+++ b/gpick-patch2-fix-system-lualib-detect.patch
@@ -0,0 +1,12 @@
+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
new file mode 100644
index 0000000..c1dac50
--- /dev/null
+++ b/gpick.spec
@@ -0,0 +1,84 @@
+Name: gpick
+Version: 0.2.4
+Release: 4%{?dist}
+Summary: Advanced color picker
+
+License: BSD
+URL: http://code.google.com/p/gpick/
+Source0: http://gpick.googlecode.com/files/%{name}_%{version}.tar.gz
+
+# Make the build more verbous (patch submitted and merged upstream)
+Patch0: %{name}-patch0-verbose-compile.patch
+# Fix build issues with exported SVN code
+Patch1: %{name}-patch1-fix-svn-release-detect.patch
+# Fix Lua detection
+Patch2: %{name}-patch2-fix-system-lualib-detect.patch
+
+BuildRequires: scons
+BuildRequires: boost-devel
+BuildRequires: pkgconfig(lua)
+BuildRequires: pkgconfig(dbus-glib-1)
+BuildRequires: pkgconfig(gtk+-2.0)
+BuildRequires: flex
+BuildRequires: expat-devel
+BuildRequires: desktop-file-utils
+
+%description
+Advanced color picker
+
+%prep
+%setup -q -n %{name}_%{version}
+%patch0
+%patch1
+%patch2
+
+# Delete external libraries and only use system dependencies to build GPick
+rm -rf extern
+echo "INTERNAL_EXPAT=False" >> user-config.py
+echo "INTERNAL_LUA=False" >> user-config.py
+
+
+%build
+scons %{?_smp_mflags} CFLAGS="%{optflags}" CXXFLAGS="%{optflags}" LDFLAGS="%{optflags}"
+
+%install
+export CFLAGS="%{optflags}"
+export CXXFLAGS="%{optflags}"
+export LDFLAGS="%{optflags}"
+
+scons install DESTDIR=%{buildroot}/%{_prefix}
+desktop-file-validate %{buildroot}/%{_datadir}/applications/%{name}.desktop
+
+%files
+%doc %{_docdir}/%{name}/copyright
+%{_bindir}/%{name}
+%{_datadir}/%{name}
+%{_datadir}/applications/%{name}.desktop
+%{_datadir}/icons/hicolor/48x48/apps/%{name}.png
+%{_datadir}/icons/hicolor/scalable/apps/%{name}.svg
+%{_mandir}/man1/%{name}.1.*
+
+%post
+/bin/touch --no-create %{_datadir}/icons/hicolor &>/dev/null || :
+/usr/bin/update-desktop-database &> /dev/null || :
+
+%postun
+if [ $1 -eq 0 ] ; then
+ /bin/touch --no-create %{_datadir}/icons/hicolor &>/dev/null
+ /usr/bin/gtk-update-icon-cache -f %{_datadir}/icons/hicolor &>/dev/null || :
+fi
+/usr/bin/update-desktop-database &> /dev/null || :
+
+%posttrans
+/usr/bin/gtk-update-icon-cache -f %{_datadir}/icons/hicolor &>/dev/null || :
+
+%changelog
+* Sat Apr 13 2013 Luya Tshimbalanga <luya at fedoraproject.org> - 0.2.4-4
+- Updated spec based Packaging review (rhbz #913367)
+
+* Wed Feb 20 2013 Luya Tshimbalanga <luya at fedoraproject.org> - 0.2.4-2
+- Adherance to Fedora Packaging guideline
+
+* Sat Sep 01 2012 Alexis Lameire <alexisis-pristontale at hotmail.com> - 0.2.4-1
+- initial release
+
diff --git a/sources b/sources
index e69de29..a7153a6 100644
--- a/sources
+++ b/sources
@@ -0,0 +1 @@
+2c043cb95798c2b078264ed14ca0c6fd gpick_0.2.4.tar.gz
More information about the scm-commits
mailing list