rpms/gnash/F-12 gnash-0.8.6-python-install-dir.patch, NONE, 1.1 gnash.spec, 1.63, 1.64

[tomeu]

Author: tomeu

Update of /cvs/pkgs/rpms/gnash/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30876

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

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

--- NEW FILE gnash-0.8.6-python-install-dir.patch ---
diff -rup gnash-0.8.6.orig/gui/pythonmod/Makefile.in gnash-0.8.6/gui/pythonmod/Makefile.in
--- gnash-0.8.6.orig/gui/pythonmod/Makefile.in	2009-12-29 21:23:44.632275091 +0100
+++ gnash-0.8.6/gui/pythonmod/Makefile.in	2009-12-29 21:24:41.569276016 +0100
@@ -527,8 +527,8 @@ mconfig = @mconfig@
 mkdir_p = @mkdir_p@
 oldincludedir = @oldincludedir@
 pdfdir = @pdfdir@
-pkgpyexecdir = $(pythondir)/gtk-2.0
-pkgpythondir = $(pythondir)/gtk-2.0
+pkgpyexecdir = $(pyexecdir)/gtk-2.0
+pkgpythondir = $(pyexecdir)/gtk-2.0
 prefix = @prefix@
 program_transform_name = @program_transform_name@
 psdir = @psdir@


Index: gnash.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnash/F-12/gnash.spec,v
retrieving revision 1.63
retrieving revision 1.64
diff -u -p -r1.63 -r1.64
--- gnash.spec	10 Sep 2009 13:36:28 -0000	1.63
+++ gnash.spec	30 Dec 2009 09:55:09 -0000	1.64
@@ -4,19 +4,22 @@
 %{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
 
 Name:           gnash
-Version:        0.9.0
-Release:        0.8.%{alphatag}%{?dist}
+Version:        0.8.6
+Release:	1%{?dist}
+#Release:        0.8.%{alphatag}%{?dist}
+Epoch:		1
 Summary:        GNU flash movie player
 
 Group:          Applications/Multimedia
 License:        GPLv3+
 URL:            http://www.gnu.org/software/gnash/
-#Source0:        http://ftp.gnu.org/gnu/gnash/%{version}/%{name}-%{version}.tar.bz2
-Source0:        %{name}-%{version}.%{alphatag}.tar.gz
+Source0:        http://ftp.gnu.org/gnu/gnash/%{version}/%{name}-%{version}.tar.bz2
+#Source0:        %{name}-%{version}.%{alphatag}.tar.gz
 Source1:        http://www.getgnash.org/gnash-splash.swf
 Source2:        gnash.desktop
 
 Patch0:         gnash-0.8.3-manual.patch
+Patch1:         gnash-0.8.6-python-install-dir.patch
 # register KComponentData properly in KDE 4 KPart
 Patch3:         gnash-0.8.3-fix-kde4-port.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -110,6 +113,7 @@ application.
 %prep
 %setup -q
 %patch0 -p1 -b .manual
+%patch1 -p1 -b .python
 %patch3 -p1 -b .fix-kde4
 # Hack as autoreconf breaks build 
 sed -i -e 's!kapp.h!kapplication.h!g' configure
@@ -302,6 +306,8 @@ fi
 %{_bindir}/cygnal
 %{_mandir}/man1/cygnal.1*
 %{_mandir}/man1/rtmpget.1*
+%dir %{_libdir}/cygnal
+%{_libdir}/cygnal/plugins/*.so*
 
 %files devel
 %defattr(-,root,root,-)
@@ -310,9 +316,12 @@ fi
 
 %files -n python-gnash
 %defattr(-,root,root,-)
-%{python_sitearch}/*
+%{python_sitearch}/gtk-2.0/*
 
 %changelog
+* Wed Dec 30 2009 Tomeu Vizoso <tomeu at sugarlabs.org> - 0.8.6-1
+- Update to 0.8.6, increase epoch.
+
 * Thu Sep 10 2009 Tomeu Vizoso <tomeu at sugarlabs.org> 0.9.0-0.8.20090910bzr11506
 - update to HEAD