Author: qboosh Date: Thu Feb 24 18:51:45 2005 GMT
Module: SPECS Tag: HEAD
---- Log message:
- create chrome/xpcom/etc regeneration script (like in mozilla; !tested yet)
---- Files affected:
SPECS:
mozilla-firefox.spec (1.61 -> 1.62)
---- Diffs:
================================================================
Index: SPECS/mozilla-firefox.spec
diff -u SPECS/mozilla-firefox.spec:1.61 SPECS/mozilla-firefox.spec:1.62
--- SPECS/mozilla-firefox.spec:1.61 Thu Feb 24 19:05:54 2005
+++ SPECS/mozilla-firefox.spec Thu Feb 24 19:51:37 2005
@@ -150,7 +150,7 @@
%install
rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT{%{_bindir},%{_libdir},%{_pixmapsdir},%{_desktopdir}}
+install -d
$RPM_BUILD_ROOT{%{_bindir},%{_sbindir},%{_libdir},%{_pixmapsdir},%{_desktopdir}}
%{__make} -C xpinstall/packager \
MOZ_PKG_APPNAME="mozilla-firefox" \
@@ -174,14 +174,12 @@
rm -rf US classic comm embed-sample en-{US,mac,unix,win} modern pipnss pippki
toolkit
rm -f en-win.jar en-mac.jar embed-sample.jar modern.jar
-%clean
-rm -rf $RPM_BUILD_ROOT
-
-%post
+cat << EOF > $RPM_BUILD_ROOT%{_sbindir}/firefox-chrome+xpcom-generate
+#!/bin/sh
umask 022
cat %{_firefoxdir}/chrome/*-installed-chrome.txt >
%{_firefoxdir}/chrome/installed-chrome.txt
-
-unset MOZILLA_FIVE_HOME || :
+rm -f %{_firefoxdir}/chrome/{chrome.rdf,overlayinfo/*/*/*.rdf}
+rm -f %{_firefoxdir}/components/{compreg,xpti}.dat
MOZILLA_FIVE_HOME=%{_firefoxdir}
export MOZILLA_FIVE_HOME
@@ -193,25 +191,28 @@
LD_LIBRARY_PATH=%{_firefoxdir}${LD_LIBRARY_PATH:+:$LD_LIBRARY_PATH}
export LD_LIBRARY_PATH
-/sbin/ldconfig || :
+%{_firefoxdir}/regxpcom
+%{_firefoxdir}/regchrome
+%{_firefoxdir}/firefox -register
+EOF
-%{_firefoxdir}/regxpcom >/dev/null || echo "E: regxpcom was exited: $?" >&2
-%{_firefoxdir}/regchrome >/dev/null || echo "E: regchrome was exited: $?" >&2
+%clean
+rm -rf $RPM_BUILD_ROOT
-%{_firefoxdir}/firefox -register
+%post
+%{_sbindir}/firefox-chrome+xpcom-generate
%postun
if [ "$1" != "0" ]; then
- umask 022
- cat %{_firefoxdir}/chrome/*-installed-chrome.txt
>%{_firefoxdir}/chrome/installed-chrome.txt
+ %{_sbindir}/firefox-chrome+xpcom-generate
fi
%preun
if [ "$1" == "0" ]; then
- rm -rf %{_firefoxdir}/chrome/overlayinfo
- rm -rf %{_firefoxdir}/components
- rm -f %{_firefoxdir}/chrome/*.rdf
- rm -rf %{_firefoxdir}/extensions
+ rm -rf %{_firefoxdir}/chrome/overlayinfo
+ rm -f %{_firefoxdir}/chrome/*.rdf
+ rm -rf %{_firefoxdir}/components
+ rm -rf %{_firefoxdir}/extensions
fi
%post lang-en
@@ -279,6 +280,9 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.62 2005/02/24 18:51:37 qboosh
+- create chrome/xpcom/etc regeneration script (like in mozilla; !tested yet)
+
Revision 1.61 2005/02/24 18:05:54 arekm
- 2.1 for now, still some issues
================================================================
---- CVS-web:
http://cvs.pld-linux.org/SPECS/mozilla-firefox.spec?r1=1.61&r2=1.62&f=u
_______________________________________________
pld-cvs-commit mailing list
pld-cvs-commit@pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
