packages: xulrunner/xulrunner.spec - up to 1.9.2.15 (firefox 3.6.15) - use ...

[lisu]

Author: lisu                         Date: Fri Mar  4 11:00:19 2011 GMT
Module: packages                      Tag: HEAD
---- Log message:
- up to 1.9.2.15 (firefox 3.6.15)
- use __rm macro

---- Files affected:
packages/xulrunner:
   xulrunner.spec (1.170 -> 1.171) 

---- Diffs:

================================================================
Index: packages/xulrunner/xulrunner.spec
diff -u packages/xulrunner/xulrunner.spec:1.170 packages/xulrunner/xulrunner.spec:1.171
--- packages/xulrunner/xulrunner.spec:1.170	Wed Mar  2 23:46:14 2011
+++ packages/xulrunner/xulrunner.spec	Fri Mar  4 12:00:14 2011
@@ -18,7 +18,7 @@
 
 # convert firefox release number to platform version: 3.6 -> 1.9.2, 3.6.x -> 1.9.2.x
 %define		xulrunner_main	1.9.2
-%define		firefox_ver		3.6.14
+%define		firefox_ver		3.6.15
 %define		xulrunner_ver	%(v=%{firefox_ver}; echo %{xulrunner_main}${v#3.6})
 
 # The actual sqlite version (see RHBZ#480989):
@@ -28,14 +28,14 @@
 Summary(pl.UTF-8):	XULRunner - środowisko uruchomieniowe Mozilli dla aplikacji XUL+XPCOM
 Name:		xulrunner
 Version:	%{xulrunner_ver}
-Release:	2
+Release:	1
 Epoch:		2
 License:	MPL v1.1 or GPL v2+ or LGPL v2.1+
 Group:		X11/Applications
 # Source tarball for xulrunner is in fact firefox tarball (checked on 1.9), so lets use it
 # instead of waiting for mozilla to copy file on ftp.
-Source0:	http://releases.mozilla.org/pub/mozilla.org/firefox/releases/latest-3.6/source/firefox-%{firefox_ver}.source.tar.bz2
-# Source0-md5:	ab0d00cd33e6b2388429dda1c01abd01
+Source0:	http://releases.mozilla.org/pub/mozilla.org/firefox/releases/%{firefox_ver}/source/firefox-%{firefox_ver}.source.tar.bz2
+# Source0-md5:	fcf8042948d91f1f3d9c33599b79cf35
 Patch0:		%{name}-install.patch
 Patch1:		%{name}-rpath.patch
 Patch2:		%{name}-mozldap.patch
@@ -176,9 +176,9 @@
 %setup -qc
 mv -f mozilla-%{xulrunner_main} mozilla
 cd mozilla
-rm -r nsprpub
+%{__rm} -r nsprpub
 # avoid using included headers (-I. is before HUNSPELL_CFLAGS)
-rm extensions/spellcheck/hunspell/src/{*.hxx,hunspell.h}
+%{__rm} extensions/spellcheck/hunspell/src/{*.hxx,hunspell.h}
 # hunspell needed for factory including mozHunspell.h
 echo 'LOCAL_INCLUDES += $(MOZ_HUNSPELL_CFLAGS)' >> extensions/spellcheck/src/Makefile.in
 
@@ -207,7 +207,7 @@
 fi
 
 cd mozilla
-cp -f %{_datadir}/automake/config.* build/autoconf
+cp -a %{_datadir}/automake/config.* build/autoconf
 
 cat << 'EOF' > .mozconfig
 . $topsrcdir/xulrunner/config/mozconfig
@@ -344,11 +344,11 @@
 %browser_plugins_add_browser %{name} -p %{_libdir}/%{name}/plugins
 
 # remove unecessary stuff
-rm $RPM_BUILD_ROOT%{_libdir}/%{name}/xulrunner
-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}/components/components.list
+%{__rm} $RPM_BUILD_ROOT%{_libdir}/%{name}/xulrunner
+%{__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}/components/components.list
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -572,6 +572,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.171  2011/03/04 11:00:14  lisu
+- up to 1.9.2.15 (firefox 3.6.15)
+- use __rm macro
+
 Revision 1.170  2011/03/02 22:46:14  megabajt
 - added fix-animated-gifs.patch
 - release 2
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/xulrunner/xulrunner.spec?r1=1.170&r2=1.171&f=u