rpms/taxipilot/devel taxipilot-0.9.2-arts-startup.patch, NONE, 1.1 taxipilot-0.9.2-kdemm.patch, NONE, 1.1 taxipilot-0.9.1-desktop.patch, 1.3, 1.4 taxipilot.spec, 1.5, 1.6 taxipilot-wrapper, 1.1, NONE

Wed Dec 19 12:46:43 UTC 2007

Author: jwrdegoede

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

Modified Files:
	taxipilot-0.9.1-desktop.patch taxipilot.spec 
Added Files:
	taxipilot-0.9.2-arts-startup.patch taxipilot-0.9.2-kdemm.patch 
Removed Files:
	taxipilot-wrapper 
Log Message:
* Wed Dec 19 2007 Hans de Goede <j.w.r.degoede at hhs.nl> 0.9.2-5
- Add patch by Rex Dieter to no longer BuildRequire kdemultimedia3-devel, as
  that is going away, we now require arts-devel instead (bz 410851)
- Revert "Put our own private lib in a subdir of /usr/lib so that we no longer
  become multilib (bz 343261)" change, as that breaks sound
- Add a patch which ensures artsd gets started if needed


taxipilot-0.9.2-arts-startup.patch:

--- NEW FILE taxipilot-0.9.2-arts-startup.patch ---
--- taxipilot-0.9.2/taxipilot/soundwrapper.cpp	2007-05-27 16:53:29.000000000 +0200
+++ taxipilot-0.9.2.new/taxipilot/soundwrapper.cpp	2007-12-19 13:28:02.000000000 +0100
@@ -22,6 +22,7 @@
 #include <arts/qiomanager.h>
 #include <klocale.h>
 #include <arts/kartsdispatcher.h>
+#include <arts/kartsserver.h>
 
 #include "cdp.h"
 
