Author: glen Date: Fri Sep 15 16:28:34 2006 GMT
Module: SPECS Tag: HEAD
---- Log message:
- merge from AC-branch:
- 1.5.0.7
- use separate builddir
- root owned ~/.mozilla fix when sudo is used (via poldek)
---- Files affected:
SPECS:
mozilla-firefox.spec (1.149 -> 1.150)
---- Diffs:
================================================================
Index: SPECS/mozilla-firefox.spec
diff -u SPECS/mozilla-firefox.spec:1.149 SPECS/mozilla-firefox.spec:1.150
--- SPECS/mozilla-firefox.spec:1.149 Thu Aug 17 08:36:04 2006
+++ SPECS/mozilla-firefox.spec Fri Sep 15 18:28:29 2006
@@ -62,6 +62,7 @@
Requires: %{name}-lang-resources = %{version}
Requires: nspr >= 1:4.6.1-2
Requires: nss >= 1:3.10.2
+Requires(post): mktemp
Provides: wwwbrowser
Obsoletes: mozilla-firebird
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -110,7 +111,8 @@
Anglojęzyczne zasoby dla przeglądarki Mozilla Firefox.
%prep
-%setup -q -n mozilla
+%setup -qc
+cd mozilla
%patch0 -p1
%patch1 -p1
%patch2 -p1
@@ -121,6 +123,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`"
@@ -131,8 +134,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
@@ -202,6 +205,7 @@
%install
rm -rf $RPM_BUILD_ROOT
+cd mozilla
install -d \
$RPM_BUILD_ROOT{%{_bindir},%{_sbindir},%{_libdir}{,extensions}} \
$RPM_BUILD_ROOT{%{_pixmapsdir},%{_desktopdir}} \
@@ -276,8 +280,10 @@
export LD_LIBRARY_PATH
unset TMPDIR TMP || :
+export HOME=$(mktemp -d)
MOZILLA_FIVE_HOME=%{_firefoxdir} %{_firefoxdir}/regxpcom
MOZILLA_FIVE_HOME=%{_firefoxdir} %{_firefoxdir}/firefox -register
+rm -rf $HOME
EOF
%clean
@@ -362,6 +368,12 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.150 2006/09/15 16:28:29 glen
+- merge from AC-branch:
+ - 1.5.0.7
+ - use separate builddir
+ - root owned ~/.mozilla fix when sudo is used (via poldek)
+
Revision 1.149 2006/08/17 06:36:04 wiget
- rel 2
================================================================
---- CVS-web:
http://cvs.pld-linux.org/SPECS/mozilla-firefox.spec?r1=1.149&r2=1.150&f=u
_______________________________________________
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
