SPECS: mozilla-thunderbird.spec - cleanups; alpha-gcc3,gfx,gcc-bug...

[qboosh]

Author: qboosh                       Date: Sun Jan 22 15:00:27 2006 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- cleanups; alpha-gcc3,gfx,gcc-bugs patches obsolete

---- Files affected:
SPECS:
   mozilla-thunderbird.spec (1.51 -> 1.52) 

---- Diffs:

================================================================
Index: SPECS/mozilla-thunderbird.spec
diff -u SPECS/mozilla-thunderbird.spec:1.51 SPECS/mozilla-thunderbird.spec:1.52
--- SPECS/mozilla-thunderbird.spec:1.51	Sun Jan 22 14:53:52 2006
+++ SPECS/mozilla-thunderbird.spec	Sun Jan 22 16:00:21 2006
@@ -1,7 +1,7 @@
 # $Revision$, $Date$
 # TODO:
 #   - enigmail doesn't work
-#   - check -alpha-gcc3, -gfx, -blockimage, -gcc-bugs patches
+#   - check -blockimage patch
 #   - check %files
 #
 # Conditional builds
@@ -22,14 +22,11 @@
 Source2:	%{name}.desktop
 Source3:	%{name}.sh
 Source4:	%{name}-enigmail.manifest
-Patch0:		%{name}-alpha-gcc3.patch
-Patch1:		%{name}-gfx.patch
-Patch2:		%{name}-nss.patch
-Patch3:		%{name}-lib_path.patch
-Patch4:		%{name}-blockimage.patch
-Patch5:		%{name}-gcc-bugs.patch
-Patch6:		%{name}-nopangoxft.patch
-Patch7:		%{name}-enigmail-shared.patch
+Patch0:		%{name}-nss.patch
+Patch1:		%{name}-lib_path.patch
+Patch2:		%{name}-blockimage.patch
+Patch3:		%{name}-nopangoxft.patch
+Patch4:		%{name}-enigmail-shared.patch
 # official patches
 # certain ui operations cause prolonged hang (cpu at 100%)
 Patch100:	%{name}-bug305970.patch
@@ -90,14 +87,11 @@
 %setup -q -n mozilla
 %{?with_enigmail:tar xvfz %{SOURCE1} -C mailnews/extensions}
 
-##%patch0 -p1
-##%patch1 -p1
-%patch2 -p1
+%patch0 -p1
+%patch1 -p1
+##%patch2 -p1
 %patch3 -p1
-##%patch4 -p1
-##%patch5 -p1
-%patch6 -p1
-%{?with_enigmail:%patch7 -p1}
+%{?with_enigmail:%patch4 -p1}
 
 # official patches
 %patch100 -p1
@@ -206,17 +200,17 @@
 
 %if %{with enigmail}
 _enig_dir=$RPM_BUILD_ROOT%{_thunderbirddir}/extensions/\{847b3a00-7ab1-11d4-8f02-006008948af5\}
-mkdir -p $_enig_dir/chrome/
-mkdir -p $_enig_dir/components/
-mkdir -p $_enig_dir/defaults/preferences/
-mv -f $RPM_BUILD_ROOT%{_thunderbirddir}/chrome/enigmail.jar $_enig_dir/chrome/
-mv -f $RPM_BUILD_ROOT%{_thunderbirddir}/chrome/enigmail-skin-tbird.jar $_enig_dir/chrome/
-mv -f $RPM_BUILD_ROOT%{_thunderbirddir}/components/enig* $_enig_dir/components/
-mv -f $RPM_BUILD_ROOT%{_thunderbirddir}/components/libenigmime.so $_enig_dir/components/
-mv -f $RPM_BUILD_ROOT%{_thunderbirddir}/components/ipc.xpt $_enig_dir/components/
-mv -f $RPM_BUILD_ROOT%{_thunderbirddir}/defaults/preferences/enigmail.js $_enig_dir/defaults/preferences/
-cp -f $RPM_BUILD_DIR/mozilla/mailnews/extensions/enigmail/package/install.rdf $_enig_dir/
-rm -rf $RPM_BUILD_ROOT%{_thunderbirddir}/defaults/preferences/
+mkdir -p $_enig_dir/chrome
+mkdir -p $_enig_dir/components
+mkdir -p $_enig_dir/defaults/preferences
+mv -f $RPM_BUILD_ROOT%{_thunderbirddir}/chrome/enigmail.jar $_enig_dir/chrome
+mv -f $RPM_BUILD_ROOT%{_thunderbirddir}/chrome/enigmail-skin-tbird.jar $_enig_dir/chrome
+mv -f $RPM_BUILD_ROOT%{_thunderbirddir}/components/enig* $_enig_dir/components
+mv -f $RPM_BUILD_ROOT%{_thunderbirddir}/components/libenigmime.so $_enig_dir/components
+mv -f $RPM_BUILD_ROOT%{_thunderbirddir}/components/ipc.xpt $_enig_dir/components
+mv -f $RPM_BUILD_ROOT%{_thunderbirddir}/defaults/preferences/enigmail.js $_enig_dir/defaults/preferences
+cp -f mailnews/extensions/enigmail/package/install.rdf $_enig_dir
+rm -rf $RPM_BUILD_ROOT%{_thunderbirddir}/defaults/preferences
 rm -rf $RPM_BUILD_ROOT%{_thunderbirddir}/chrome/enigmail-en-US.jar
 rm -rf $RPM_BUILD_ROOT%{_thunderbirddir}/chrome/enigmail-skin.jar
 rm -rf $RPM_BUILD_ROOT%{_thunderbirddir}/chrome/enigmime.jar
@@ -292,6 +286,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.52  2006/01/22 15:00:21  qboosh
+- cleanups; alpha-gcc3,gfx,gcc-bugs patches obsolete
+
 Revision 1.51  2006/01/22 13:53:52  adamg
 - release 1
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/mozilla-thunderbird.spec?r1=1.51&r2=1.52&f=u