rpms/gnash/F-10 .cvsignore, 1.9, 1.10 gnash.spec, 1.45, 1.46 sources, 1.9, 1.10 gnash-0.8.4-configure.patch, 1.1, NONE gnash-0.8.4-fix-kde4-port-2.patch, 1.1, NONE gnash-0.8.4-port-to-kde4.patch, 1.2, NONE gnash-kde4-x11embed-resize.patch, 1.1, NONE gnash-kde4-x11embed.patch, 1.1, NONE
Jaroslav Reznik
jreznik at fedoraproject.org
Fri Mar 6 13:35:26 UTC 2009
Author: jreznik
Update of /cvs/pkgs/rpms/gnash/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1365
Modified Files:
.cvsignore gnash.spec sources
Removed Files:
gnash-0.8.4-configure.patch gnash-0.8.4-fix-kde4-port-2.patch
gnash-0.8.4-port-to-kde4.patch
gnash-kde4-x11embed-resize.patch gnash-kde4-x11embed.patch
Log Message:
* Fri Mar 06 2009 Jaroslav Reznik <jreznik at redhat.com> - 0.8.5-1
- update to 0.8.5
- remove use_kde3_executable_hack
- remove autoreconf
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gnash/F-10/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- .cvsignore 20 Oct 2008 14:06:34 -0000 1.9
+++ .cvsignore 6 Mar 2009 13:34:55 -0000 1.10
@@ -1,2 +1,2 @@
-gnash-0.8.4.tar.gz
+gnash-0.8.5.tar.gz
gnash-splash.swf
Index: gnash.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnash/F-10/gnash.spec,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -r1.45 -r1.46
--- gnash.spec 13 Nov 2008 21:57:20 -0000 1.45
+++ gnash.spec 6 Mar 2009 13:34:56 -0000 1.46
@@ -1,11 +1,6 @@
-# The KDE 4 executable should be working now.
-# set this to 1 to use the KDE 3 one with the KDE 4 KPart (for use in Konq 4)
-# (It uses XEmbed, so it doesn't actually link KDE 3 stuff into Konqueror 4.)
-%define use_kde3_executable 0
-
Name: gnash
-Version: 0.8.4
-Release: 5%{?dist}
+Version: 0.8.5
+Release: 1%{?dist}
Summary: GNU flash movie player
Group: Applications/Multimedia
@@ -16,22 +11,12 @@
Source2: gnash.desktop
Patch0: gnash-0.8.3-manual.patch
-# make autoreconf work
-Patch1: gnash-0.8.4-configure.patch
-# patch by Benjamin Wolsey and Bernhard Rosenkränzer
-Patch2: gnash-0.8.4-port-to-kde4.patch
# register KComponentData properly in KDE 4 KPart
Patch3: gnash-0.8.3-fix-kde4-port.patch
# Currently kde4-gnash (from kde4 branch) links against various KDE libraries,
# but only needs Qt -- this patch removes the superfluous linkage (from bero)
-Patch4: gnash-kde4-no-excessive-linkage.patch
-# This patch adds XEmbed support so kde4-gnash can be used in browser plugins
-# and the likes) (from bero)
-Patch5: gnash-kde4-x11embed.patch
-# XEmbed resizing patch (from bero)
-Patch6: gnash-kde4-x11embed-resize.patch
-# Missing hunks in the port-to-kde4 patch (from the upstream kde4 branch)
-Patch7: gnash-0.8.4-fix-kde4-port-2.patch
+# TODO: update to 0.8.5?
+#Patch4: gnash-kde4-no-excessive-linkage.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: libxml2-devel libpng-devel libjpeg-devel libogg-devel
@@ -44,10 +29,7 @@
BuildRequires: SDL-devel
BuildRequires: agg-devel
BuildRequires: kde-filesystem
-BuildRequires: kdelibs4-devel
-%if 0%{?use_kde3_executable}
-BuildRequires: kdelibs3-devel
-%endif
+BuildRequires: kdelibs-devel
BuildRequires: gtkglext-devel
BuildRequires: docbook2X
BuildRequires: %{_bindir}/docbook2pdf
@@ -56,8 +38,6 @@
BuildRequires: giflib-devel
BuildRequires: gettext
BuildRequires: desktop-file-utils
-# Need to autoreconf for the KDE 4 patch
-BuildRequires: autoconf automake libtool
#Requires(post): scrollkeeper
#Requires(postun): scrollkeeper
@@ -108,24 +88,10 @@
%prep
%setup -q
%patch0 -p1 -b .manual
-%patch1 -p1 -b .configure
-%patch2 -p1 -b .kde4
%patch3 -p1 -b .fix-kde4
-%patch4 -p1 -b .kde4-linkage
-%patch5 -p1 -b .xembed
-%patch6 -p1 -b .xembed-resize
-%patch7 -p1 -b .fix-kde4-2
-# 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
+# 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
#chmod a-x libgeometry/snappingrange.h backend/render*.h gui/gtk_glue_agg.{h,cpp}
@@ -134,35 +100,23 @@
mv AUTHORS.utf8 AUTHORS
%build
-%if 0%{?use_kde3_executable}
-[ -n "$QTDIR" ] || . %{_sysconfdir}/profile.d/qt.sh
-%endif
# --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).
-%if 0%{?use_kde3_executable}
-%configure --disable-static --with-npapi-plugindir=%{_libdir}/mozilla/plugins \
- --enable-docbook --enable-ghelp --enable-media=GST \
- --disable-dependency-tracking --disable-rpath \
- --enable-cygnal \
- --enable-gui=gtk,kde,kde4,sdl,fb \
- --disable-kparts \
- --with-qt4=%{_kde4_prefix} \
- --with-kde4=%{_kde4_prefix}
-%else
%configure --disable-static --with-npapi-plugindir=%{_libdir}/mozilla/plugins \
--enable-docbook --enable-ghelp --enable-media=GST \
--disable-dependency-tracking --disable-rpath \
--enable-cygnal \
--enable-gui=gtk,kde4,sdl,fb \
--with-qt4=%{_kde4_prefix} \
- --with-kde4=%{_kde4_prefix}
-%endif
+ --with-kde4-prefix=%{_kde4_prefix} \
+ --with-kde4-lib=%{_libdir}/kde4/devel \
+ --with-kde4-incl=%{_kde4_includedir}
# make sure the Qt 4 moc etc. tools are found
export PATH=%{_qt4_prefix}/bin:$PATH
#doesn't work currently: %%{?_smp_mflags}
-make KDE4_CFLAGS=-I%{_kde4_includedir}
-
+#make KDE4_CFLAGS=-I%{_kde4_includedir}
+make
%install
rm -rf $RPM_BUILD_ROOT
@@ -241,10 +195,6 @@
#chmod a-x $RPM_BUILD_ROOT%{_datadir}/services/klash_part.desktop \
# $RPM_BUILD_ROOT%{_datadir}/apps/klash/pluginsinfo
-%if 0%{?use_kde3_executable}
-rm $RPM_BUILD_ROOT/%{_kde4_bindir}/kde4-gnash
-%endif
-
%find_lang %{name}
%clean
@@ -314,6 +264,7 @@
%{_mandir}/man1/dumpshm.1*
%{_mandir}/man1/gprocessor.1*
%{_mandir}/man1/soldumper.1*
+%{_mandir}/man1/flvdumper.1*
%{_infodir}/gnash*
%{_datadir}/gnash/
%{_datadir}/icons/hicolor/32x32/*.png
@@ -327,11 +278,7 @@
%files klash
%defattr(-,root,root,-)
-%if 0%{?use_kde3_executable}
-%{_bindir}/kde-gnash
-%else
%{_kde4_bindir}/kde4-gnash
-%endif
%{_kde4_libdir}/kde4/libklashpart.so
%{_kde4_appsdir}/klash/
%{_kde4_datadir}/kde4/services/klash_part.desktop
@@ -342,6 +289,11 @@
%{_mandir}/man1/cygnal.1*
%changelog
+* Fri Mar 06 2009 Jaroslav Reznik <jreznik at redhat.com> - 0.8.5-1
+- update to 0.8.5
+- remove use_kde3_executable_hack
+- remove autoreconf
+
* Thu Nov 13 2008 Kevin Kofler <Kevin at tigcc.ticalc.org> 0.8.4-5
- add missing portions of KDE 4 port from upstream kde4 branch
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gnash/F-10/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- sources 20 Oct 2008 14:06:34 -0000 1.9
+++ sources 6 Mar 2009 13:34:56 -0000 1.10
@@ -1,2 +1,2 @@
-3100e8d669795c03167a171937897c83 gnash-0.8.4.tar.gz
+b54a72a52d2477e65d9029be572789ff gnash-0.8.5.tar.gz
3ba3f30fbcd9ac6458c7d50a33eb933e gnash-splash.swf
--- gnash-0.8.4-configure.patch DELETED ---
--- gnash-0.8.4-fix-kde4-port-2.patch DELETED ---
--- gnash-0.8.4-port-to-kde4.patch DELETED ---
--- gnash-kde4-x11embed-resize.patch DELETED ---
--- gnash-kde4-x11embed.patch DELETED ---
More information about the scm-commits
mailing list