Attachment 729 Details for Bug 2461 – Patch against latest Cauldron SPEC of mozilla-thunderbird-6.0-2

[patch] Patch against latest Cauldron SPEC of mozilla-thunderbird-6.0-2

mozilla-thunderbird-6.0.patch (text/plain), 2.43 KB, created by Florian Hubold on 2011-08-19 21:39:45 CEST

(hide)

Description:

Filename:

MIME Type:

Creator: Florian Hubold

Created: 2011-08-19 21:39:45 CEST

Size: 2.43 KB

patch

obsolete

>--- mozilla-thunderbird.spec.orig	2011-08-19 21:29:40.578317836 +0200
>+++ mozilla-thunderbird.spec	2011-08-19 21:29:11.025674112 +0200
>@@ -68,6 +68,7 @@
> Patch200:       mozilla-thunderbird-gtk-settings.patch
> #
> 
>+Patch201:	mozilla-thunderbird-5.0-mga-default-mailer.patch
> Patch212:       mozilla-thunderbird-enigmail-ui-content-contents-rdf.patch
> Patch213:       mozilla-thunderbird-enigmail-build-package-contents-rdf.patch
> Patch215:	mozilla-thunderbird-enigmail-visibility.patch
>@@ -266,6 +267,8 @@
> 
> %patch2 -p0
> 
>+%patch201 -p0 -b .default_mailer
>+
> %patch300 -p0 -b .progname
> %patch301 -p1 -b .enigmailpackage
> %patch304 -p0 -b .run-mozilla
>@@ -330,7 +333,7 @@
>     --enable-startup-notification \
>     --disable-gnomevfs \
>     --enable-gio \
>-    --enable-calendar \
>+    --disable-calendar \
>     --disable-crashreporter \
>     --enable-system-sqlite \
>     --enable-system-hunspell \
>@@ -428,13 +431,13 @@
> # For new profiles
> %define COMMAND /usr/bin/xdg-open
> 
>-#%{__cat} %{SOURCE12} | %{__perl} -p -e 's,THUNDERBIRD_RPM_VR,%{version}-%{release},g;' \
>-#                                    -e 's,THUNDERBIRD_VENDOR_COMMENT,%{mandriva_release},g;' \
>-#                                    -e 's,COMMAND,%{COMMAND},g' \
>-#  > %{buildroot}/mdv-default-prefs
>-#%{__cp} -a %{buildroot}/mdv-default-prefs %{buildroot}%{tbdir}/greprefs/all-mandriva.js
>-#%{__cp} -a %{buildroot}/mdv-default-prefs %{buildroot}%{tbdir}/defaults/pref/all-mandriva.js
>-#%{__rm} -f %{buildroot}/mdv-default-prefs
>+#used for matching system locale on startup
>+%{__cat} %{SOURCE12} | %{__perl} -p -e 's,THUNDERBIRD_RPM_VR,%{version}-%{release},g;' \
>+                                    -e 's,THUNDERBIRD_VENDOR_COMMENT,%{product_release},g;' \
>+                                    -e 's,COMMAND,%{COMMAND},g' \
>+  > %{buildroot}/mga-default-prefs
>+%{__cp} -a %{buildroot}/mga-default-prefs %{buildroot}%{tbdir}/defaults/pref/all-mageia.js
>+%{__rm} -f %{buildroot}/mga-default-prefs
> 
> #===============================================================================
> 
>@@ -667,6 +670,11 @@
> 
> 
> %changelog
>+* Fri Aug 19 2011 doktor5000 <doktor5000> =:6.0-1mga1
>+- really disable compilation of standalone lightning as it is compiled with gcc3 and i586 & x86_64
>+- update mageia-default-prefs.js, enable again localisation matching system locale
>+- enable again default-mailer capabilities (rediffed Patch201)
>+
> * Wed Aug 17 2011 fwang <fwang> 0:6.0-2.mga2
> + Revision: 134149
> - update language list

--- mozilla-thunderbird.spec.orig	2011-08-19 21:29:40.578317836 +0200
+++ mozilla-thunderbird.spec	2011-08-19 21:29:11.025674112 +0200
@@ -68,6 +68,7 @@
 Patch200:       mozilla-thunderbird-gtk-settings.patch
 #
 
+Patch201:	mozilla-thunderbird-5.0-mga-default-mailer.patch
 Patch212:       mozilla-thunderbird-enigmail-ui-content-contents-rdf.patch
 Patch213:       mozilla-thunderbird-enigmail-build-package-contents-rdf.patch
 Patch215:	mozilla-thunderbird-enigmail-visibility.patch
@@ -266,6 +267,8 @@
 
 %patch2 -p0
 
+%patch201 -p0 -b .default_mailer
+
 %patch300 -p0 -b .progname
 %patch301 -p1 -b .enigmailpackage
 %patch304 -p0 -b .run-mozilla
@@ -330,7 +333,7 @@
     --enable-startup-notification \
     --disable-gnomevfs \
     --enable-gio \
-    --enable-calendar \
+    --disable-calendar \
     --disable-crashreporter \
     --enable-system-sqlite \
     --enable-system-hunspell \
@@ -428,13 +431,13 @@
 # For new profiles
 %define COMMAND /usr/bin/xdg-open
 
-#%{__cat} %{SOURCE12} | %{__perl} -p -e 's,THUNDERBIRD_RPM_VR,%{version}-%{release},g;' \
-#                                    -e 's,THUNDERBIRD_VENDOR_COMMENT,%{mandriva_release},g;' \
-#                                    -e 's,COMMAND,%{COMMAND},g' \
-#  > %{buildroot}/mdv-default-prefs
-#%{__cp} -a %{buildroot}/mdv-default-prefs %{buildroot}%{tbdir}/greprefs/all-mandriva.js
-#%{__cp} -a %{buildroot}/mdv-default-prefs %{buildroot}%{tbdir}/defaults/pref/all-mandriva.js
-#%{__rm} -f %{buildroot}/mdv-default-prefs
+#used for matching system locale on startup
+%{__cat} %{SOURCE12} | %{__perl} -p -e 's,THUNDERBIRD_RPM_VR,%{version}-%{release},g;' \
+                                    -e 's,THUNDERBIRD_VENDOR_COMMENT,%{product_release},g;' \
+                                    -e 's,COMMAND,%{COMMAND},g' \
+  > %{buildroot}/mga-default-prefs
+%{__cp} -a %{buildroot}/mga-default-prefs %{buildroot}%{tbdir}/defaults/pref/all-mageia.js
+%{__rm} -f %{buildroot}/mga-default-prefs
 
 #===============================================================================
 
@@ -667,6 +670,11 @@
 
 
 %changelog
+* Fri Aug 19 2011 doktor5000 <doktor5000> =:6.0-1mga1
+- really disable compilation of standalone lightning as it is compiled with gcc3 and i586 & x86_64
+- update mageia-default-prefs.js, enable again localisation matching system locale
+- enable again default-mailer capabilities (rediffed Patch201)
+
 * Wed Aug 17 2011 fwang <fwang> 0:6.0-2.mga2
 + Revision: 134149
 - update language list

Actions: View | Diff

Attachments on bug 2461: 729 | 730 | 731