rpms/gnash/devel gnash-README.fedora, NONE, 1.1 gnash-configure-pkgconfig.patch, NONE, 1.1 gnash-continue_on_info_install_error.patch, NONE, 1.1 gnash-plugin-tempfile-dir.patch, NONE, 1.1 gnash.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2

Jens Petersen (petersen) fedora-extras-commits at redhat.com
Sun Aug 27 08:39:02 UTC 2006


Author: petersen

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

Modified Files:
	.cvsignore sources 
Added Files:
	gnash-README.fedora gnash-configure-pkgconfig.patch 
	gnash-continue_on_info_install_error.patch 
	gnash-plugin-tempfile-dir.patch gnash.spec 
Log Message:
auto-import gnash-0.7.1-7 on branch devel from gnash-0.7.1-7.src.rpm


--- NEW FILE gnash-README.fedora ---
The gnash flash plugin will add a directory in /tmp for each flash
file it renders. This directory has a name like gnash-XXXXXX with 
XXXXXX replaced by a random string. Each directory contains a
downloaded flash file.

gnash-configure-pkgconfig.patch:

--- NEW FILE gnash-configure-pkgconfig.patch ---
--- gnash-20060320/configure.ac.1	2006-03-20 10:51:01.000000000 +0900
+++ gnash-20060320/configure.ac	2006-03-20 12:15:59.000000000 +0900
@@ -271,6 +271,11 @@
 plugmk="plugin/Makefile plugin/mozilla-sdk/Makefile"
 fi
 
