rpms/gnash/devel gnash.spec,1.34,1.35

[Kevin Kofler]

Author: kkofler

Update of /cvs/pkgs/rpms/gnash/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19995/devel

Modified Files:
	gnash.spec 
Log Message:
* Thu Oct  4 2008 Kevin Kofler <Kevin at tigcc.ticalc.org> 0.8.3-6
- use the KDE 3 executable with the KDE 4 KPart for now (making this conditional
  so it can easily be disabled or removed once the KDE 4 executable is fixed)


Index: gnash.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnash/devel/gnash.spec,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- gnash.spec	9 Oct 2008 00:09:29 -0000	1.34
+++ gnash.spec	9 Oct 2008 01:33:24 -0000	1.35
@@ -1,6 +1,11 @@
+# unfortunately, the KDE 4 executable is not ready yet
+# so use the KDE 3 one with the KDE 4 KPart - tested to work in Konqueror 4
+# (It uses XEmbed, so it doesn't actually link KDE 3 stuff into Konqueror 4.)
+%define use_kde3_executable 1
+
 Name:           gnash
 Version:        0.8.3
-Release:        5%{?dist}
+Release:        6%{?dist}
 Summary:        GNU flash movie player
 
 Group:          Applications/Multimedia
@@ -26,6 +31,9 @@
 BuildRequires:  agg-devel 
 BuildRequires:  kde-filesystem
 BuildRequires:  kdelibs4-devel
+%if 0%{?use_kde3_executable}
+BuildRequires:  kdelibs3-devel
+%endif
 BuildRequires:  gtkglext-devel
 BuildRequires:  docbook2X
 BuildRequires:  %{_bindir}/docbook2pdf
@@ -93,6 +101,10 @@
 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
 
 chmod a-x libgeometry/snappingrange.h backend/render*.h gui/gtk_glue_agg.{h,cpp} 
 
@@ -101,9 +113,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-qtdir=$QTDIR \
+  --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 \
@@ -111,6 +137,7 @@
   --enable-gui=gtk,kde4,sdl,fb \
   --with-qt4=%{_kde4_prefix} \
   --with-kde4=%{_kde4_prefix}
+%endif
 # make sure the Qt 4 moc etc. tools are found
 export PATH=%{_qt4_prefix}/bin:$PATH
 #doesn't work currently: %%{?_smp_mflags}
@@ -171,6 +198,10 @@
 #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
@@ -233,7 +264,11 @@
 
 %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
@@ -244,6 +279,10 @@
 %{_mandir}/man1/cygnal.1*
 
 %changelog
+* Thu Oct  4 2008 Kevin Kofler <Kevin at tigcc.ticalc.org> 0.8.3-6
+- use the KDE 3 executable with the KDE 4 KPart for now (making this conditional
+  so it can easily be disabled or removed once the KDE 4 executable is fixed)
+
 * Thu Oct  4 2008 Kevin Kofler <Kevin at tigcc.ticalc.org> 0.8.3-5
 - register KComponentData properly in KDE 4 KPart