SPECS (AC-branch): xulrunner.spec - add rpath patch so wrappers no...

[glen]

Author: glen                         Date: Sun Jan  7 02:52:59 2007 GMT
Module: SPECS                         Tag: AC-branch
---- Log message:
- add rpath patch so wrappers no longer needed
- xulrunner-stub moved to -devel

---- Files affected:
SPECS:
   xulrunner.spec (1.7.2.15 -> 1.7.2.16) 

---- Diffs:

================================================================
Index: SPECS/xulrunner.spec
diff -u SPECS/xulrunner.spec:1.7.2.15 SPECS/xulrunner.spec:1.7.2.16
--- SPECS/xulrunner.spec:1.7.2.15	Sun Jan  7 03:13:27 2007
+++ SPECS/xulrunner.spec	Sun Jan  7 03:52:54 2007
@@ -4,7 +4,7 @@
 %bcond_without	gnome	# disable all GNOME components (gnomevfs, gnome, gnomeui)
 #
 %define		_snap	20070102
-%define		_rel	2
+%define		_rel	2.6
 #
 Summary:	XULRunner - Mozilla Runtime Environment for XUL+XPCOM applications
 Summary(pl):	XULRunner - środowisko uruchomieniowe Mozilli dla aplikacji XUL+XPCOM
@@ -18,6 +18,7 @@
 Patch0:		%{name}-ldap-with-nss.patch
 Patch1:		%{name}-install.patch
 Patch2:		%{name}-pc.patch
+Patch3:		%{name}-rpath.patch
 URL:		http://developer.mozilla.org/en/docs/XULRunner
 BuildRequires:	/bin/csh
 %{?with_gnome:BuildRequires:	GConf2-devel >= 1.2.1}
@@ -108,6 +109,7 @@
 %patch0 -p1
 %patch1 -p1
 %patch2 -p1
+%patch3 -p1
 
 %build
 cd mozilla
@@ -116,8 +118,6 @@
 cp -f %{_datadir}/automake/config.* nsprpub/build/autoconf
 cp -f %{_datadir}/automake/config.* directory/c-sdk/config/autoconf
 
-%{__autoconf}
-
 cat << 'EOF' > .mozconfig
 . $topsrcdir/xulrunner/config/mozconfig
 
@@ -238,21 +238,8 @@
 # we use system pkgs
 rm $RPM_BUILD_ROOT%{_pkgconfigdir}/xulrunner-{nspr,nss}.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}
-
-exec %{_libdir}/%{name}/xulrunner "$@"
-EOF
-
-cat << 'EOF' > $RPM_BUILD_ROOT%{_bindir}/xpcshell
-#!/bin/sh
-export LD_LIBRARY_PATH=%{_libdir}/%{name}${LD_LIBRARY_PATH:+:$LD_LIBRARY_PATH}
-
-exec %{_libdir}/%{name}/xpcshell "$@"
-EOF
+mv $RPM_BUILD_ROOT{%{_libdir}/%{name}/xulrunner-bin,%{_bindir}/xulrunner}
+mv $RPM_BUILD_ROOT{%{_libdir}/%{name}/xpcshell,%{_bindir}}
 
 cat << 'EOF' > $RPM_BUILD_ROOT%{_sbindir}/%{name}-chrome+xpcom-generate
 #!/bin/sh
@@ -297,8 +284,6 @@
 %dir %{_datadir}/%{name}
 
 %attr(755,root,root) %{_libdir}/%{name}/xulrunner
-%attr(755,root,root) %{_libdir}/%{name}/xpcshell
-%attr(755,root,root) %{_libdir}/%{name}/xulrunner-stub
 %attr(755,root,root) %{_libdir}/%{name}/reg*
 
 %attr(755,root,root) %{_libdir}/%{name}/components/libauth*.so
@@ -458,7 +443,7 @@
 %{_datadir}/%{name}/chrome/toolkit.manifest
 
 # not generated automatically ?
-%{_datadir}/%{name}/chrome/chromelist.txt
+#%{_datadir}/%{name}/chrome/chromelist.txt
 
 %ghost %{_datadir}/%{name}/chrome/installed-chrome.txt
 
@@ -485,6 +470,7 @@
 %attr(755,root,root) %{_bindir}/xpidl
 %attr(755,root,root) %{_bindir}/xpt_dump
 %attr(755,root,root) %{_bindir}/xpt_link
+%attr(755,root,root) %{_libdir}/%{name}/xulrunner-stub
 %{_includedir}/%{name}
 %{_pkgconfigdir}/*
 
@@ -494,6 +480,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.7.2.16  2007/01/07 02:52:54  glen
+- add rpath patch so wrappers no longer needed
+- xulrunner-stub moved to -devel
+
 Revision 1.7.2.15  2007/01/07 02:13:27  glen
 - update to new mozconfig build style
 
================================================================

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