+PKG_CHECK_MODULES(LIBXML, libxml-2.0)
+PKG_CHECK_MODULES(GTK2, gtk+-2.0)
+PKG_CHECK_MODULES(GLEXT, gtkglext-1.0, HAVE_GTK_GTKGL_H=1)
+
+
 AC_OUTPUT(Makefile
 libbase/Makefile
 libgeometry/Makefile

gnash-continue_on_info_install_error.patch:

--- NEW FILE gnash-continue_on_info_install_error.patch ---
--- doc/C/Makefile.am-old	2006-05-17 16:42:07.000000000 +0200
+++ doc/C/Makefile.am	2006-05-17 16:42:53.000000000 +0200
@@ -197,7 +197,7 @@
 
 install-info-hook: gnash.info
 	test -d "$(DESTDIR)$(infodir)" || $(mkinstalldirs) "$(DESTDIR)$(infodir)"
-	$(INSTALL_DATA) gnash.info $(DESTDIR)$(infodir)/gnash.info ; \
+	-$(INSTALL_DATA) gnash.info $(DESTDIR)$(infodir)/gnash.info ; \
 	  if (/sbin/install-info --version) >/dev/null 2>&1; then \
 	  version=`install-info --version | grep -c 'GNU texinfo'`; \
 	  if test $$version -eq 0; then \

gnash-plugin-tempfile-dir.patch:

--- NEW FILE gnash-plugin-tempfile-dir.patch ---
Index: plugin/plugin.cpp
===================================================================
RCS file: /sources/gnash/gnash/plugin/plugin.cpp,v
retrieving revision 1.39
diff -u -r1.39 plugin.cpp
--- plugin/plugin.cpp	10 Aug 2006 18:49:44 -0000	1.39
+++ plugin/plugin.cpp	16 Aug 2006 10:24:30 -0000
@@ -442,8 +442,13 @@
 
     end   = url.find(".swf", 0) + 4;
     start = url.rfind("/", end) + 1;
-    fname = "/tmp/";
-    fname += url.substr(start, end - start);
+    char* dirtemp = strdup ("/tmp/gnash-XXXXXX");
+    fname = mkdtemp (dirtemp);
+    if (fname.empty ()) {
+      free (dirtemp);
+      fname = "/tmp";
+    }
+    fname += "/" + url.substr(start, end - start);
 
     // extract the parameters from the URL
     start = url.find("?", end);


--- NEW FILE gnash.spec ---
Name:           gnash
Version:        0.7.1
Release:        7%{?dist}
Summary:        GNU flash movie player

Group:          Applications/Multimedia
License:        GPL
URL:            http://www.gnu.org/software/gnash/
Source0:        http://ftp.gnu.org/gnu/gnash/%{version}/%{name}-%{version}.tar.bz2
Source1:        gnash-README.fedora
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:  libxml2-devel libjpeg-devel libogg-devel libXmu-devel
BuildRequires:  SDL_mixer-devel
BuildRequires:  kdelibs-devel
BuildRequires:  gtkglext-devel
## GStreamer isn't used yet, but will be in the near future.
#BuildRequires:  gstreamer-devel
BuildRequires:  docbook2X
BuildRequires:  scrollkeeper
BuildRequires:  automake, libtool

Requires(post): scrollkeeper
Requires(postun): scrollkeeper
Requires(post): /sbin/ldconfig
Requires(postun): /sbin/ldconfig
Requires(post): /sbin/install-info
Requires(preun): /sbin/install-info
Patch1:         gnash-configure-pkgconfig.patch
Patch2:		gnash-continue_on_info_install_error.patch
Patch3:         gnash-plugin-tempfile-dir.patch

%description
Gnash is a GNU Flash movie player based on GameSWF,
and supports many SWF v7 features.

Note that Gnash does not work yet for newer flash sites, is known to
crash and can even trigger bugs that crash the graphical system.


%package plugin
Summary:   Flash movie player plugin for Mozilla Browser
Requires:  %{name} = %{version}-%{release}
Requires:  webclient
Group:     Applications/Internet

%description plugin
The gnash flash movie player plugin for firefox or mozilla.

Note that Gnash does not work yet for newer flash sites, is known to
crash and can even trigger bugs that crash the graphical system.


%package klash
Summary:   Konqueror flash movie player plugin
Requires:  %{name} = %{version}-%{release}
Group:     Applications/Multimedia

%description klash
The gnash flash movie player plugin for Konqueror.

Note that Gnash does not work yet for newer flash sites, is known to
crash and can even trigger bugs that crash the graphical system.


%prep
%setup -q
cp -p %{SOURCE1} README.fedora
%patch1 -p1 -b .1
%patch2 -p0 -b .2
%patch3 -p0 -b .3
autoreconf


%build
[ -n "$QTDIR" ] || . %{_sysconfdir}/profile.d/qt.sh
%configure --disable-static --with-plugindir=%{_libdir}/mozilla/plugins \
  --enable-ghelp --enable-docbook --enable-klash --disable-rpath \
  --disable-dependency-tracking --with-qtdir=$QTDIR
make %{?_smp_mflags}


%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT
rm -f $RPM_BUILD_ROOT/%{_libdir}/*.{la,so}
rm -rf $RPM_BUILD_ROOT/%{_localstatedir}/scrollkeeper
rm -f $RPM_BUILD_ROOT%{_infodir}/dir


%clean
rm -rf $RPM_BUILD_ROOT


%post 
/sbin/ldconfig
scrollkeeper-update -q -o %{_datadir}/omf/%{name} || :
/sbin/install-info --entry="* Gnash: (gnash). GNU Flash Player" %{_infodir}/%{name}.info %{_infodir}/dir || :


%preun
if [ $1 = 0 ]; then
    /sbin/install-info --delete %{_infodir}/%{name}.info %{_infodir}/dir || :
fi


%postun
/sbin/ldconfig
scrollkeeper-update -q || :


%files
%defattr(-,root,root,-)
%doc README AUTHORS COPYING NEWS 
%doc doc/C/gnash.html 
%doc doc/C/images
%{_bindir}/gnash
%{_bindir}/gparser
%{_bindir}/gprocessor
%{_mandir}/man1/gnash*
%{_infodir}/gnash*
%{_datadir}/gnash/
%{_datadir}/omf/gnash/
%{_libdir}/libgnash*.so.*


%files plugin
%defattr(-,root,root,-)
%doc README.fedora
%{_libdir}/mozilla/plugins/libgnashplugin.so


%files klash
%defattr(-,root,root,-)
%{_bindir}/klash
%{_libdir}/kde3/libklashpart.*
%{_datadir}/apps/klash/
%{_datadir}/config/klashrc
%{_datadir}/services/klash_part.desktop


%changelog
* Sun Aug 27 2006 Patrice Dumas <pertusus at free.fr> - 0.7.1-7
- add defattr for klash
- add warnings in the description about stability

* Mon Aug 21 2006 Patrice Dumas <pertusus at free.fr> - 0.7.1-6
- remove superfluous buildrequires autoconf
- rename last patch to gnash-plugin-tempfile-dir.patch
- add README.fedora to plugin to explain tmpdirs

* Wed Aug 16 2006 Jens Petersen <petersen at redhat.com> - 0.7.1-5
- source qt.sh and configure --with-qtdir (Dominik Mierzejewski)
- add plugin-tempfile-dir.patch for plugin to use a safe tempdir

* Fri Jul 28 2006 Jens Petersen <petersen at redhat.com> - 0.7.1-4
- buildrequire autotools (Michael Knox)

* Fri Jun  2 2006 Patrice Dumas <pertusus at free.fr> - 0.7.1-3
- add gnash-continue_on_info_install_error.patch to avoid
- buildrequire libXmu-devel

* Wed May 17 2006 Jens Petersen <petersen at redhat.com> - 0.7.1-2
- configure with --disable-rpath
- buildrequire docbook2X
- remove devel files

* Sun May  7 2006 Jens Petersen <petersen at redhat.com> - 0.7.1-1
- update to 0.7.1 alpha release

* Sat Apr  22 2006 Rob Savoye <rob at welcomehome.org> - 0.7-1
- install the info file. Various tweaks for my system based on
Patrice's latest patch,

* Fri Feb  3 2006 Patrice Dumas <dumas at centre-cired.fr> - 0.7-1
- initial packaging


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gnash/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	27 Aug 2006 08:37:52 -0000	1.1
+++ .cvsignore	27 Aug 2006 08:39:02 -0000	1.2
@@ -0,0 +1 @@
+gnash-0.7.1.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gnash/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	27 Aug 2006 08:37:52 -0000	1.1
+++ sources	27 Aug 2006 08:39:02 -0000	1.2
@@ -0,0 +1 @@
+d860981aeaac0fc941a28abc3c24223c  gnash-0.7.1.tar.bz2




More information about the fedora-extras-commits mailing list