rpms/gnash/devel gnash.spec, 1.67, 1.68 gnash-0.8.6-python-install-dir.patch, 1.1, 1.2

[tomeu]

Author: tomeu

Update of /cvs/pkgs/rpms/gnash/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11982

Modified Files:
	gnash.spec gnash-0.8.6-python-install-dir.patch 
Log Message:
clog


Index: gnash.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnash/devel/gnash.spec,v
retrieving revision 1.67
retrieving revision 1.68
diff -u -p -r1.67 -r1.68
--- gnash.spec	29 Dec 2009 19:21:22 -0000	1.67
+++ gnash.spec	29 Dec 2009 20:28:58 -0000	1.68
@@ -5,7 +5,7 @@
 
 Name:           gnash
 Version:        0.8.6
-Release:	4%{?dist}
+Release:	5%{?dist}
 #Release:        0.8.%{alphatag}%{?dist}
 Epoch:		1
 Summary:        GNU flash movie player
@@ -113,7 +113,7 @@ application.
 %prep
 %setup -q
 %patch0 -p1 -b .manual
-%patch1 -p0 -b .python
+%patch1 -p1 -b .python
 %patch3 -p1 -b .fix-kde4
 # Hack as autoreconf breaks build 
 sed -i -e 's!kapp.h!kapplication.h!g' configure
@@ -319,6 +319,9 @@ fi
 %{python_sitearch}/gtk-2.0/*
 
 %changelog
+* Tue Dec 29 2009 Tomeu Vizoso <tomeu at sugarlabs.org> - 0.8.6-5
+- Patch Makefile.in, not Makefile.am
+
 * Tue Dec 29 2009 Tomeu Vizoso <tomeu at sugarlabs.org> - 0.8.6-4
 - Pick up python modules from the right dir
 

gnash-0.8.6-python-install-dir.patch:
 Makefile.in |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Index: gnash-0.8.6-python-install-dir.patch
===================================================================
RCS file: /cvs/pkgs/rpms/gnash/devel/gnash-0.8.6-python-install-dir.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- gnash-0.8.6-python-install-dir.patch	29 Dec 2009 18:40:48 -0000	1.1
+++ gnash-0.8.6-python-install-dir.patch	29 Dec 2009 20:28:58 -0000	1.2
@@ -1,15 +1,15 @@
-=== modified file 'gui/pythonmod/Makefile.am'
---- gui/pythonmod/Makefile.am	2009-12-19 21:24:21 +0000
-+++ gui/pythonmod/Makefile.am	2009-12-29 18:32:28 +0000
-@@ -15,8 +15,8 @@
- # along with this program; if not, write to the Free Software
- # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
- 
--pkgpythondir = $(pythondir)/gtk-2.0
--pkgpyexecdir = $(pythondir)/gtk-2.0
-+pkgpythondir = $(pkgpythondir)/gtk-2.0
-+pkgpyexecdir = $(pkgpyexecdir)/gtk-2.0
- 
- GNASH_INCLUDES = \
- 	-I$(top_srcdir)/gui \
+diff -rup gnash-0.8.6/gui/pythonmod/Makefile.in gnash-0.8.6.orig/gui/pythonmod/Makefile.in
+--- gnash-0.8.6/gui/pythonmod/Makefile.in	2009-12-29 21:24:41.569276016 +0100
++++ gnash-0.8.6.orig/gui/pythonmod/Makefile.in	2009-12-29 21:23:44.632275091 +0100
+@@ -527,8 +527,8 @@ mconfig = @mconfig@
+ mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
+ pdfdir = @pdfdir@
+-pkgpyexecdir = $(pkgpyexecdir)/gtk-2.0
+-pkgpythondir = $(pkgpythondir)/gtk-2.0
++pkgpyexecdir = $(pythondir)/gtk-2.0
++pkgpythondir = $(pythondir)/gtk-2.0
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
+ psdir = @psdir@