@@ -134,7 +135,8 @@
 
 /** Creates server, factory and all registered sounds */
 void SoundWrapper::start_server () {
-	server = Arts::Reference("global:Arts_SoundServerV2");
+	KArtsServer kserver;
+	server = kserver.server();
 	if (server.isNull ()) {
 		sound_error = true;
 		cdp->debug_msg (i18n ("Could not reference sound-server. Sound is disabled."), Serious);

taxipilot-0.9.2-kdemm.patch:

--- NEW FILE taxipilot-0.9.2-kdemm.patch ---
diff -up taxipilot-0.9.2/taxipilot/Makefile.in.kdemm taxipilot-0.9.2/taxipilot/Makefile.in
--- taxipilot-0.9.2/taxipilot/Makefile.in.kdemm	2007-05-28 06:15:25.000000000 -0500
+++ taxipilot-0.9.2/taxipilot/Makefile.in	2007-12-04 13:11:22.000000000 -0600
@@ -389,7 +389,7 @@ noinst_HEADERS = missionselector.h setti
 
 # the library search path.
 taxipilot_LDFLAGS = $(KDE_RPATH)
-taxipilot_LDADD = ./EXT_wavpo/libEXT_wavpo.la -lartsmodules -lartskde -lsoundserver_idl -lmcop_mt $(LIB_KDEUI) $(LIB_KDECORE)
+taxipilot_LDADD = ./EXT_wavpo/libEXT_wavpo.la -lartskde $(LIB_KDEUI) $(LIB_KDECORE)
 SUBDIRS = EXT_wavpo
 #>- METASOURCES = preferences.moc taxipilotapp.moc taxipilot.moc missionselector.moc highscores.moc
 
diff -up taxipilot-0.9.2/taxipilot/Makefile.am.kdemm taxipilot-0.9.2/taxipilot/Makefile.am
--- taxipilot-0.9.2/taxipilot/Makefile.am.kdemm	2007-05-27 10:03:50.000000000 -0500
+++ taxipilot-0.9.2/taxipilot/Makefile.am	2007-12-04 13:11:01.000000000 -0600
@@ -22,7 +22,7 @@ noinst_HEADERS = missionselector.h setti
 # the library search path.
 taxipilot_LDFLAGS = $(KDE_RPATH)
 
-taxipilot_LDADD   = ./EXT_wavpo/libEXT_wavpo.la -lartsmodules -lartskde -lsoundserver_idl -lmcop_mt $(LIB_KDEUI) $(LIB_KDECORE)
+taxipilot_LDADD   = ./EXT_wavpo/libEXT_wavpo.la -lartskde $(LIB_KDEUI) $(LIB_KDECORE)
 
 SUBDIRS = EXT_wavpo
 

taxipilot-0.9.1-desktop.patch:

Index: taxipilot-0.9.1-desktop.patch
===================================================================
RCS file: /cvs/extras/rpms/taxipilot/devel/taxipilot-0.9.1-desktop.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- taxipilot-0.9.1-desktop.patch	2 Dec 2007 16:33:58 -0000	1.3
+++ taxipilot-0.9.1-desktop.patch	19 Dec 2007 12:46:33 -0000	1.4
@@ -1,14 +1,12 @@
 diff -up taxipilot-0.9.2/taxipilot/taxipilot.desktop.desktop taxipilot-0.9.2/taxipilot/taxipilot.desktop
 --- taxipilot-0.9.2/taxipilot/taxipilot.desktop.desktop	2006-03-01 11:38:30.000000000 +0100
 +++ taxipilot-0.9.2/taxipilot/taxipilot.desktop	2007-10-22 09:23:11.000000000 +0200
-@@ -1,12 +1,11 @@
- # KDE Config File  
+@@ -2,11 +2,10 @@
  [Desktop Entry]
  Type=Application
--Exec=taxipilot -caption "%c" %i %m  
+ Exec=taxipilot -caption "%c" %i %m  
 -Icon=taxipilot.png
 -MiniIcon=taxipilot.png
-+Exec=taxipilot-wrapper -caption "%c" %i %m  
 +Icon=taxipilot
  DocPath=taxipilot/index.html
 -Comment=


Index: taxipilot.spec
===================================================================
RCS file: /cvs/extras/rpms/taxipilot/devel/taxipilot.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- taxipilot.spec	2 Dec 2007 16:18:50 -0000	1.5
+++ taxipilot.spec	19 Dec 2007 12:46:33 -0000	1.6
@@ -1,16 +1,17 @@
 Name:           taxipilot
 Version:        0.9.2
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        Game where you pilot a taxi in space
 Group:          Amusements/Games
 License:        GPLv2+
 URL:            http://taxipilot.sourceforge.net/
 Source0:        http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz
-Source1:        %{name}-wrapper
 Patch1:         taxipilot-0.9.1-desktop.patch
 Patch2:         taxipilot-0.9.1-weaksym.patch
+Patch3:         taxipilot-0.9.2-kdemm.patch
+Patch4:         taxipilot-0.9.2-arts-startup.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires:  kdelibs3-devel kdemultimedia3-devel desktop-file-utils
+BuildRequires:  kdelibs3-devel arts-devel desktop-file-utils
 Requires:       hicolor-icon-theme
 
 %description
@@ -23,6 +24,8 @@
 %setup -q
 %patch1 -p1 -b .desktop
 %patch2 -p1 -b .weaksym
+%patch3 -p1 -b .kdemm
+%patch4 -p1 -b .start-arts
 
 
 %build
@@ -33,16 +36,9 @@
 %install
 rm -rf $RPM_BUILD_ROOT
 make install DESTDIR=$RPM_BUILD_ROOT
+rm $RPM_BUILD_ROOT%{_libdir}/libEXT_wavpo.so
 %find_lang %{name}
 
-# put the private libEXT_wavpo lib in a private subdir of %{_libdir} to avoid
-# us becoming multilib
-mkdir -p $RPM_BUILD_ROOT%{_libdir}/%{name}
-mv $RPM_BUILD_ROOT%{_libdir}/libEXT_wavpo.* $RPM_BUILD_ROOT%{_libdir}/%{name}
-
-# install LD_LIBRARY_PATH setting wrapper so that libEXT_wavpo can be found
-install -p -m 755 %{SOURCE1} $RPM_BUILD_ROOT%{_bindir}
-
 # install .desktop file
 desktop-file-install --vendor fedora --delete-original \
   --dir $RPM_BUILD_ROOT%{_datadir}/applications \
@@ -70,7 +66,7 @@
 %defattr(-,root,root,-)
 %doc AUTHORS COPYING ChangeLog TODO
 %{_bindir}/%{name}*
-%{_libdir}/%{name}
+%{_libdir}/libEXT_wavpo.*
 %{_libdir}/mcop/EXT_WavPlayObject.mcopclass
 %{_datadir}/apps/%{name}
 %{_datadir}/applications/fedora-%{name}.desktop
@@ -79,6 +75,13 @@
 
 
 %changelog
+* Wed Dec 19 2007 Hans de Goede <j.w.r.degoede at hhs.nl> 0.9.2-5
+- Add patch by Rex Dieter to no longer BuildRequire kdemultimedia3-devel, as
+  that is going away, we now require arts-devel instead (bz 410851)
+- Revert "Put our own private lib in a subdir of /usr/lib so that we no longer
+  become multilib (bz 343261)" change, as that breaks sound
+- Add a patch which ensures artsd gets started if needed
+
 * Sun Dec  2 2007 Hans de Goede <j.w.r.degoede at hhs.nl> 0.9.2-4
 - BuildRequire kdelibs3-devel (and kdemultimedia3-devel) instead of
   kdelibs-devel as that now is kde4 based, and we need kde 3


--- taxipilot-wrapper DELETED ---


