rpms/gnash/devel .cvsignore, 1.10, 1.11 gnash.spec, 1.52, 1.53 sources, 1.10, 1.11

[tomeu]

Author: tomeu

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

Modified Files:
	.cvsignore gnash.spec sources 
Log Message:
* Fri Aug 09 2009 Tomeu Vizoso <tomeu at sugarlabs.org> 0.9.0-0.1.20090809bzr11400
- merge upstream changes into the spec



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gnash/devel/.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	9 Aug 2009 09:49:55 -0000	1.11
@@ -1,2 +1 @@
-gnash-0.8.5.tar.gz
-gnash-splash.swf
+gnash-0.9.0.20090807bzr11384.tar.gz


Index: gnash.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnash/devel/gnash.spec,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -p -r1.52 -r1.53
--- gnash.spec	25 Jul 2009 00:30:31 -0000	1.52
+++ gnash.spec	9 Aug 2009 09:49:55 -0000	1.53
@@ -1,12 +1,16 @@
+%define commitid 11400
+%define alphatag 20090809bzr%{commitid}
+
 Name:           gnash
-Version:        0.8.5
-Release:        5%{?dist}
+Version:        0.9.0
+Release:        0.1.%{alphatag}%{?dist}
 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.gz
+Source0:        %{name}-%{version}.%{alphatag}.tar.gz
 Source1:        http://www.getgnash.org/gnash-splash.swf
 Source2:        gnash.desktop
 
@@ -36,6 +40,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,6 +87,20 @@ Group:     Applications/Multimedia
 %description cygnal
 Cygnal is a streaming media server that's Flash aware.
 
+%package devel
+Summary:   Gnash header files
+Group:     Applications/Multimedia
+
+%description devel
+Gnash header files can be used to write external Gnash extensions.
+
+%package widget
+Summary:   Gnash widgets for Gtk and Python
+Group:     Applications/Multimedia
+
+%description widget
+The Gnash widgets can be used to embed Gnash into any Gtk or Python-Gtk
+application.
 
 %prep
 %setup -q
@@ -108,8 +127,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 +150,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!
@@ -257,10 +264,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*
@@ -286,10 +293,23 @@ fi
 
 %files cygnal
 %defattr(-,root,root,-)
+%config(noreplace) %{_sysconfdir}/cygnalrc
 %{_bindir}/cygnal
 %{_mandir}/man1/cygnal.1*
+%{_mandir}/man1/rtmpget.1*
+
+%files devel
+%{_prefix}/include/gnash/*.h
+%{_prefix}/lib/pkgconfig/gnash.pc
+
+%files widget
+%{_prefix}/include/gnash/*.h
+%{_prefix}/lib/python*/site-packages/gtk-2.0/gnash.*
 
 %changelog
+* Fri 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
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gnash/devel/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	9 Aug 2009 09:49:55 -0000	1.11
@@ -1,2 +1 @@
-b54a72a52d2477e65d9029be572789ff  gnash-0.8.5.tar.gz
-3ba3f30fbcd9ac6458c7d50a33eb933e  gnash-splash.swf
+899b3f5e519fb1f0908a6ca66759eae3  gnash-0.9.0.20090807bzr11384.tar.gz