SPECS: xulrunner.spec - merge with AC-branch

[glen]

Author: glen                         Date: Sun Mar 30 12:36:32 2008 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- merge with AC-branch

---- Files affected:
SPECS:
   xulrunner.spec (1.44 -> 1.45) 

---- Diffs:

================================================================
Index: SPECS/xulrunner.spec
diff -u SPECS/xulrunner.spec:1.44 SPECS/xulrunner.spec:1.45
--- SPECS/xulrunner.spec:1.44	Wed Mar 26 15:13:03 2008
+++ SPECS/xulrunner.spec	Sun Mar 30 14:36:26 2008
@@ -20,6 +20,7 @@
 Patch1:		%{name}-install.patch
 Patch2:		%{name}-pc.patch
 Patch3:		%{name}-rpath.patch
+Patch4:		mozilla-firefox-ac.patch
 URL:		http://developer.mozilla.org/en/docs/XULRunner
 BuildRequires:	/bin/csh
 %{?with_gnome:BuildRequires:	GConf2-devel >= 1.2.1}
@@ -117,14 +118,19 @@
 %patch1 -p1
 %patch2 -p1
 %patch3 -p1
+%patch4 -p1
 
 %build
 cd mozilla
 
 cp -f %{_datadir}/automake/config.* build/autoconf
-cp -f %{_datadir}/automake/config.* nsprpub/build/autoconf
 cp -f %{_datadir}/automake/config.* directory/c-sdk/config/autoconf
 
+if [ ! -f configure -o configure.in -nt configure ]; then
+	%{__aclocal} -I build/autoconf
+	autoconf2_13
+fi
+
 cat << 'EOF' > .mozconfig
 . $topsrcdir/xulrunner/config/mozconfig
 
@@ -264,10 +270,26 @@
 rm -rf $HOME
 EOF
 
+rm $RPM_BUILD_ROOT%{_libdir}/%{name}/LICENSE
+rm $RPM_BUILD_ROOT%{_libdir}/%{name}/README.txt
+rm $RPM_BUILD_ROOT%{_libdir}/%{name}/dependentlibs.list
+rm $RPM_BUILD_ROOT%{_libdir}/%{name}/dictionaries/en-US.aff
+rm $RPM_BUILD_ROOT%{_libdir}/%{name}/dictionaries/en-US.dic
+rm $RPM_BUILD_ROOT%{_libdir}/%{name}/dirver
+rm $RPM_BUILD_ROOT%{_libdir}/%{name}/icons/document.png
+rm $RPM_BUILD_ROOT%{_libdir}/%{name}/icons/mozicon16.xpm
+rm $RPM_BUILD_ROOT%{_libdir}/%{name}/icons/mozicon50.xpm
+rm $RPM_BUILD_ROOT%{_libdir}/%{name}/mozilla-xremote-client
+rm $RPM_BUILD_ROOT%{_libdir}/%{name}/plugins/libnullplugin.so
+rm $RPM_BUILD_ROOT%{_libdir}/%{name}/plugins/libunixprintplugin.so
+rm $RPM_BUILD_ROOT%{_libdir}/%{name}/run-mozilla.sh
+rm $RPM_BUILD_ROOT%{_libdir}/%{name}/xpicleanup
+rm $RPM_BUILD_ROOT%{_datadir}/%{name}/chrome/icons/default/default.xpm
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-%post 
+%post
 %{_sbindir}/%{name}-chrome+xpcom-generate
 %update_browser_plugins
 
@@ -469,6 +491,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.45  2008-03-30 12:36:26  glen
+- merge with AC-branch
+
 Revision 1.44  2008-03-26 14:13:03  hawk
 - updated to 1.8.1.13, fixes CVE-2008-1233, CVE-2008-1234,  CVE-2008-1235,
   CVE-2008-1236, CVE-2008-1237, CVE-2008-1238, CVE-2007-4879,
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/xulrunner.spec?r1=1.44&r2=1.45&f=u