rpms/gnash/devel .cvsignore, 1.5, 1.6 gnash.spec, 1.14, 1.15 sources, 1.5, 1.6

[Patrice Dumas (pertusus)]

Author: pertusus

Update of /cvs/extras/rpms/gnash/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7708

Modified Files:
	.cvsignore gnash.spec sources 
Log Message:
* Fri Mar  7 2008 Patrice Dumas <pertusus at free.fr> 0.8.2-1
- update to 0.8.2



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gnash/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	6 Sep 2007 11:56:09 -0000	1.5
+++ .cvsignore	8 Mar 2008 00:10:36 -0000	1.6
@@ -1 +1 @@
-gnash-0.8.1.tar.gz
+gnash-0.8.2.tar.gz


Index: gnash.spec
===================================================================
RCS file: /cvs/extras/rpms/gnash/devel/gnash.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- gnash.spec	19 Feb 2008 18:14:50 -0000	1.14
+++ gnash.spec	8 Mar 2008 00:10:36 -0000	1.15
@@ -1,18 +1,16 @@
 Name:           gnash
-Version:        0.8.1
-Release:        7%{?dist}
+Version:        0.8.2
+Release:        1%{?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
-# from Martin Stransky
-Patch0:         gnash-plugin.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  libxml2-devel libpng-devel libjpeg-devel libogg-devel
-BuildRequires:  boost-devel curl-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
@@ -20,14 +18,14 @@
 #BuildRequires:  libGLU-devel libGL-devel
 BuildRequires:  SDL-devel 
 BuildRequires:  agg-devel 
-BuildRequires:  kdelibs-devel
+BuildRequires:  kdelibs3-devel
 BuildRequires:  gtkglext-devel
 BuildRequires:  docbook2X
 BuildRequires:  gstreamer-devel >= 0.10
 BuildRequires:  scrollkeeper
 
-Requires(post): scrollkeeper
-Requires(postun): scrollkeeper
+#Requires(post): scrollkeeper
+#Requires(postun): scrollkeeper
 Requires(post): /sbin/ldconfig
 Requires(postun): /sbin/ldconfig
 Requires(post): /sbin/install-info
@@ -58,50 +56,41 @@
 %description klash
 The gnash flash movie player plugin for Konqueror.
 
-# cygnal just segfaults for me
-#%package cygnal
-#Summary:   Streaming media server
-#Requires:  %{name} = %{version}-%{release}
-#Group:     Applications/Multimedia
+%package cygnal
+Summary:   Streaming media server
+Requires:  %{name} = %{version}-%{release}
+Group:     Applications/Multimedia
 
-#%description cygnal
-#Cygnal is a streaming media server that's Flash aware.
+%description cygnal
+Cygnal is a streaming media server that's Flash aware.
 
 
 %prep
 %setup -q
-%patch0 -p1 -b .plugin
 
 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
 [ -n "$QTDIR" ] || . %{_sysconfdir}/profile.d/qt.sh
-%configure --disable-static --with-plugindir=%{_libdir}/mozilla/plugins \
-  --enable-ghelp --enable-docbook --enable-media=GST \
+# --enable-ghelp is disabled
+%configure --disable-static --with-npapi-plugindir=%{_libdir}/mozilla/plugins \
+  --disable-docbook --enable-media=GST \
   --disable-dependency-tracking --disable-rpath \
+  --enable-cygnal \
+  --enable-gui=gtk,kde,sdl,fb \
   --with-qtdir=$QTDIR
 #doesn't work currently: %%{?_smp_mflags}
 make 
 
-# texinfo and therefore info generation is broken, still we have the
-# code to regenerate them
-pushd doc/C
-rm gnash.html gnash.1 gnash.info gnash.texi actionscript.html \
-   actionscript.info actionscript.texi
-make man html info
-pushd asspec
-rm asspec.info asspec.html asspec.texi
-make html info
-popd
-popd
-
 
 %install
 rm -rf $RPM_BUILD_ROOT
-make install DESTDIR=$RPM_BUILD_ROOT
+make install install-plugin \
+ DESTDIR=$RPM_BUILD_ROOT INSTALL='install -p'
 rm $RPM_BUILD_ROOT%{_libdir}/gnash/*.la
 #rm \
 # $RPM_BUILD_ROOT%{_libdir}/libgnashamf.so \
@@ -112,25 +101,36 @@
 # $RPM_BUILD_ROOT%{_libdir}/libgnashserver.so \
 # $RPM_BUILD_ROOT%{_libdir}/libgnashplayer.so \
 # $RPM_BUILD_ROOT%{_libdir}/libklashplayer.so
-rm -rf $RPM_BUILD_ROOT%{_localstatedir}/scrollkeeper
+#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%{_libdir}/gnash/libltdl*
 rm \
  $RPM_BUILD_ROOT%{_includedir}/ltdl.h
 # info isn't generated rightly
-rm -rf \
- $RPM_BUILD_ROOT%{_infodir}/
+#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
+#rm -rf \
+# $RPM_BUILD_ROOT%{_datadir}/omf
 # cygnal just segfaults
 #rm \
 # $RPM_BUILD_ROOT%{_bindir}/cygnal
 
 # 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/
+
+chmod a-x $RPM_BUILD_ROOT%{_datadir}/services/klash_part.desktop \
+ $RPM_BUILD_ROOT%{_datadir}/apps/klash/pluginsinfo
 
 %find_lang %{name}
 
@@ -145,13 +145,17 @@
 #/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 || :
+/sbin/install-info %{_infodir}/gnash_ref.info %{_infodir}/dir || :
+/sbin/install-info %{_infodir}/gnash_user.info %{_infodir}/dir || :
 
 %preun
-#if [ $1 = 0 ]; then
+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 || :
-#fi
+    /sbin/install-info --delete %{_infodir}/gnash_ref.info %{_infodir}/dir || :
+    /sbin/install-info --delete %{_infodir}/gnash_user.info %{_infodir}/dir || :
+fi
 
 %postun
 /sbin/ldconfig
@@ -160,17 +164,24 @@
 %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 doc/C/gnash.html doc/C/actionscript.html doc/C/asspec/asspec.html
+#%doc doc/C/images
+%doc __dist_docs/*
+%{_bindir}/dumpshm
+%{_bindir}/fb-gnash
 %{_bindir}/gtk-gnash
+%{_bindir}/sdl-gnash
+%{_bindir}/soldumper
 %{_bindir}/gnash
-%{_bindir}/gparser
 %{_bindir}/gprocessor
 %{_libdir}/gnash/
 #%{_libdir}/libgnash*-*.so
 #%{_libdir}/libklash*-*.so
-%{_mandir}/man1/gnash*
-#%{_infodir}/gnash*
+%{_mandir}/man1/gnash.1*
+%{_mandir}/man1/dumpshm.1*
+%{_mandir}/man1/gprocessor.1*
+%{_mandir}/man1/soldumper.1*
+%{_infodir}/gnash*
 %{_datadir}/gnash/
 #%{_datadir}/omf/gnash/
 
@@ -181,18 +192,17 @@
 %files klash
 %defattr(-,root,root,-)
 %{_bindir}/kde-gnash
-%{_libdir}/kde3/libklashpart.*
 %{_datadir}/apps/klash/
-#%{_datadir}/config/klashrc
 %{_datadir}/services/klash_part.desktop
 
-#%files cygnal
-#%defattr(-,root,root,-)
-#%{_bindir}/cygnal
+%files cygnal
+%defattr(-,root,root,-)
+%{_bindir}/cygnal
+%{_mandir}/man1/cygnal.1*
 
 %changelog
-* Tue Feb 19 2008 Fedora Release Engineering <rel-eng at fedoraproject.org> - 0.8.1-7
-- Autorebuild for GCC 4.3
+* Fri Mar  7 2008 Patrice Dumas <pertusus at free.fr> 0.8.2-1
+- update to 0.8.2
 
 * Sat Oct 27 2007 Patrice Dumas <pertusus at free.fr> 0.8.1-6
 - add patch from Martin Stransky to fix wrapped plugin #281061


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gnash/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	6 Sep 2007 11:56:09 -0000	1.5
+++ sources	8 Mar 2008 00:10:36 -0000	1.6
@@ -1 +1 @@
-28e9f4bd71154a89f6f683c3e7651e64  gnash-0.8.1.tar.gz
+24dfad0b553254faa06cf1bc1a43fef9  gnash-0.8.2.tar.gz