Remove components/compreg.dat and components/xpti.dat in postinstall
and postremove.
Touch .autoregs in postinstall.
Cleanup for unused patches.
I delete them when I commit.
Index: patches/firefox3-18-gen-devel-files.diff
===================================================================
--- patches/firefox3-18-gen-devel-files.diff (revision 15432)
+++ patches/firefox3-18-gen-devel-files.diff (working copy)
@@ -47,7 +47,7 @@
$(INSTALL) $^ .
-EXTRA_DSO_LDOPTS += $(LIBS_DIR) $(EXTRA_DSO_LIBS)
-+EXTRA_DSO_LDOPTS += $(LIBS_DIR) $(EXTRA_DSO_LIBS) -z allextract $
(LIBXUL_DIST)/lib/$(LIB_PREFIX)xpcomglue.$(LIB_SUFFIX) -z defaultextract
++EXTRA_DSO_LDOPTS += $(LIBS_DIR) $(EXTRA_DSO_LIBS) $
(MKSHLIB_FORCE_ALL) $(LIBXUL_DIST)/lib/$(LIB_PREFIX)xpcomglue.$
(LIB_SUFFIX) $(MKSHLIB_UNFORCE_ALL)
+
ifdef MOZ_ENABLE_LIBXUL
Index: SUNWfirefox.spec
===================================================================
--- SUNWfirefox.spec (revision 15432)
+++ SUNWfirefox.spec (working copy)
@@ -29,8 +29,6 @@
Summary: Mozilla Firefox Web browser
Version: %{firefox.version}
Source: %{name}-manpages-0.1.tar.gz
-Source1: staroffice-mime.types.in
-Source2: staroffice-mailcap.in
SUNW_BaseDir: %{_basedir}
SUNW_Category: FIREFOX,application,%{jds_version}
SUNW_Copyright:%{name}.copyright
@@ -52,7 +50,6 @@
Requires: SUNWgnome-vfs
Requires: SUNWlibC
Requires: SUNWlibms
-Requires: SUNWtls
Requires: SUNWlibmsr
BuildRequires: SUNWzip
BuildRequires: SUNWgtar
@@ -67,6 +64,9 @@
%endif
%if %without_moz_nss_nspr
Requires: SUNWpr
+Requires: SUNWprd
+Requires: SUNWtls
+Requires: SUNWtlsd
%endif
Requires: SUNWsqlite3
@@ -146,6 +146,18 @@
echo '/usr/bin/update-desktop-database'
) | $BASEDIR/lib/postrun -b -u -c JDS_wait
+PKGCOND=/usr/bin/pkgcond
+test -x $PKGCOND || exit 0
+if $PKGCOND is_path_writable $BASEDIR/lib/%{firefox.name} > /dev/null
2>&1 ; then
+ touch $BASEDIR/lib/%{firefox.name}/.autoreg
+ if test -e $BASEDIR/lib/%{firefox.name}/components/compreg.dat; then
+ rm $BASEDIR/lib/%{firefox.name}/components/compreg.dat
+ fi
+ if test -e $BASEDIR/lib/%{firefox.name}/components/xpti.dat; then
+ rm $BASEDIR/lib/%{firefox.name}/components/xpti.dat
+ fi
+fi
+exit 0
%postun
test -x $BASEDIR/lib/postrun || exit 0
@@ -153,6 +165,17 @@
echo '/usr/bin/update-desktop-database'
) | $BASEDIR/lib/postrun -b -u -c JDS
+PKGCOND=/usr/bin/pkgcond
+test -x $PKGCOND || exit 0
+if $PKGCOND is_path_writable $BASEDIR/lib/%{firefox.name} > /dev/null
2>&1 ; then
+ if test -e $BASEDIR/lib/%{firefox.name}/components/compreg.dat; then
+ rm $BASEDIR/lib/%{firefox.name}/components/compreg.dat
+ fi
+ if test -e $BASEDIR/lib/%{firefox.name}/components/xpti.dat; then
+ rm $BASEDIR/lib/%{firefox.name}/components/xpti.dat
+ fi
+fi
+exit 0
%if %with_apoc_adapter
%post apoc-adapter
@@ -160,6 +183,12 @@
test -x $PKGCOND || exit 0
if $PKGCOND is_path_writable $BASEDIR/lib/%{firefox.name} > /dev/
null 2>&1 ; then
touch $BASEDIR/lib/%{firefox.name}/.autoreg
+ if test -e $BASEDIR/lib/%{firefox.name}/components/compreg.dat; then
+ rm $BASEDIR/lib/%{firefox.name}/components/compreg.dat
+ fi
+ if test -e $BASEDIR/lib/%{firefox.name}/components/xpti.dat; then
+ rm $BASEDIR/lib/%{firefox.name}/components/xpti.dat
+ fi
fi
exit 0
@@ -168,6 +197,12 @@
test -x $PKGCOND || exit 0
if $PKGCOND is_path_writable $BASEDIR/lib/%{firefox.name} > /dev/
null 2>&1 ; then
touch $BASEDIR/lib/%{firefox.name}/.autoreg
+ if test -e $BASEDIR/lib/%{firefox.name}/components/compreg.dat; then
+ rm $BASEDIR/lib/%{firefox.name}/components/compreg.dat
+ fi
+ if test -e $BASEDIR/lib/%{firefox.name}/components/xpti.dat; then
+ rm $BASEDIR/lib/%{firefox.name}/components/xpti.dat
+ fi
fi
exit 0
Index: base-specs/firefox.spec
===================================================================
--- base-specs/firefox.spec (revision 15432)
+++ base-specs/firefox.spec (working copy)
@@ -36,29 +36,14 @@
Source10: %{name}-plugin.pc.in
Source11: %{name}-js.pc.in
-# owner:davelam date:2005-08-22 type:branding
-# change install dir from 'name-version' to 'name'
-Patch1: firefox3-01-change-install-dir.diff
-
# owner:evan date:2007-11-28 type:branding
# change preference to support multi-language
Patch2: firefox3-02-locale.diff
-# owner:davelam date:2006-06-12 type:branding
-# bugster:6428445
-Patch3: firefox3-03-plugins.diff
-
-# owner:davelam date:2005-09-05 type:branding
-# remove gtar specific options
-Patch4: firefox3-04-common-tar-option.diff
-
# owner:davelam date:2006-02-24 type:branding
# enable firefox preload mechanism
Patch5: firefox3-05-preload.diff
-# owner:davelam date:2007-12-27 type:branding
-Patch6: firefox3-06-find-opt.diff
-
# owner:hawklu date:2007-04-27 type:branding
# bugster:6542910
Patch8: firefox3-08-disable-online-update.diff
@@ -66,18 +51,11 @@
# owner:hawklu date:2007-11-07 type:bug bugster:6589754
Patch9: firefox3-09-remove-core-file-check.diff
-#%if %option_with_sun_branding
-# owner:hawklu date:2006-12-07 type:branding
-# add "solaris user guide" to bookmark and default homepage
-#FIXME: patch file need to be updated
-#Patch11: firefox3-11-developer-guide-bookmark.diff
-#%endif
-
%if %option_with_indiana_branding
# owner:laca date:2007-10-20 type:branding
# add "getting started guide" to bookmarks and set as default homepage
#FIXME: patch file need to be updated
-Patch12: firefox3-11-getting-started-bookmark.diff
+Patch11: firefox3-11-getting-started-bookmark.diff
%endif
%if %without_moz_nss_nspr
@@ -176,25 +154,16 @@
/bin/mv %{name}.tmp.$$/mozilla %{name}
rm -rf %{name}.tmp.$$
cd %{name}
-%patch1 -p1
%patch2 -p1
-%patch3 -p1
-%ifos solaris
-%patch4 -p1
%patch5 -p1
-%patch6 -p1
%patch8 -p1
%patch9 -p1
-#%if %option_with_sun_branding
-#%patch11 -p1
-#%endif
%if %option_with_indiana_branding
-%patch12 -p1
+%patch11 -p1
%endif
%if %without_moz_nss_nspr
%patch13 -p1
%endif
-%endif
%patch17 -p1
%patch18 -p1
%patch19 -p1
@@ -296,13 +265,10 @@
mv include/* ${INCLUDEDIR}
mv idl/* ${IDLDIR}
-# Fixed *.h *.idl 755 attribute issue
+# Fix *.h *.idl attribute issue
find ${INCLUDEDIR} ${IDLDIR} \
-type f -name "*.h" -o -type f -name "*.idl" | xargs chmod 644
-cd ${LIBDIR}
-rm -rf $RPM_BUILD_ROOT/tmp
-
%if %without_moz_nss_nspr
# Don't deliver nss, nspr header files if we use system nss nspr
rm -rf $RPM_BUILD_ROOT/%{_includedir}/%{name}/include/nss
@@ -315,11 +281,6 @@
install -c -m 644 %{SOURCE1} $RPM_BUILD_ROOT%{_datadir}/pixmaps/
firefox-icon.png
install -c -m 644 %{SOURCE2} $RPM_BUILD_ROOT%{_datadir}/applications/
firefox.desktop
-%ifos linux
-# install the man page
-install -c -m 644 %{SOURCE4} $RPM_BUILD_ROOT%{_mandir}/man1/firefox.1
-%endif
-
/bin/ln -s ../lib/firefox/firefox $RPM_BUILD_ROOT%{_bindir}/firefox
# install preloaded library list that would be picked up by
gdmprefetch
@@ -357,8 +318,8 @@
-e "s,IDLDIR,%{_datadir}/idl/%{name},g"\
-e "s,INCLUDEDIR,%{_includedir},g" \
-e "s,NAME,%{name},g" \
- %{SOURCE9} > /tmp/%{name}-xpcom.pc
-install -c -m 644 /tmp/%{name}-xpcom.pc \
+ %{SOURCE9} > $RPM_BUILD_ROOT/tmp/%{name}-xpcom.pc
+install -c -m 644 $RPM_BUILD_ROOT/tmp/%{name}-xpcom.pc \
$RPM_BUILD_ROOT%{_libdir}/pkgconfig/%{name}-xpcom.pc
/usr/bin/sed -e "s,BASEDIR,%{_basedir},g" \
@@ -366,8 +327,8 @@
-e "s,DATADIR,%{_datadir},g"\
-e "s,INCLUDEDIR,%{_includedir},g" \
-e "s,NAME,%{name},g" \
- %{SOURCE10} > /tmp/%{name}-plugin.pc
-install -c -m 644 /tmp/%{name}-plugin.pc \
+ %{SOURCE10} > $RPM_BUILD_ROOT/tmp/%{name}-plugin.pc
+install -c -m 644 $RPM_BUILD_ROOT/tmp/%{name}-plugin.pc \
$RPM_BUILD_ROOT%{_libdir}/pkgconfig/%{name}-plugin.pc
/usr/bin/sed -e "s,BASEDIR,%{_basedir},g" \
@@ -375,11 +336,11 @@
-e "s,DATADIR,%{_datadir},g"\
-e "s,INCLUDEDIR,%{_includedir},g" \
-e "s,NAME,%{name},g" \
- %{SOURCE11} > /tmp/%{name}-js.pc
-install -c -m 644 /tmp/%{name}-js.pc \
+ %{SOURCE11} > $RPM_BUILD_ROOT/tmp/%{name}-js.pc
+install -c -m 644 $RPM_BUILD_ROOT/tmp/%{name}-js.pc \
$RPM_BUILD_ROOT%{_libdir}/pkgconfig/%{name}-js.pc
-rm -f /tmp/%{name}-plugin.pc /tmp/%{name}-js.pc
+rm -rf $RPM_BUILD_ROOT/tmp
# remove local dictionary and share the one that delivered
# by myspell-dictionary
--------
Ginn Chen
Software Engineer, Browser Team
Sun Microsystems, Inc.
Phone: x82869 / +86-10-62673869
Fax: +86-10-62780969
