rpms/gnash/F-11 gnash-0.8.6-python-install-dir.patch, NONE, 1.1 .cvsignore, 1.10, 1.11 gnash.spec, 1.50, 1.51 sources, 1.10, 1.11
Kevin Kofler
kkofler at fedoraproject.org
Sat Jan 2 04:36:30 UTC 2010
Author: kkofler
Update of /cvs/pkgs/rpms/gnash/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18835/F-11
Modified Files:
.cvsignore gnash.spec sources
Added Files:
gnash-0.8.6-python-install-dir.patch
Log Message:
Sync from devel:
* Sat Jan 02 2010 Kevin Kofler <Kevin at tigcc.ticalc.org> - 1:0.8.6-8
- Install icon to the correct place (#551621)
* Wed Dec 30 2009 Tomeu Vizoso <tomeu at sugarlabs.org> - 1:0.8.6-7
- One more try at using the correct dir
* Tue Dec 29 2009 Tomeu Vizoso <tomeu at sugarlabs.org> - 1:0.8.6-6
- Patch was reversed
* Tue Dec 29 2009 Tomeu Vizoso <tomeu at sugarlabs.org> - 1:0.8.6-5
- Patch Makefile.in, not Makefile.am
* Tue Dec 29 2009 Tomeu Vizoso <tomeu at sugarlabs.org> - 1:0.8.6-4
- Pick up python modules from the right dir
* Tue Dec 29 2009 Tomeu Vizoso <tomeu at sugarlabs.org> - 1:0.8.6-3
- Install python modules in the right dir
* Tue Dec 29 2009 Tomeu Vizoso <tomeu at sugarlabs.org> - 1:0.8.6-2
- Add cygnal plugins
* Tue Dec 29 2009 Tomeu Vizoso <tomeu at sugarlabs.org> - 1: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
* Thu Sep 10 2009 Tomeu Vizoso <tomeu at sugarlabs.org> 0.9.0-0.7.20090910bzr11505
- update to HEAD
* Mon Aug 10 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> 0.9.0-0.6.20090809bzr11401
- don't package headers in -widget, only in -devel (no duplicate files)
- own %%{_includedir}/gnash/ in -devel
- add missing %%defattr for -devel and -widget
- make -devel and -widget require the main package (with exact VR)
- fix -devel group and description
- rename gnash-widget to python-gnash as per the naming guidelines
* Sun Aug 09 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> 0.9.0-0.5.20090809bzr11401
- use %%{_includedir}, not %%{_prefix}/include
* Sun Aug 09 2009 Tomeu Vizoso <tomeu at sugarlabs.org> 0.9.0-0.4.20090809bzr11401
- Install the python module in the sitearch dir
* Sun Aug 09 2009 Tomeu Vizoso <tomeu at sugarlabs.org> 0.9.0-0.3.20090809bzr11401
- One more 64bit fix
* Sun Aug 09 2009 Tomeu Vizoso <tomeu at sugarlabs.org> 0.9.0-0.3.20090809bzr11400
- Fix the packaging in 64bits
* Sun Aug 09 2009 Tomeu Vizoso <tomeu at sugarlabs.org> 0.9.0-0.2.20090809bzr11400
- upload the .swf file
* Sun Aug 09 2009 Tomeu Vizoso <tomeu at sugarlabs.org> 0.9.0-0.1.20090809bzr11400
- merge upstream changes into the spec
* Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.8.5-5
- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
* Fri May 22 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> 0.8.5-4
- rebuild for new Boost
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: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gnash/F-11/.cvsignore,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- .cvsignore 6 Mar 2009 12:24:35 -0000 1.10
+++ .cvsignore 2 Jan 2010 04:36:30 -0000 1.11
@@ -1,2 +1,2 @@
-gnash-0.8.5.tar.gz
+gnash-0.8.6.tar.bz2
gnash-splash.swf
Index: gnash.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnash/F-11/gnash.spec,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -p -r1.50 -r1.51
--- gnash.spec 6 Mar 2009 17:37:28 -0000 1.50
+++ gnash.spec 2 Jan 2010 04:36:30 -0000 1.51
@@ -1,16 +1,25 @@
+%define commitid 11506
+%define alphatag 20090910bzr%{commitid}
+
+%{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
+
Name: gnash
-Version: 0.8.5
-Release: 3%{?dist}
+Version: 0.8.6
+Release: 8%{?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.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)
@@ -36,6 +45,7 @@ BuildRequires: gettext
BuildRequires: desktop-file-utils
BuildRequires: speex-devel
BuildRequires: gstreamer-plugins-base-devel
+BuildRequires: pygtk2-devel
#Requires(post): scrollkeeper
#Requires(postun): scrollkeeper
@@ -82,10 +92,28 @@ Group: Applications/Multimedia
%description cygnal
Cygnal is a streaming media server that's Flash aware.
+%package devel
+Summary: Gnash header files
+Requires: %{name} = %{version}-%{release}
+Group: Development/Libraries
+
+%description devel
+Gnash header files can be used to write external Gnash extensions or to embed
+the Gnash GTK+ widget into a C/C++ application.
+
+%package -n python-gnash
+Summary: Gnash Python bindings
+Requires: %{name} = %{version}-%{release}
+Group: Applications/Multimedia
+
+%description -n python-gnash
+Python bindings for the Gnash widget. Can be used to embed Gnash into any PyGTK
+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
@@ -108,8 +136,9 @@ mv AUTHORS.utf8 AUTHORS
--enable-docbook --enable-ghelp --enable-media=GST \
--disable-dependency-tracking --disable-rpath \
--enable-cygnal \
+ --enable-sdkinstall \
+ --enable-python \
--enable-gui=gtk,kde4,sdl,fb \
- --with-qt4=%{_kde4_prefix} \
--with-kde4-prefix=%{_kde4_prefix} \
--with-kde4-lib=%{_kde4_libdir}/kde4/devel \
--with-kde4-incl=%{_kde4_includedir}
@@ -130,19 +159,6 @@ make install install-plugins \
rm $RPM_BUILD_ROOT%{_libdir}/gnash/*.la
# KDE 4 doesn't need the .la file anymore, thankfully
rm $RPM_BUILD_ROOT%{_kde4_libdir}/kde4/libklashpart.la
-rm \
- $RPM_BUILD_ROOT%{_libdir}/gnash/libgnashamf.so \
- $RPM_BUILD_ROOT%{_libdir}/gnash/libgnashbase.so \
- $RPM_BUILD_ROOT%{_libdir}/gnash/libgnashmedia.so \
- $RPM_BUILD_ROOT%{_libdir}/gnash/libgnashnet.so \
- $RPM_BUILD_ROOT%{_libdir}/gnash/libgnashcore.so \
- $RPM_BUILD_ROOT%{_libdir}/gnash/libmozsdk.so*
-# $RPM_BUILD_ROOT%{_libdir}/gnash/libgnashserver.so
-# $RPM_BUILD_ROOT%{_libdir}/libgnashbackend.so \
-# $RPM_BUILD_ROOT%{_libdir}/libgnashgeo.so \
-# $RPM_BUILD_ROOT%{_libdir}/libgnashgui.so \
-# $RPM_BUILD_ROOT%{_libdir}/libgnashplayer.so \
-# $RPM_BUILD_ROOT%{_libdir}/libklashplayer.so
#rm -rf $RPM_BUILD_ROOT%{_localstatedir}/scrollkeeper
rm -f $RPM_BUILD_ROOT%{_infodir}/dir
# don't package libltdl related files!
@@ -191,8 +207,8 @@ desktop-file-install --vendor="fedora" \
--dir=$RPM_BUILD_ROOT%{_datadir}/applications/ \
gnash.desktop
-mkdir -p $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/32x32
-cp -p ./gui/images/GnashG.png $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/32x32
+mkdir -p $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/32x32/apps
+cp -p ./gui/images/GnashG.png $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/32x32/apps
#chmod a-x $RPM_BUILD_ROOT%{_datadir}/services/klash_part.desktop \
# $RPM_BUILD_ROOT%{_datadir}/apps/klash/pluginsinfo
@@ -257,10 +273,10 @@ fi
%{_bindir}/soldumper
%{_bindir}/gnash
%{_bindir}/gprocessor
+%{_bindir}/findmicrophones
+%{_bindir}/findwebcams
%dir %{_libdir}/gnash
-%{_libdir}/gnash/libgnash*
-#%{_libdir}/libgnash*-*.so
-#%{_libdir}/libklash*-*.so
+%{_libdir}/gnash/*.so*
%{_mandir}/man1/gnash.1*
%{_mandir}/man1/dumpshm.1*
%{_mandir}/man1/gprocessor.1*
@@ -268,7 +284,7 @@ fi
%{_mandir}/man1/flvdumper.1*
%{_infodir}/gnash*
%{_datadir}/gnash/
-%{_datadir}/icons/hicolor/32x32/*.png
+%{_datadir}/icons/hicolor/32x32/apps/*.png
%{_datadir}/applications/*.desktop
%{_libexecdir}/gnash-wrapper
#%{_datadir}/omf/gnash/
@@ -286,10 +302,85 @@ fi
%files cygnal
%defattr(-,root,root,-)
+%config(noreplace) %{_sysconfdir}/cygnalrc
%{_bindir}/cygnal
%{_mandir}/man1/cygnal.1*
+%{_mandir}/man1/rtmpget.1*
+%dir %{_libdir}/cygnal
+%{_libdir}/cygnal/plugins/*.so*
+
+%files devel
+%defattr(-,root,root,-)
+%{_includedir}/gnash/
+%{_libdir}/pkgconfig/gnash.pc
+
+%files -n python-gnash
+%defattr(-,root,root,-)
+%{python_sitearch}/gtk-2.0/*
%changelog
+* Sat Jan 02 2010 Kevin Kofler <Kevin at tigcc.ticalc.org> - 1:0.8.6-8
+- Install icon to the correct place (#551621)
+
+* Wed Dec 30 2009 Tomeu Vizoso <tomeu at sugarlabs.org> - 1:0.8.6-7
+- One more try at using the correct dir
+
+* Tue Dec 29 2009 Tomeu Vizoso <tomeu at sugarlabs.org> - 1:0.8.6-6
+- Patch was reversed
+
+* Tue Dec 29 2009 Tomeu Vizoso <tomeu at sugarlabs.org> - 1:0.8.6-5
+- Patch Makefile.in, not Makefile.am
+
+* Tue Dec 29 2009 Tomeu Vizoso <tomeu at sugarlabs.org> - 1:0.8.6-4
+- Pick up python modules from the right dir
+
+* Tue Dec 29 2009 Tomeu Vizoso <tomeu at sugarlabs.org> - 1:0.8.6-3
+- Install python modules in the right dir
+
+* Tue Dec 29 2009 Tomeu Vizoso <tomeu at sugarlabs.org> - 1:0.8.6-2
+- Add cygnal plugins
+
+* Tue Dec 29 2009 Tomeu Vizoso <tomeu at sugarlabs.org> - 1: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
+
+* Thu Sep 10 2009 Tomeu Vizoso <tomeu at sugarlabs.org> 0.9.0-0.7.20090910bzr11505
+- update to HEAD
+
+* Mon Aug 10 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> 0.9.0-0.6.20090809bzr11401
+- don't package headers in -widget, only in -devel (no duplicate files)
+- own %%{_includedir}/gnash/ in -devel
+- add missing %%defattr for -devel and -widget
+- make -devel and -widget require the main package (with exact VR)
+- fix -devel group and description
+- rename gnash-widget to python-gnash as per the naming guidelines
+
+* Sun Aug 09 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> 0.9.0-0.5.20090809bzr11401
+- use %%{_includedir}, not %%{_prefix}/include
+
+* Sun Aug 09 2009 Tomeu Vizoso <tomeu at sugarlabs.org> 0.9.0-0.4.20090809bzr11401
+- Install the python module in the sitearch dir
+
+* Sun Aug 09 2009 Tomeu Vizoso <tomeu at sugarlabs.org> 0.9.0-0.3.20090809bzr11401
+- One more 64bit fix
+
+* Sun Aug 09 2009 Tomeu Vizoso <tomeu at sugarlabs.org> 0.9.0-0.3.20090809bzr11400
+- Fix the packaging in 64bits
+
+* Sun Aug 09 2009 Tomeu Vizoso <tomeu at sugarlabs.org> 0.9.0-0.2.20090809bzr11400
+- upload the .swf file
+
+* Sun Aug 09 2009 Tomeu Vizoso <tomeu at sugarlabs.org> 0.9.0-0.1.20090809bzr11400
+- merge upstream changes into the spec
+
+* Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.8.5-5
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
+* Fri May 22 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> 0.8.5-4
+- rebuild for new Boost
+
* Fri Mar 06 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> 0.8.5-3
- explicitly link the KlashPart against the libraries it uses
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gnash/F-11/sources,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- sources 6 Mar 2009 12:24:36 -0000 1.10
+++ sources 2 Jan 2010 04:36:30 -0000 1.11
@@ -1,2 +1,2 @@
-b54a72a52d2477e65d9029be572789ff gnash-0.8.5.tar.gz
+913bcbffd37c9603b84486227c65dce7 gnash-0.8.6.tar.bz2
3ba3f30fbcd9ac6458c7d50a33eb933e gnash-splash.swf
More information about the fedora-extras-commits
mailing list