rpms/gnash/devel .cvsignore, 1.7, 1.8 gnash.spec, 1.35, 1.36 sources, 1.7, 1.8 gnash-0.8.3-glib_link.patch, 1.1, NONE

Patrice Dumas pertusus at fedoraproject.org
Sat Oct 18 20:48:25 UTC 2008 

Author: pertusus

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

Modified Files:
	.cvsignore gnash.spec sources 
Removed Files:
	gnash-0.8.3-glib_link.patch 
Log Message:
* Sat Oct 18 2008 Patrice Dumas <pertusus at free.fr> 0.8.4-1
- update to 0.8.4



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gnash/devel/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore	23 Jun 2008 01:08:01 -0000	1.7
+++ .cvsignore	18 Oct 2008 20:47:55 -0000	1.8
@@ -1 +1 @@
-gnash-0.8.3.tar.gz
+gnash-0.8.4.tar.gz


Index: gnash.spec
===================================================================
RCS file: /cvs/extras/rpms/gnash/devel/gnash.spec,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -r1.35 -r1.36
--- gnash.spec	9 Oct 2008 01:33:24 -0000	1.35
+++ gnash.spec	18 Oct 2008 20:47:55 -0000	1.36
@@ -4,8 +4,8 @@
 %define use_kde3_executable 1
 
 Name:           gnash
-Version:        0.8.3
-Release:        6%{?dist}
+Version:        0.8.4
+Release:        1%{?dist}
 Summary:        GNU flash movie player
 
 Group:          Applications/Multimedia
@@ -13,7 +13,6 @@
 URL:            http://www.gnu.org/software/gnash/
 Source0:        http://ftp.gnu.org/gnu/gnash/%{version}/%{name}-%{version}.tar.gz
 Patch0:         gnash-0.8.3-manual.patch
-Patch1:         gnash-0.8.3-glib_link.patch
 # patch by Benjamin Wolsey and Bernhard Rosenkränzer
 Patch2:         gnash-0.8.3-port-to-kde4.patch
 # register KComponentData properly in KDE 4 KPart
@@ -91,22 +90,21 @@
 %prep
 %setup -q
 %patch0 -p1 -b .manual
-%patch1 -p1 -b .glib_link
-%patch2 -p1 -b .kde4
-%patch3 -p1 -b .fix-kde4
-# handle the /usr/lib(64)/kde4/devel hack
-# If only this package used cmake, this wouldn't be necessary...
-sed -i -e 's!KDECORE="-lkdecore"!KDECORE="-L$KDE/$LibDir/kde4/devel -lkdecore"!g' macros/kde4.m4
-# Hack so it finds libQtCore.so in /usr on lib64 arches
-sed -i -e 's!if test -e $dir/lib/libQtCore.so; then!if test -e $dir/$LibDir/libQtCore.so; then!g' macros/kde4.m4
-# both the kde4 patch and the above sed hacks touched autotools stuff
-autoreconf
-%if 0%{?use_kde3_executable}
-# hack the KDE 4 KPart so it uses the KDE 3 executable
-sed -i -e 's/kde4-gnash/kde-gnash/g' plugin/klash4/klash_part.cpp
-%endif
+#%patch2 -p1 -b .kde4
+#%patch3 -p1 -b .fix-kde4
+## handle the /usr/lib(64)/kde4/devel hack
+## If only this package used cmake, this wouldn't be necessary...
+#sed -i -e 's!KDECORE="-lkdecore"!KDECORE="-L$KDE/$LibDir/kde4/devel -lkdecore"!g' macros/kde4.m4
+## Hack so it finds libQtCore.so in /usr on lib64 arches
+#sed -i -e 's!if test -e $dir/lib/libQtCore.so; then!if test -e $dir/$LibDir/libQtCore.so; then!g' macros/kde4.m4
+## both the kde4 patch and the above sed hacks touched autotools stuff
+#autoreconf
+#%if 0%{?use_kde3_executable}
+## hack the KDE 4 KPart so it uses the KDE 3 executable
+#sed -i -e 's/kde4-gnash/kde-gnash/g' plugin/klash4/klash_part.cpp
+#%endif
 
-chmod a-x libgeometry/snappingrange.h backend/render*.h gui/gtk_glue_agg.{h,cpp} 
+#chmod a-x libgeometry/snappingrange.h backend/render*.h gui/gtk_glue_agg.{h,cpp} 
 
 iconv -f latin1 -t utf8 < AUTHORS > AUTHORS.utf8
 touch -r AUTHORS AUTHORS.utf8
