rpms/gnash/F-12 .cvsignore, 1.17, 1.18 gnash.spec, 1.69, 1.70 sources, 1.17, 1.18 gnash-0.8.3-manual.patch, 1.1, NONE gnash-0.8.6-python-install-dir.patch, 1.1, NONE

Sun Feb 28 04:51:24 UTC 2010

Author: kkofler

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

Modified Files:
	.cvsignore gnash.spec sources 
Removed Files:
	gnash-0.8.3-manual.patch gnash-0.8.6-python-install-dir.patch 
Log Message:
Sync from devel:

* Sat Feb 27 2010 Kevin Kofler <Kevin at tigcc.ticalc.org> - 1:0.8.7-1
- update to 0.8.7 (#568971)
- make scrollkeeper a conditional (still disabled as it's not working)
- drop gnash-0.8.3-manual.patch, should no longer be needed
- drop gnash-0.8.6-python-install-dir.patch, fixed upstream


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gnash/F-12/.cvsignore,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -p -r1.17 -r1.18

--- .cvsignore	30 Dec 2009 09:57:18 -0000	1.17
+++ .cvsignore	28 Feb 2010 04:51:23 -0000	1.18
@@ -1,2 +1,2 @@
-gnash-0.8.6.tar.bz2
 gnash-splash.swf
+gnash-0.8.7.tar.bz2


Index: gnash.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnash/F-12/gnash.spec,v
retrieving revision 1.69
retrieving revision 1.70
diff -u -p -r1.69 -r1.70
--- gnash.spec	12 Feb 2010 01:37:56 -0000	1.69
+++ gnash.spec	28 Feb 2010 04:51:24 -0000	1.70
@@ -1,12 +1,12 @@
-%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)")}
 
+# uncomment to enable ghelp/omf/scrollkeeper support
+# not working as of version 0.8.7
+#global scrollkeeper 1
+
 Name:           gnash
-Version:        0.8.6
-Release:	13%{?dist}
-#Release:        0.8.%{alphatag}%{?dist}
+Version:        0.8.7
+Release:	1%{?dist}
 Epoch:		1
 Summary:        GNU flash movie player
 
@@ -14,23 +14,15 @@ 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
 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
+Patch0:         gnash-0.8.3-fix-kde4-port.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  libxml2-devel libpng-devel libjpeg-devel libogg-devel
 BuildRequires:  boost-devel curl-devel freetype-devel fontconfig-devel
-# the opengl devel packages are required by gtkglext-devel
-# monolithic Xorg
-#BuildRequires:  xorg-x11-devel
-# modular Xorg 
-#BuildRequires:  libGLU-devel libGL-devel
 BuildRequires:  SDL-devel 
 BuildRequires:  agg-devel 
 BuildRequires:  kde-filesystem
@@ -39,7 +31,9 @@ BuildRequires:  gtkglext-devel
 BuildRequires:  docbook2X
 BuildRequires:  %{_bindir}/docbook2pdf
 BuildRequires:  gstreamer-devel >= 0.10
+%if 0%{?scrollkeeper}
 BuildRequires:  scrollkeeper
+%endif
 BuildRequires:  giflib-devel
 BuildRequires:  gettext
 BuildRequires:  desktop-file-utils
@@ -48,8 +42,10 @@ BuildRequires:  gstreamer-plugins-base-d
 BuildRequires:  pygtk2-devel
 BuildRequires:  libtool-ltdl-devel
 
-#Requires(post): scrollkeeper
-#Requires(postun): scrollkeeper
+%if 0%{?scrollkeeper}
+Requires(post): scrollkeeper
+Requires(postun): scrollkeeper
+%endif
 Requires(post): /sbin/ldconfig
 Requires(postun): /sbin/ldconfig
 Requires(post): /sbin/install-info
@@ -113,9 +109,7 @@ application.
 
 %prep
 %setup -q
-%patch0 -p1 -b .manual
-%patch1 -p1 -b .python
-%patch3 -p1 -b .fix-kde4
+%patch0 -p1 -b .fix-kde4
 # Hack as autoreconf breaks build 
 sed -i -e 's!kapp.h!kapplication.h!g' configure
 sed -i -e 's!libkdeui.la!libkdeui.so!g' configure
@@ -127,19 +121,18 @@ sed -i -e 's!\$(KDE4_LIBS)!!g' gui/Makef
 sed -i -e 's/test x"\${enable_ltdl_convenience-no}" != xno/false/g' configure
 # and don't build the loader part of libltdl either
 sed -i -e 's/\$(LT_DLLOADERS)//g' libltdl/Makefile.in
+# link to the system libltdl instead of the bundled one
+# this is hardcoded in the makefiles, so --without-included-ltdl doesn't help
+sed -i -e 's!\$(top_builddir)/libltdl/libltdlc.la!-lltdl!g' \
+  */Makefile.in */*/Makefile.in
 # delete bundled libltdl stuff to make sure it's not used
 rm -f libltdl/*.[ch] libltdl/*/*.[ch]
 
-#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
 mv AUTHORS.utf8 AUTHORS
 
 %build
-# --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).
 %configure --disable-static --with-npapi-plugindir=%{_libdir}/mozilla/plugins \
   --enable-docbook --enable-ghelp --enable-media=GST \
   --disable-dependency-tracking --disable-rpath \
@@ -168,30 +161,12 @@ 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 -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
-# info isn't generated rightly
-#rm -rf \
-# $RPM_BUILD_ROOT%{_infodir}/
-# omf/scrollkeeper related files are broken, some files are missing, and
-# omf files are wrong
-#rm -rf \
-# $RPM_BUILD_ROOT%{_datadir}/omf
-
-# cp -p doc/C/actionscript.info $RPM_BUILD_ROOT%{_infodir}/
-#mkdir -p $RPM_BUILD_ROOT%{_infodir}/
-#cp doc/C/gnash_*.info $RPM_BUILD_ROOT%{_infodir}/
 
 rm -rf __dist_docs
 mkdir __dist_docs
 mv $RPM_BUILD_ROOT%{_datadir}/doc/gnash/* __dist_docs/
 rmdir $RPM_BUILD_ROOT%{_datadir}/doc/gnash
-#cp doc/C/gnash*.html __dist_docs/
 
 cp -p %{SOURCE1} $RPM_BUILD_ROOT%{_datadir}/gnash/
 
@@ -199,6 +174,7 @@ mkdir -p $RPM_BUILD_ROOT%{_libexecdir}
 # a wrapper to avoid gnash erroring out if there is no argument.
 # Instead open gnash-splash.swf.
 # this should not be needed in the next version.
+# FIXME: Do we still need this with 0.8.7?
 cat > $RPM_BUILD_ROOT%{_libexecdir}/gnash-wrapper << EOF
 #! /bin/sh
 if [ "z\$1" = 'z' ]; then
@@ -218,8 +194,6 @@ desktop-file-install --vendor="fedora" \
 
 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
 
 %find_lang %{name}
 
@@ -229,11 +203,9 @@ rm -rf $RPM_BUILD_ROOT
 
 %post 
 /sbin/ldconfig
-#scrollkeeper-update -q -o %{_datadir}/omf/%{name} || :
-# the info is empty, but doesn't hurt
-#/sbin/install-info --entry="* Gnash: (gnash). GNU Flash Player" %{_infodir}/%{name}.info %{_infodir}/dir || :
-#/sbin/install-info %{_infodir}/asspec.info %{_infodir}/dir || :
-#/sbin/install-info %{_infodir}/actionscript.info %{_infodir}/dir || :
+%if 0%{?scrollkeeper}
+scrollkeeper-update -q -o %{_datadir}/omf/%{name} || :
+%endif
 /sbin/install-info %{_infodir}/gnash_ref.info %{_infodir}/dir || :
 /sbin/install-info %{_infodir}/gnash_user.info %{_infodir}/dir || :
 
@@ -247,16 +219,15 @@ fi
 
 %preun
 if [ $1 = 0 ]; then
-    #/sbin/install-info --delete %{_infodir}/%{name}.info %{_infodir}/dir || :
-    #/sbin/install-info --delete %{_infodir}/asspec.info %{_infodir}/dir || :
-    #/sbin/install-info --delete %{_infodir}/actionscript.info %{_infodir}/dir || :
     /sbin/install-info --delete %{_infodir}/gnash_ref.info %{_infodir}/dir || :
     /sbin/install-info --delete %{_infodir}/gnash_user.info %{_infodir}/dir || :
 fi
 
 %postun
 /sbin/ldconfig
-#scrollkeeper-update -q || :
+%if 0%{?scrollkeeper}
+scrollkeeper-update -q || :
+%endif
 
 update-desktop-database &> /dev/null || :
 
@@ -269,8 +240,6 @@ fi
 %files -f %{name}.lang
 %defattr(-,root,root,-)
 %doc README AUTHORS COPYING NEWS 
-#%doc doc/C/gnash.html doc/C/actionscript.html doc/C/asspec/asspec.html
-#%doc doc/C/images
 %doc __dist_docs/*
 %config(noreplace) %{_sysconfdir}/gnashpluginrc
 %config(noreplace) %{_sysconfdir}/gnashrc
@@ -291,12 +260,17 @@ fi
 %{_mandir}/man1/gprocessor.1*
 %{_mandir}/man1/soldumper.1*
 %{_mandir}/man1/flvdumper.1*
+%{_mandir}/man1/findmicrophones.1*
+%{_mandir}/man1/findwebcams.1*
+%{_mandir}/man1/gtk-gnash.1*
 %{_infodir}/gnash*
 %{_datadir}/gnash/
 %{_datadir}/icons/hicolor/32x32/apps/*.png
 %{_datadir}/applications/*.desktop
 %{_libexecdir}/gnash-wrapper
-#%{_datadir}/omf/gnash/
+%if 0%{?scrollkeeper}
+%{_datadir}/omf/gnash/
+%endif
 
 %files plugin
 %defattr(-,root,root,-)
@@ -308,6 +282,7 @@ fi
 %{_kde4_libdir}/kde4/libklashpart.so
 %{_kde4_appsdir}/klash/
 %{_kde4_datadir}/kde4/services/klash_part.desktop
+%{_mandir}/man1/kde4-gnash.1*
 
 %files cygnal
 %defattr(-,root,root,-)
@@ -328,6 +303,12 @@ fi
 %{python_sitearch}/gtk-2.0/*
 
 %changelog
+* Sat Feb 27 2010 Kevin Kofler <Kevin at tigcc.ticalc.org> - 1:0.8.7-1
+- update to 0.8.7 (#568971)
+- make scrollkeeper a conditional (still disabled as it's not working)
+- drop gnash-0.8.3-manual.patch, should no longer be needed
+- drop gnash-0.8.6-python-install-dir.patch, fixed upstream
+
 * Fri Feb 12 2010 Kevin Kofler <Kevin at tigcc.ticalc.org> - 1:0.8.6-13
 - delete bundled libltdl stuff to make sure it's not used
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gnash/F-12/sources,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -p -r1.17 -r1.18
--- sources	30 Dec 2009 09:57:19 -0000	1.17
+++ sources	28 Feb 2010 04:51:24 -0000	1.18
@@ -1,2 +1,2 @@
-913bcbffd37c9603b84486227c65dce7  gnash-0.8.6.tar.bz2
 3ba3f30fbcd9ac6458c7d50a33eb933e  gnash-splash.swf
+039533fec46e46b94ac6b04e33d58f3a  gnash-0.8.7.tar.bz2


--- gnash-0.8.3-manual.patch DELETED ---


--- gnash-0.8.6-python-install-dir.patch DELETED ---

