rpms/gnash/F-9 gnash.spec, 1.31, 1.32 gnash-kde4-no-excessive-linkage.patch, 1.1, NONE
Kevin Kofler
kkofler at fedoraproject.org
Fri Mar 6 18:40:59 UTC 2009
Author: kkofler
Update of /cvs/pkgs/rpms/gnash/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3838/F-9
Modified Files:
gnash.spec
Removed Files:
gnash-kde4-no-excessive-linkage.patch
Log Message:
Sync from devel:
* Fri Mar 06 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> 0.8.5-3
- explicitly link the KlashPart against the libraries it uses
Index: gnash.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnash/F-9/gnash.spec,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- gnash.spec 6 Mar 2009 15:16:35 -0000 1.31
+++ gnash.spec 6 Mar 2009 18:40:29 -0000 1.32
@@ -1,6 +1,6 @@
Name: gnash
Version: 0.8.5
-Release: 2%{?dist}
+Release: 3%{?dist}
Summary: GNU flash movie player
Group: Applications/Multimedia
@@ -13,10 +13,6 @@
Patch0: gnash-0.8.3-manual.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)
-# 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
@@ -94,6 +90,9 @@
# 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
+# Currently kde4-gnash (from kde4 branch) links against various KDE libraries,
+# but only needs Qt -- remove the superfluous linkage
+sed -i -e 's!\$(KDE4_LIBS)!!g' gui/Makefile.in
#chmod a-x libgeometry/snappingrange.h backend/render*.h gui/gtk_glue_agg.{h,cpp}
@@ -112,13 +111,13 @@
--enable-gui=gtk,kde4,sdl,fb \
--with-qt4=%{_kde4_prefix} \
--with-kde4-prefix=%{_kde4_prefix} \
- --with-kde4-lib=%{_libdir}/kde4/devel \
+ --with-kde4-lib=%{_kde4_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
+# override KDE4_LIBS because configure doesn't detect it properly
+make KDE4_LIBS='-L%{_kde4_libdir}/kde4/devel -lkparts -lkdeui -lkdecore'
%install
rm -rf $RPM_BUILD_ROOT
@@ -291,14 +290,23 @@
%{_mandir}/man1/cygnal.1*
%changelog
-* Fri Mar 06 2009 Jaroslav Reznik <jreznik at redhat.com> - 0.8.5-2
-- add missing speex-devel and gstreamer-plugins-base-devel BRs
+* Fri Mar 06 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> 0.8.5-3
+- explicitly link the KlashPart against the libraries it uses
-* Fri Mar 06 2009 Jaroslav Reznik <jreznik at redhat.com> - 0.8.5-1
+* Fri Mar 06 2009 Jaroslav Reznik <jreznik at redhat.com> 0.8.5-2
+- add missing speex-devel and gstreamer-plugins-base-devel BR
+
+* 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
+* Tue Feb 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> 0.8.4-7
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
+
+* Thu Dec 18 2008 Kevin Kofler <Kevin at tigcc.ticalc.org> 0.8.4-6
+- rebuild for new boost
+
* 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
--- gnash-kde4-no-excessive-linkage.patch DELETED ---
More information about the fedora-extras-commits
mailing list