[sugar-paint] fix build, do not strip .so file
Tom Callaway
spot at fedoraproject.org
Thu Mar 8 16:10:03 UTC 2012
commit f6cd863bf4d19a4a3b5693ebba03e2c7c2995506
Author: Tom Callaway <spot at fedoraproject.org>
Date: Thu Mar 8 11:10:01 2012 -0500
fix build, do not strip .so file
sugar-paint-Fedora.patch | 17 +++++++++++++++++
sugar-paint.spec | 14 ++++++++++----
2 files changed, 27 insertions(+), 4 deletions(-)
---
diff --git a/sugar-paint-Fedora.patch b/sugar-paint-Fedora.patch
new file mode 100644
index 0000000..8be3cb1
--- /dev/null
+++ b/sugar-paint-Fedora.patch
@@ -0,0 +1,17 @@
+diff -up Paint.activity/fill/Makefile.fedora Paint.activity/fill/Makefile
+--- Paint.activity/fill/Makefile.fedora 2012-03-08 11:05:16.727671157 -0500
++++ Paint.activity/fill/Makefile 2012-03-08 11:05:49.522396810 -0500
+@@ -47,10 +47,12 @@ ARCH = $(shell if [ -z "$(shell arch | g
+ echo $(ARCH_OUT) | grep 64 >/dev/null && echo linux64 || echo linux32; \
+ else \
+
++LIB_DIR = lib
++
+ all: _fill.so
+ rm -rf $(LIB_DIR)
+ mkdir $(LIB_DIR)
+- strip -s _fill.so
++ # strip -s _fill.so
+ mv _fill.so $(LIB_DIR)/
+ touch $(LIB_DIR)/__init__.py
+
diff --git a/sugar-paint.spec b/sugar-paint.spec
index a44d7ac..4145f20 100644
--- a/sugar-paint.spec
+++ b/sugar-paint.spec
@@ -4,14 +4,16 @@
Name: sugar-paint
Version: 37
-Release: 2%{?dist}
+Release: 3%{?dist}
Summary: Paint activity for Sugar
Group: Sugar/Activities
License: GPLv2
URL: http://wiki.sugarlabs.org/go/Activities/Paint
Source0: http://activities.sugarlabs.org/sugar/downloads/file/26190/paint-%{version}.xo
-
+# Do not strip the .so file
+# Set LIB_DIR to "lib"
+Patch0: sugar-paint-Fedora.patch
BuildRequires: gettext
BuildRequires: gtk2-devel
BuildRequires: pygtk2-devel
@@ -29,6 +31,7 @@ to express themselves creatively through drawing.
# make sure to grab blob from the right location and remove prebuilt ones
sed '49,53d' -i fill/Makefile
rm -rf fill/linux*
+%patch0 -p1 -b .fedora
%build
make %{?_smp_mflags} V=1 -C fill LDFLAGS+=--build-id
@@ -36,8 +39,8 @@ make %{?_smp_mflags} V=1 -C fill LDFLAGS+=--build-id
%install
mkdir -p %{buildroot}%{python_sitearch}/fill/
-install -Dm 0755 fill/_fill.so %{buildroot}%{python_sitearch}/fill/
-install -Dm 0644 fill/__init__.py %{buildroot}%{python_sitearch}/fill/
+install -Dm 0755 fill/lib/_fill.so %{buildroot}%{python_sitearch}/fill/
+install -Dm 0644 fill/lib/__init__.py %{buildroot}%{python_sitearch}/fill/
%{__python} setup.py install --prefix=%{buildroot}/%{_prefix}
rm -rf %{buildroot}%{sugaractivitydir}Paint.activity/fill
%find_lang org.laptop.Oficina
@@ -50,6 +53,9 @@ rm -rf %{buildroot}%{sugaractivitydir}Paint.activity/fill
%changelog
+* Thu Mar 8 2012 Tom Callaway <spot at fedoraproject.org> - 37-3
+- fix build, do not strip .so file
+
* Sat Jan 14 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 37-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
More information about the scm-commits
mailing list