@@ -116,6 +114,7 @@
 %if 0%{?use_kde3_executable}
 [ -n "$QTDIR" ] || . %{_sysconfdir}/profile.d/qt.sh
 %endif
+#  --enable-gui=gtk,kde,kde4,sdl,fb \
 # --enable-ghelp is disabled
 # We use /usr (_kde4_prefix) as the Qt prefix because the stuff it's looking for
 # is actually in /, not in the QT4DIR (_qt4_prefix).
@@ -124,7 +123,7 @@
   --enable-docbook --enable-ghelp --enable-media=GST \
   --disable-dependency-tracking --disable-rpath \
   --enable-cygnal \
-  --enable-gui=gtk,kde,kde4,sdl,fb \
+  --enable-gui=gtk,kde,sdl,fb \
   --disable-kparts \
   --with-qtdir=$QTDIR \
   --with-qt4=%{_kde4_prefix} \
@@ -154,14 +153,15 @@
  KDE4_APPSDATADIR=%{_kde4_appsdir}/klash
 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%{_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/libgnashserver.so
-rm $RPM_BUILD_ROOT%{_libdir}/gnash/libmozsdk.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 \
@@ -170,10 +170,10 @@
 #rm -rf $RPM_BUILD_ROOT%{_localstatedir}/scrollkeeper
 rm -f $RPM_BUILD_ROOT%{_infodir}/dir
 # don't package libltdl related files!
-rm \
- $RPM_BUILD_ROOT%{_libdir}/gnash/libltdl*
-rm \
- $RPM_BUILD_ROOT%{_includedir}/ltdl.h
+#rm \
+# $RPM_BUILD_ROOT%{_libdir}/gnash/libltdl*
+#rm \
+# $RPM_BUILD_ROOT%{_includedir}/ltdl.h
 # info isn't generated rightly
 #rm -rf \
 # $RPM_BUILD_ROOT%{_infodir}/
@@ -199,7 +199,7 @@
 # $RPM_BUILD_ROOT%{_datadir}/apps/klash/pluginsinfo
 
 %if 0%{?use_kde3_executable}
-rm $RPM_BUILD_ROOT/%{_kde4_bindir}/kde4-gnash
+#rm $RPM_BUILD_ROOT/%{_kde4_bindir}/kde4-gnash
 %endif
 
 %find_lang %{name}
@@ -241,6 +241,7 @@
 %config(noreplace) %{_sysconfdir}/gnashrc
 %{_bindir}/dumpshm
 %{_bindir}/fb-gnash
+%{_bindir}/flvdumper
 %{_bindir}/gtk-gnash
 %{_bindir}/sdl-gnash
 %{_bindir}/soldumper
@@ -269,9 +270,9 @@
 %else
 %{_kde4_bindir}/kde4-gnash
 %endif
-%{_kde4_libdir}/kde4/libklashpart.so
-%{_kde4_appsdir}/klash/
-%{_kde4_datadir}/kde4/services/klash_part.desktop
+#%{_kde4_libdir}/kde4/libklashpart.so
+#%{_kde4_appsdir}/klash/
+#%{_kde4_datadir}/kde4/services/klash_part.desktop
 
 %files cygnal
 %defattr(-,root,root,-)
@@ -279,6 +280,9 @@
 %{_mandir}/man1/cygnal.1*
 
 %changelog
+* Sat Oct 18 2008 Patrice Dumas <pertusus at free.fr> 0.8.4-1
+- update to 0.8.4
+
 * Thu Oct  4 2008 Kevin Kofler <Kevin at tigcc.ticalc.org> 0.8.3-6
 - use the KDE 3 executable with the KDE 4 KPart for now (making this conditional
   so it can easily be disabled or removed once the KDE 4 executable is fixed)


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gnash/devel/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	23 Jun 2008 01:08:01 -0000	1.7
+++ sources	18 Oct 2008 20:47:55 -0000	1.8
@@ -1 +1 @@
-126be87b3866abdd7a9ea32fcb44363e  gnash-0.8.3.tar.gz
+3100e8d669795c03167a171937897c83  gnash-0.8.4.tar.gz


--- gnash-0.8.3-glib_link.patch DELETED ---

More information about the scm-commits mailing list