SPECS (AC-branch): xulrunner.spec - better xulrunner wrapper

[glen]

Author: glen                         Date: Tue Jan  2 18:09:07 2007 GMT
Module: SPECS                         Tag: AC-branch
---- Log message:
- better xulrunner wrapper

---- Files affected:
SPECS:
   xulrunner.spec (1.7.2.8 -> 1.7.2.9) 

---- Diffs:

================================================================
Index: SPECS/xulrunner.spec
diff -u SPECS/xulrunner.spec:1.7.2.8 SPECS/xulrunner.spec:1.7.2.9
--- SPECS/xulrunner.spec:1.7.2.8	Tue Jan  2 18:14:26 2007
+++ SPECS/xulrunner.spec	Tue Jan  2 19:09:01 2007
@@ -198,14 +198,13 @@
 
 rm -f $RPM_BUILD_ROOT%{_pkgconfigdir}/xulrunner-nss.pc $RPM_BUILD_ROOT%{_pkgconfigdir}/xulrunner-nspr.pc
 
+# rename to without -bin extension for killall xulrunner to work
+mv $RPM_BUILD_ROOT%{_libdir}/%{name}/xulrunner{-bin,}
 cat << 'EOF' > $RPM_BUILD_ROOT%{_bindir}/xulrunner
 #!/bin/sh
+export LD_LIBRARY_PATH=%{_libdir}/%{name}${LD_LIBRARY_PATH:+:$LD_LIBRARY_PATH}
 
-LD_LIBRARY_PATH=%{_libdir}/%{name}${LD_LIBRARY_PATH:+:$LD_LIBRARY_PATH}
-export LD_LIBRARY_PATH
-
-MOZILLA_FIVE_HOME=%{_libdir}/%{name} \
-%{_libdir}/%{name}/xulrunner-bin "$@"
+exec %{_libdir}/%{name}/xulrunner "$@"
 EOF
 
 cat << 'EOF' > $RPM_BUILD_ROOT%{_sbindir}/%{name}-chrome+xpcom-generate
@@ -249,7 +248,7 @@
 %dir %{_libdir}/%{name}/res
 %dir %{_datadir}/%{name}
 
-%attr(755,root,root) %{_libdir}/%{name}/xulrunner-bin
+%attr(755,root,root) %{_libdir}/%{name}/xulrunner
 %attr(755,root,root) %{_libdir}/%{name}/xpidl
 %attr(755,root,root) %{_libdir}/%{name}/reg*
 
@@ -436,6 +435,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.7.2.9  2007/01/02 18:09:01  glen
+- better xulrunner wrapper
+
 Revision 1.7.2.8  2007/01/02 17:14:26  glen
 - missing dir for -libs
 
@@ -487,4 +489,3 @@
   mozilla guru (is all required stuff packaged? is some unecessary stuff
   packaged? does it need some other patches? does it need some other
   configure/build options?)
-
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/xulrunner.spec?r1=1.7.2.8&r2=1.7.2.9&f=u