SPECS (AC-branch): mozilla-firefox.spec - 1.5.0.7 - use separate b...

[glen]

Author: glen                         Date: Fri Sep 15 16:22:58 2006 GMT
Module: SPECS                         Tag: AC-branch
---- Log message:
- 1.5.0.7
- use separate builddir

---- Files affected:
SPECS:
   mozilla-firefox.spec (1.131.2.14 -> 1.131.2.15) 

---- Diffs:

================================================================
Index: SPECS/mozilla-firefox.spec
diff -u SPECS/mozilla-firefox.spec:1.131.2.14 SPECS/mozilla-firefox.spec:1.131.2.15
--- SPECS/mozilla-firefox.spec:1.131.2.14	Wed Sep 13 14:41:44 2006
+++ SPECS/mozilla-firefox.spec	Fri Sep 15 18:22:53 2006
@@ -18,12 +18,12 @@
 Summary:	Mozilla Firefox web browser
 Summary(pl):	Mozilla Firefox - przeglądarka WWW
 Name:		mozilla-firefox
-Version:	1.5.0.6
-Release:	3
+Version:	1.5.0.7
+Release:	1
 License:	MPL/LGPL
 Group:		X11/Applications/Networking
 Source0:	ftp://ftp.mozilla.org/pub/mozilla.org/firefox/releases/%{version}/source/firefox-%{version}-source.tar.bz2
-# Source0-md5:	3a659d384744cab77f90920f6d529c89
+# Source0-md5:	518cbd99a3fe663237070013e5cdb1a4
 Source1:	%{name}.desktop
 Source2:	%{name}.sh
 Patch0:		%{name}-nss.patch
@@ -104,7 +104,8 @@
 Anglojęzyczne zasoby dla przeglądarki Mozilla Firefox.
 
 %prep
-%setup -q -n mozilla
+%setup -qc
+cd mozilla
 %patch0 -p1
 %patch1 -p1
 %patch2 -p1
@@ -115,6 +116,7 @@
 sed -i 's/\(-lgss\)\(\W\)/\1disable\2/' configure
 
 %build
+cd mozilla
 rm -f .mozconfig
 export CFLAGS="%{rpmcflags} `%{_bindir}/pkg-config mozilla-nspr --cflags-only-I`"
 export CXXFLAGS="%{rpmcflags} `%{_bindir}/pkg-config mozilla-nspr --cflags-only-I`"
@@ -128,8 +130,8 @@
 
 LIBIDL_CONFIG="%{_bindir}/libIDL-config-2"; export LIBIDL_CONFIG
 
-cat << EOF > .mozconfig
-. \$topsrcdir/browser/config/mozconfig
+cat << 'EOF' > .mozconfig
+. $topsrcdir/browser/config/mozconfig
 
 export BUILD_OFFICIAL=1
 export MOZILLA_OFFICIAL=1
@@ -198,6 +200,7 @@
 
 %install
 rm -rf $RPM_BUILD_ROOT
+cd mozilla
 install -d \
 	$RPM_BUILD_ROOT{%{_bindir},%{_sbindir},%{_libdir}{,extensions}} \
 	$RPM_BUILD_ROOT{%{_pixmapsdir},%{_desktopdir}} \
@@ -360,6 +363,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.131.2.15  2006/09/15 16:22:53  glen
+- 1.5.0.7
+- use separate builddir
+
 Revision 1.131.2.14  2006/09/13 12:41:44  glen
 - hack-fix: sudo and poldek -u can cause your ~/.mozilla being owned by root
   and firefox then fails to start silently; rel 3
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/mozilla-firefox.spec?r1=1.131.2.14&r2=1.131.2.15&f=u