packages: iceweasel/iceweasel.spec - xulrunner has epoch 2 now - use pkg-co...

[glen]

Author: glen                         Date: Thu Mar 25 15:32:16 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- xulrunner has epoch 2 now
- use pkg-config to fetch libxul-sdk location
- files cleanup

---- Files affected:
packages/iceweasel:
   iceweasel.spec (1.97 -> 1.98) 

---- Diffs:

================================================================
Index: packages/iceweasel/iceweasel.spec
diff -u packages/iceweasel/iceweasel.spec:1.97 packages/iceweasel/iceweasel.spec:1.98
--- packages/iceweasel/iceweasel.spec:1.97	Tue Mar 23 21:20:25 2010
+++ packages/iceweasel/iceweasel.spec	Thu Mar 25 16:32:10 2010
@@ -86,7 +86,7 @@
 BuildRequires:	xorg-lib-libXft-devel >= 2.1
 BuildRequires:	xorg-lib-libXt-devel
 %if %{with xulrunner}
-BuildRequires:	xulrunner-devel >= 1:%{xulrunner_ver}
+BuildRequires:	xulrunner-devel >= 2:%{xulrunner_ver}
 %else
 BuildRequires:	nspr-devel >= 1:4.8
 %endif
@@ -179,8 +179,8 @@
 cd mozilla
 cp -f %{_datadir}/automake/config.* build/autoconf
 
-cat << 'EOF' > .mozconfig
-. $topsrcdir/browser/config/mozconfig
+cat << EOF > .mozconfig
+. \$topsrcdir/browser/config/mozconfig
 
 mk_add_options MOZ_OBJDIR=@TOPSRCDIR@/obj-%{_target_cpu}
 
@@ -244,7 +244,7 @@
 ac_add_options --with-distribution-id=org.pld-linux
 ac_add_options --with-branding=iceweasel/branding
 %if %{with xulrunner}
-ac_add_options --with-libxul-sdk=%{_libdir}/xulrunner-sdk
+ac_add_options --with-libxul-sdk=$(pkg-config --variable=sdkdir libxul)
 %endif
 ac_add_options --with-pthreads
 ac_add_options --with-system-bz2
@@ -312,8 +312,8 @@
 ln -s iceweasel $RPM_BUILD_ROOT%{_bindir}/firefox
 ln -s iceweasel $RPM_BUILD_ROOT%{_bindir}/mozilla-firefox
 
-install iceweasel/branding/default64.png $RPM_BUILD_ROOT%{_pixmapsdir}/iceweasel.png
-install %{SOURCE3} $RPM_BUILD_ROOT%{_desktopdir}/%{name}.desktop
+cp -a iceweasel/branding/default64.png $RPM_BUILD_ROOT%{_pixmapsdir}/iceweasel.png
+cp -a %{SOURCE3} $RPM_BUILD_ROOT%{_desktopdir}/%{name}.desktop
 
 # files created by regxpcom and iceweasel -register
 touch $RPM_BUILD_ROOT%{_libdir}/%{name}/components/compreg.dat
@@ -322,9 +322,9 @@
 %if %{with xulrunner}
 rm -f $RPM_BUILD_ROOT%{_libdir}/%{name}/run-mozilla.sh
 %endif
-# what's this? it's content is invalid anyway.
-rm -f $RPM_BUILD_ROOT%{_libdir}/%{name}/dependentlibs.list
-rm -f $RPM_BUILD_ROOT%{_libdir}/%{name}/old-homepage-default.properties
+rm $RPM_BUILD_ROOT%{_libdir}/%{name}/LICENSE
+rm $RPM_BUILD_ROOT%{_libdir}/%{name}/README.txt
+rm $RPM_BUILD_ROOT%{_libdir}/%{name}/components/components.list
 
 cat << 'EOF' > $RPM_BUILD_ROOT%{_sbindir}/%{name}-chrome+xpcom-generate
 #!/bin/sh
@@ -524,6 +524,11 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.98  2010/03/25 15:32:10  glen
+- xulrunner has epoch 2 now
+- use pkg-config to fetch libxul-sdk location
+- files cleanup
+
 Revision 1.97  2010/03/23 20:20:25  glen
 - some old cve entries
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/iceweasel/iceweasel.spec?r1=1.97&r2=1.98&f=u