--- a/ChangeLog Sat Sep 03 03:12:44 2005 +0000
+++ b/ChangeLog Mon Sep 05 11:11:38 2005 +0000
@@ -1,3 +1,16 @@
+2005-09-05 Dave Lin <[email protected]>
+
+ * firefox.spec:
+ * patches/mozilla-05-common-tar-option.diff:
+ * thunderbird.spec: Add new patches to remove the specific gtar options
+
+2005-09-05 Dave Lin <[email protected]>
+
+ * build-gnome2:
+ * firefox.spec:
+ * mozilla.spec:
+ * thunderbird.spec:
+
2005-09-02 Laszlo Peter <[email protected]>
* patches/gtk+-09-sun-copy-paste-keybindings.diff: update location
--- a/firefox.spec Sat Sep 03 03:12:44 2005 +0000
+++ b/firefox.spec Mon Sep 05 11:11:38 2005 +0000
@@ -29,6 +29,7 @@
Patch2: mozilla-02-no-patch-checker.diff
Patch3: mozilla-03-s11s-smkfl.diff
Patch4: mozilla-04-s11x-smkfl.diff
+Patch5: mozilla-05-common-tar-option.diff
URL: http://www.sun.com/software/javadesktopsystem/
@@ -49,7 +50,6 @@
%ifos solaris
%define _gmdatadir %{_basedir}/share
%define __myzip "/usr/bin/bzip2"
- %define __tar "/usr/bin/tar"
%endif
#####################################
@@ -79,6 +79,7 @@
%patch2 -p1
%patch3 -p1
%patch4 -p1
+%patch5 -p1
#####################################
## Package Build Section ##
@@ -136,7 +137,7 @@
make install
/bin/rm -rf $RPM_BUILD_ROOT%{_ffdir}
cd $RPM_BUILD_ROOT%{_libdir}
-%{__myzip} -dc %{builddir}/dist/firefox-*.tar.* | %{__tar} -xf -
+%{__myzip} -dc %{builddir}/dist/firefox-*.tar.* | /bin/tar -xf -
/bin/mkdir -p $RPM_BUILD_ROOT%{_gmdatadir}/applications
/bin/mkdir -p $RPM_BUILD_ROOT%{_gmdatadir}/pixmaps
@@ -210,6 +211,9 @@
%{_gmdatadir}/pixmaps/%{name}-icon.png
%changelog
+* Mon Sep 05 2005 Dave Lin <[email protected]>
+- Add patches to remove the specific gtar options
+
* Fri Sep 01 2005 - [email protected]
- Change gtar to tar; add two necessary mkdir's.
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/mozilla-05-common-tar-option.diff Mon Sep 05 11:11:38 2005 +0000
@@ -0,0 +1,11 @@
+--- firefox/toolkit/mozapps/installer/packager.mk 2005-08-27 03:01:45.000000000 +0800
++++ firefox/toolkit/mozapps/installer/packager.mk.new 2005-09-05 18:31:57.991052616 +0800
+@@ -66,7 +66,7 @@
+
+ MAKE_PACKAGE = $(error What is a $(MOZ_PKG_FORMAT) package format?);
+
+-CREATE_FINAL_TAR = tar -c --owner=0 --group=0 --numeric-owner --mode="go-w" -f
++CREATE_FINAL_TAR = tar -cf
+ UNPACK_TAR = tar -x
+
+ ifeq ($(MOZ_PKG_FORMAT),TAR)
--- a/thunderbird.spec Sat Sep 03 03:12:44 2005 +0000
+++ b/thunderbird.spec Mon Sep 05 11:11:38 2005 +0000
@@ -27,6 +27,7 @@
Patch2: mozilla-02-no-patch-checker.diff
Patch3: mozilla-03-s11s-smkfl.diff
Patch4: mozilla-04-s11x-smkfl.diff
+Patch5: mozilla-05-common-tar-option.diff
URL: http://www.sun.com/software/javadesktopsystem/
@@ -47,7 +48,6 @@
%ifos solaris
%define _gmdatadir %{_basedir}/share
%define __myzip "/usr/bin/bzip2"
- %define __tar "/usr/bin/tar"
%endif
#####################################
@@ -77,6 +77,7 @@
%patch2 -p1
%patch3 -p1
%patch4 -p1
+%patch5 -p1
#####################################
## Package Build Section ##
@@ -131,7 +132,7 @@
make install
/bin/rm -rf $RPM_BUILD_ROOT%{_tbdir}
cd $RPM_BUILD_ROOT%{_libdir}
-%{__myzip} -dc %{builddir}/dist/thunderbird-*.tar.* | %{__tar} -xf -
+%{__myzip} -dc %{builddir}/dist/thunderbird-*.tar.* | /bin/tar -xf -
/bin/mkdir -p $RPM_BUILD_ROOT%{_gmdatadir}/applications
/bin/mkdir -p $RPM_BUILD_ROOT%{_gmdatadir}/pixmaps
@@ -183,6 +184,9 @@
%{_gmdatadir}/pixmaps/%{name}-icon.png
%changelog
+* Mon Sep 05 2005 Dave Lin <[email protected]>
+- Add patches to remove the specific gtar options
+
* Fri Sep 02 2005 - [email protected]
- Change gtar to tar and rework tar command.