rpms/gnash/OLPC-3 gnash-0.8.3-link-glib.patch, NONE, 1.1 .cvsignore, 1.6, 1.7 gnash.spec, 1.20, 1.21 sources, 1.6, 1.7
Tomeu Vizoso (tomeu)
fedora-extras-commits at redhat.com
Wed Jun 25 12:35:00 UTC 2008
- Previous message (by thread): rpms/perl-Devel-StackTrace/devel .cvsignore, 1.8, 1.9 perl-Devel-StackTrace.spec, 1.14, 1.15 sources, 1.8, 1.9
- Next message (by thread): rpms/perl-Devel-StackTrace/F-9 .cvsignore, 1.8, 1.9 perl-Devel-StackTrace.spec, 1.14, 1.15 sources, 1.8, 1.9
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: tomeu
Update of /cvs/pkgs/rpms/gnash/OLPC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28851
Modified Files:
.cvsignore gnash.spec sources
Added Files:
gnash-0.8.3-link-glib.patch
Log Message:
* Sun Jun 25 2008 Tomeu Vizoso <tomeu at tomeuvizoso.net> 0.8.3-1
- update to 0.8.3 and adapt to OLPC
gnash-0.8.3-link-glib.patch:
--- NEW FILE gnash-0.8.3-link-glib.patch ---
diff -ru gnash-0.8.3.orig/plugin/Makefile.in gnash-0.8.3/plugin/Makefile.in
--- gnash-0.8.3.orig/plugin/Makefile.in 2008-06-25 07:29:47.000000000 -0400
+++ gnash-0.8.3/plugin/Makefile.in 2008-06-25 07:31:15.000000000 -0400
@@ -474,6 +474,7 @@
@NSAPI_TRUE@@WIN32_FALSE@ mozilla-sdk/np_entry.cpp
@NSAPI_TRUE@@WIN32_FALSE at libgnashplugin_la_LIBADD = \
+ at NSAPI_TRUE@@WIN32_FALSE@ $(GLIB_LIBS) \
@NSAPI_TRUE@@WIN32_FALSE@ $(NULL)
@NSAPI_TRUE@@PLUGIN_LINK_UNDEFINED_FALSE@@WIN32_FALSE at libgnashplugin_la_LDFLAGS = -module -avoid-version -L$(plugindir)
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gnash/OLPC-3/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore 8 Mar 2008 00:10:36 -0000 1.6
+++ .cvsignore 25 Jun 2008 12:34:10 -0000 1.7
@@ -1 +1 @@
-gnash-0.8.2.tar.gz
+gnash-0.8.3.tar.gz
Index: gnash.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnash/OLPC-3/gnash.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- gnash.spec 20 Jun 2008 14:42:39 -0000 1.20
+++ gnash.spec 25 Jun 2008 12:34:10 -0000 1.21
@@ -1,7 +1,8 @@
Name: gnash
-Version: 0.8.2
-Release: 4%{?dist}
+Version: 0.8.3
+Release: 1%{?dist}
Summary: GNU flash movie player
+Patch0: gnash-0.8.3-link-glib.patch
Group: Applications/Multimedia
License: GPLv3+
@@ -16,10 +17,8 @@
#BuildRequires: xorg-x11-devel
# modular Xorg
#BuildRequires: libGLU-devel libGL-devel
-BuildRequires: SDL-devel
BuildRequires: agg-devel
-BuildRequires: kdelibs3-devel
-BuildRequires: gtkglext-devel
+BuildRequires: gtk2-devel
BuildRequires: docbook2X
BuildRequires: gstreamer-devel >= 0.10
BuildRequires: scrollkeeper
@@ -53,25 +52,9 @@
%description plugin
The gnash flash movie player plugin for firefox or mozilla.
-%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.
-
-%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.
-
-
%prep
%setup -q
+%patch0 -p1
chmod a-x libgeometry/snappingrange.h backend/render*.h gui/gtk_glue_agg.{h,cpp}
@@ -80,14 +63,11 @@
mv AUTHORS.utf8 AUTHORS
%build
-[ -n "$QTDIR" ] || . %{_sysconfdir}/profile.d/qt.sh
# --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
+ --enable-gui=gtk
#doesn't work currently: %%{?_smp_mflags}
make
@@ -134,8 +114,12 @@
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
+rm -f $RPM_BUILD_ROOT%{_libdir}/gnash/libmozsdk.so
+rm -f $RPM_BUILD_ROOT%{_libdir}/gnash/libmozsdk.so.0
+rm -f $RPM_BUILD_ROOT%{_libdir}/gnash/libmozsdk.so.0.0.0
+
+rm -f $RPM_BUILD_ROOT%{_mandir}/man1/cygnal.1*
+rm -f $RPM_BUILD_ROOT%{_mandir}/man1/soldumper.1*
%find_lang %{name}
@@ -145,22 +129,8 @@
%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 || :
-/sbin/install-info %{_infodir}/gnash_ref.info %{_infodir}/dir || :
-/sbin/install-info %{_infodir}/gnash_user.info %{_infodir}/dir || :
%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
@@ -173,9 +143,7 @@
#%doc doc/C/images
%doc __dist_docs/*
%{_bindir}/dumpshm
-%{_bindir}/fb-gnash
%{_bindir}/gtk-gnash
-%{_bindir}/sdl-gnash
%{_bindir}/soldumper
%{_bindir}/gnash
%{_bindir}/gprocessor
@@ -185,29 +153,20 @@
%{_mandir}/man1/gnash.1*
%{_mandir}/man1/dumpshm.1*
%{_mandir}/man1/gprocessor.1*
-%{_mandir}/man1/soldumper.1*
%{_infodir}/gnash*
%{_datadir}/gnash/
#%{_datadir}/omf/gnash/
+%{_sysconfdir}/gnashpluginrc
+%{_sysconfdir}/gnashrc
%files plugin
%defattr(-,root,root,-)
%{_libdir}/mozilla/plugins/libgnashplugin.so
-%files klash
-%defattr(-,root,root,-)
-%{_bindir}/kde-gnash
-%{_libdir}/kde3/libklashpart.la
-%{_libdir}/kde3/libklashpart.so
-%{_datadir}/apps/klash/
-%{_datadir}/services/klash_part.desktop
-
-%files cygnal
-%defattr(-,root,root,-)
-%{_bindir}/cygnal
-%{_mandir}/man1/cygnal.1*
-
%changelog
+* Sun Jun 25 2008 Tomeu Vizoso <tomeu at tomeuvizoso.net> 0.8.3-1
+- update to 0.8.3 and adapt to OLPC
+
* Fri Jun 20 2008 Martin Stransky <stransky at redhat.com> 0.8.2-4
- rebuild against new xulrunner
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gnash/OLPC-3/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources 8 Mar 2008 00:10:36 -0000 1.6
+++ sources 25 Jun 2008 12:34:10 -0000 1.7
@@ -1 +1 @@
-24dfad0b553254faa06cf1bc1a43fef9 gnash-0.8.2.tar.gz
+126be87b3866abdd7a9ea32fcb44363e gnash-0.8.3.tar.gz
- Previous message (by thread): rpms/perl-Devel-StackTrace/devel .cvsignore, 1.8, 1.9 perl-Devel-StackTrace.spec, 1.14, 1.15 sources, 1.8, 1.9
- Next message (by thread): rpms/perl-Devel-StackTrace/F-9 .cvsignore, 1.8, 1.9 perl-Devel-StackTrace.spec, 1.14, 1.15 sources, 1.8, 1.9
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the fedora-extras-commits
mailing list