rpms/taxipilot/devel taxipilot-wrapper, NONE, 1.1 taxipilot-0.9.1-desktop.patch, 1.1, 1.2 taxipilot.spec, 1.3, 1.4

[Hans de Goede (jwrdegoede)]

Author: jwrdegoede

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

Modified Files:
	taxipilot-0.9.1-desktop.patch taxipilot.spec 
Added Files:
	taxipilot-wrapper 
Log Message:
* Mon Oct 22 2007 Hans de Goede <j.w.r.degoede at hhs.nl> 0.9.2-3
- Put our own private lib in a subdir of /usr/lib so that we no longer become
  multilib (bz 343261)



--- NEW FILE taxipilot-wrapper ---
#!/bin/bash

if [ -d /usr/lib64/taxipilot ]; then
  export LD_LIBRARY_PATH=/usr/lib64/taxipilot
else
  export LD_LIBRARY_PATH=/usr/lib/taxipilot
fi

exec taxipilot "$@"

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.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- taxipilot-0.9.1-desktop.patch	10 May 2007 19:20:38 -0000	1.1
+++ taxipilot-0.9.1-desktop.patch	22 Oct 2007 08:22:57 -0000	1.2
@@ -1,8 +1,12 @@
---- taxipilot-0.9.1/taxipilot/taxipilot.desktop~	2007-04-24 21:53:16.000000000 +0200
-+++ taxipilot-0.9.1/taxipilot/taxipilot.desktop	2007-04-24 21:53:16.000000000 +0200
-@@ -3,10 +3,9 @@
+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  
+ [Desktop Entry]
  Type=Application
- Exec=taxipilot -caption "%c" %i %m  
+-Exec=taxipilot -caption "%c" %i %m  
++Exec=taxipilot-wrapper -caption "%c" %i %m  
  Icon=taxipilot.png
 -MiniIcon=taxipilot.png
  DocPath=taxipilot/index.html


Index: taxipilot.spec
===================================================================
RCS file: /cvs/extras/rpms/taxipilot/devel/taxipilot.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- taxipilot.spec	15 Aug 2007 11:21:24 -0000	1.3
+++ taxipilot.spec	22 Oct 2007 08:22:57 -0000	1.4
@@ -1,18 +1,17 @@
 Name:           taxipilot
 Version:        0.9.2
-Release:        2%{?dist}
+Release:        3%{?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
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  kdelibs-devel kdemultimedia-devel desktop-file-utils
 Requires:       hicolor-icon-theme
-Requires(post): /sbin/ldconfig
-Requires(postun): /sbin/ldconfig
 
 %description
 Game where you pilot a taxi in space, the objective is to pick up passengers
@@ -35,13 +34,19 @@
 rm -rf $RPM_BUILD_ROOT
 make install DESTDIR=$RPM_BUILD_ROOT
 %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 \
   $RPM_BUILD_ROOT%{_datadir}/applnk/Games/%{name}.desktop
-# alternatively we could manually install ext_wav_play_object.idl and
-# ext_wav_play_object.h and add a -devel package, but its highly unlikely
-# that anyone else would want to use this special dcop lib, so this is better
-rm $RPM_BUILD_ROOT%{_libdir}/libEXT_wavpo.so
 
 
 %clean
@@ -49,14 +54,12 @@
 
 
 %post
-/sbin/ldconfig
 touch --no-create %{_datadir}/icons/hicolor || :
 if [ -x %{_bindir}/gtk-update-icon-cache ]; then
    %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
 fi
 
 %postun
-/sbin/ldconfig
 touch --no-create %{_datadir}/icons/hicolor || :
 if [ -x %{_bindir}/gtk-update-icon-cache ]; then
    %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
@@ -66,9 +69,8 @@
 %files -f %{name}.lang
 %defattr(-,root,root,-)
 %doc AUTHORS COPYING ChangeLog TODO
-%{_bindir}/%{name}
-# .la file is included deliberately -> kde
-%{_libdir}/libEXT_wavpo.*
+%{_bindir}/%{name}*
+%{_libdir}/%{name}
 %{_libdir}/mcop/EXT_WavPlayObject.mcopclass
 %{_datadir}/apps/%{name}
 %{_datadir}/applications/fedora-%{name}.desktop
@@ -77,6 +79,10 @@
 
 
 %changelog
+* Mon Oct 22 2007 Hans de Goede <j.w.r.degoede at hhs.nl> 0.9.2-3
+- Put our own private lib in a subdir of /usr/lib so that we no longer become
+  multilib (bz 343261)
+
 * Wed Aug 15 2007 Hans de Goede <j.w.r.degoede at hhs.nl> 0.9.2-2
 - Update License tag for new Licensing Guidelines compliance