[sugar-paint] update patch to fix building

[Peter Robinson]

commit 16457653793bc2602b6d9e3e7cefe55763b7eb84
Author: Peter Robinson <pbrobinson at gmail.com>
Date:   Thu Dec 6 11:53:36 2012 +0000

    update patch to fix building

 sugar-paint-Fedora.patch |   20 +++++++++++---------
 sugar-paint.spec         |    6 ++----
 2 files changed, 13 insertions(+), 13 deletions(-)
---
diff --git a/sugar-paint-Fedora.patch b/sugar-paint-Fedora.patch
index ee2fd9f..3fce55c 100644
--- a/sugar-paint-Fedora.patch
+++ b/sugar-paint-Fedora.patch
@@ -1,16 +1,18 @@
---- Paint-48/fill/Makefile.orig	2012-11-04 11:46:52.000000000 +0000
-+++ Paint-48/fill/Makefile	2012-11-04 12:01:02.083680917 +0000
-@@ -41,6 +41,8 @@
+--- Paint-52/fill/Makefile.orig	2012-12-06 11:43:57.903210947 +0000
++++ Paint-52/fill/Makefile	2012-12-06 11:48:09.701920630 +0000
+@@ -43,17 +43,14 @@
  
- ARCH_OUT = $(shell arch)
- 
-+LIB_DIR = lib
-+
  ARCH = $(shell if [ -z "$(shell arch | grep arm)" ]; then \
          echo $(ARCH_OUT) | grep 64 >/dev/null && echo linux64 || echo linux32; \
-     else \
-@@ -48,7 +50,7 @@
+-    else \
+-        echo $(ARCH_OUT); \
      fi)
+ 
+-PYTHON_VERSION = $(shell python -c 'import sys; print "%d%d" % sys.version_info[0:2]')
+-LIB_DIR = $(ARCH)_$(PYTHON_VERSION)
++LIB_DIR = lib
+ 
+ all: _fill.so
  	rm -rf $(LIB_DIR)
  	mkdir $(LIB_DIR)
 -	strip -s _fill.so
diff --git a/sugar-paint.spec b/sugar-paint.spec
index fe42111..5558322 100644
--- a/sugar-paint.spec
+++ b/sugar-paint.spec
@@ -23,11 +23,10 @@ to express themselves creatively through drawing.
 
 %prep
 %setup -q -n Paint-%{version}
+%patch0 -p1 -b .fedora
 
 # 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
+rm -rf fill/linux* fill/arm*
 
 %build
 make %{?_smp_mflags} V=1 -C fill LDFLAGS+=--build-id
@@ -44,7 +43,6 @@ rm -rf %{buildroot}%{sugaractivitydir}Paint.activity/fill
 %find_lang org.laptop.Oficina
 
 %files -f org.laptop.Oficina.lang
-%defattr(-,root,root,-)
 %doc NEWS COPYING
 %{python_sitearch}/fill/
 %{sugaractivitydir}/Paint.activity/