SPECS (AC-branch): xulrunner.spec - patches adding nsIPermission a...

[hawk]

Author: hawk                         Date: Fri Dec 29 21:50:06 2006 GMT
Module: SPECS                         Tag: AC-branch
---- Log message:
- patches adding nsIPermission and nsISidebar to xulrunner, fixes
  compilation of some programs
- added simple startup script

---- Files affected:
SPECS:
   xulrunner.spec (1.7.2.1 -> 1.7.2.2) 

---- Diffs:

================================================================
Index: SPECS/xulrunner.spec
diff -u SPECS/xulrunner.spec:1.7.2.1 SPECS/xulrunner.spec:1.7.2.2
--- SPECS/xulrunner.spec:1.7.2.1	Fri Dec 29 19:09:07 2006
+++ SPECS/xulrunner.spec	Fri Dec 29 22:50:00 2006
@@ -3,13 +3,15 @@
 Summary(pl):	XULRunner - środowisko uruchomieniowe Mozilli dla aplikacji XUL+XPCOM
 Name:		xulrunner
 Version:	1.8.0.4
-Release:	0.1
+Release:	0.2
 License:	MPL v1.1 or GPL v2+ or LGPL v2.1+
 Group:		X11/Applications
 Source0:	http://ftp.mozilla.org/pub/mozilla.org/xulrunner/releases/%{version}/source/%{name}-%{version}-source.tar.bz2
 # Source0-md5:	4dc09831aa4e94fda5182a4897ed08e9
 Patch0:		%{name}-nss.patch
 Patch1:		%{name}-ldap-with-nss.patch
+Patch2:		%{name}-nsIPermission.patch
+Patch3:		%{name}-nsISidebar.patch
 URL:		http://developer.mozilla.org/en/docs/XULRunner
 BuildRequires:	/bin/csh
 BuildRequires:	/bin/ex
@@ -94,6 +96,8 @@
 
 %patch0 -p1
 %patch1 -p1
+%patch2 -p0
+%patch3 -p0
 
 %build
 BUILD_OFFICIAL="1"; export BUILD_OFFICIAL
@@ -189,7 +193,6 @@
 
 rm -f $RPM_BUILD_ROOT%{_pkgconfigdir}/xulrunner-nss.pc $RPM_BUILD_ROOT%{_pkgconfigdir}/xulrunner-nspr.pc
 
-install dist/bin/xulrunner $RPM_BUILD_ROOT%{_bindir}
 install dist/bin/xulrunner-bin $RPM_BUILD_ROOT%{_xulrunnerdir}
 install dist/bin/regxpcom $RPM_BUILD_ROOT%{_xulrunnerdir}
 install dist/bin/xpidl $RPM_BUILD_ROOT%{_xulrunnerdir}
@@ -199,6 +202,16 @@
 cp $RPM_BUILD_ROOT%{_chromedir}/installed-chrome.txt \
         $RPM_BUILD_ROOT%{_chromedir}/%{name}-installed-chrome.txt
 
+cat << 'EOF' > $RPM_BUILD_ROOT%{_bindir}/xulrunner
+#!/bin/sh
+
+LD_LIBRARY_PATH=/usr/lib/xulrunner${LD_LIBRARY_PATH:+:$LD_LIBRARY_PATH}
+export LD_LIBRARY_PATH
+
+MOZILLA_FIVE_HOME=/usr/lib/xulrunner
+/usr/lib/xulrunner/xulrunner-bin "$@"
+EOF
+
 cat << 'EOF' > $RPM_BUILD_ROOT%{_sbindir}/%{name}-chrome+xpcom-generate
 #!/bin/sh
 umask 022
@@ -433,6 +446,11 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.7.2.2  2006/12/29 21:50:00  hawk
+- patches adding nsIPermission and nsISidebar to xulrunner, fixes
+  compilation of some programs
+- added simple startup script
+
 Revision 1.7.2.1  2006/12/29 18:09:07  hawk
 - reverted modular xorg deps for Ac
 
================================================================

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