rpms/sunbird/F-11 .cvsignore, 1.11, 1.12 sources, 1.11, 1.12 sunbird.spec, 1.28, 1.29 sunbird-1.0-migwindow.patch, 1.1, NONE thunderbird-shared-error.patch, 1.1, NONE

[Lubomir Rintel]

Author: lkundrak

Update of /cvs/pkgs/rpms/sunbird/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29489

Modified Files:
	.cvsignore sources sunbird.spec 
Removed Files:
	sunbird-1.0-migwindow.patch thunderbird-shared-error.patch 
Log Message:
Merge from devel


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/sunbird/F-11/.cvsignore,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- .cvsignore	28 Apr 2009 22:13:58 -0000	1.11
+++ .cvsignore	28 Jun 2009 13:00:23 -0000	1.12
@@ -1,2 +1,2 @@
-thunderbird-3.0b2-source.tar.bz2
+sunbird-1.0-20090513hg.tar.lzma
 sunbird-l10n.tar


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/sunbird/F-11/sources,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- sources	28 Apr 2009 22:13:59 -0000	1.11
+++ sources	28 Jun 2009 13:00:23 -0000	1.12
@@ -1,2 +1,2 @@
-3a6a95040c4356139a02eab5d32b9ad1  thunderbird-3.0b2-source.tar.bz2
 9f6fe61412669daeb30158832619d4a3  sunbird-l10n.tar
+76e7c2ac4767049156b9b7a9d4036239  sunbird-1.0-20090513hg.tar.lzma


Index: sunbird.spec
===================================================================
RCS file: /cvs/pkgs/rpms/sunbird/F-11/sunbird.spec,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -p -r1.28 -r1.29
--- sunbird.spec	12 May 2009 19:34:20 -0000	1.28
+++ sunbird.spec	28 Jun 2009 13:00:23 -0000	1.29
@@ -13,14 +13,14 @@
 
 Name:           sunbird
 Version:        1.0
-Release:        0.3.20090302hg%{?dist}
+Release:        0.5.20090513hg%{?dist}
 Summary:        Calendar application built upon Mozilla toolkit
 
 Group:          Applications/Productivity
 License:        MPLv1.1 or GPLv2+ or LGPLv2+
 URL:            http://www.mozilla.org/projects/calendar/sunbird/
 #Source0:        http://releases.mozilla.org/pub/mozilla.org/calendar/sunbird/releases/%{version}/source/lightning-sunbird-%{version}-source.tar.bz2
-Source0:        thunderbird-3.0b2-source.tar.bz2
+Source0:        sunbird-1.0-20090513hg.tar.lzma
 Source1:        sunbird.desktop
 Source2:        sunbird-l10n.tar
 #sunbird-langpacks-0.9.tar.gz
@@ -29,13 +29,15 @@ Source3:        mozilla-extension-update
 # TODO: build them!
 #Source4:        http://releases.mozilla.org/pub/mozilla.org/calendar/lightning/releases/0.9/lightning-0.9.linux-i686.xpi
 Source100:      find-external-requires
-Patch0:         sunbird-1.0-libical.patch
-Patch1:         sunbird-1.0-migwindow.patch
-Patch3:         sunbird-1.0-uilocale.patch
-Patch4:         sunbird-0.9-gcc44.patch
-Patch21:        mozilla-jemalloc.patch
-Patch22:        thunderbird-shared-error.patch
-Patch24:        thunderbird-pango.patch
+
+# Pulled from Thunderbird
+Patch0:         mozilla-jemalloc.patch
+Patch1:         thunderbird-pango.patch
+
+# Ours
+Patch10:        sunbird-1.0-libical.patch
+Patch11:        sunbird-1.0-uilocale.patch
+Patch12:        sunbird-0.9-gcc44.patch
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -69,7 +71,11 @@ calendar, without tying you to a particu
 %package -n thunderbird-lightning
 Summary:        The calendar extension to Thunderbird
 Group:          Applications/Productivity
-Requires:       thunderbird >= 2
+Requires:       thunderbird >= 3
+# Temporary, so we can be sure about the Thunderbird API
+Requires:       thunderbird >= 3.0-2.4.b3pre
+Requires:       thunderbird < 3.0-2.4.b4
+
 Obsoletes:      thunderbird-lightning-wcap <= 0.8
 Provides:       thunderbird-lightning-wcap = %{version}-%{release}
 AutoProv: 0
@@ -88,18 +94,25 @@ calendaring tasks.
         --basedir %{_libdir}                                            \\\
         --extpath %{_libdir}/thunderbird-lightning                      \\\
         --action 
+
+%define gdata_extname '{a62ef8ec-5fdc-40c2-873c-223b8a6925cc}'
+%define tbupdate_gdata                                                  \\\
+        %{_libdir}/thunderbird-lightning/mozilla-extension-update.sh    \\\
+        --appname thunderbird                                           \\\
+        --extname %{gdata_extname}                                      \\\
+        --basedir %{_libdir}                                            \\\
+        --extpath %{_libdir}/thunderbird-lightning-gdata                \\\
+        --action 
 %endif
 
 
 %prep
-%setup -q -c -a 2
-%patch0 -p0 -b .libical
-%patch1 -p1 -b .migwindow
-%patch3 -p0 -b .uilocale
-%patch4 -p0 -b .gcc44
-%patch21 -p0 -b .jemalloc
-%patch22 -p1 -b .shared-error
-%patch24 -p1 -b .pango-fix
+%setup -q -a 2
+%patch0 -p0 -b .jemalloc
+%patch1 -p1 -b .pango
+%patch10 -p0 -b .libical
+%patch11 -p0 -b .uilocale
+%patch12 -p0 -b .gcc44
 
 find . -name '*.cpp' -o -name '*.h' |xargs chmod -x
 
@@ -132,7 +145,7 @@ ac_add_options --with-system-nss
 ac_add_options --with-system-zlib
 EOF
 
-make -k -f client.mk build
+make -f client.mk build
 
 
 %install
@@ -171,12 +184,20 @@ do
 
 done
 
+# GData provider for sunbird
+mkdir -p $RPM_BUILD_ROOT%{progdir}/extensions/%{gdata_extname}
+touch $RPM_BUILD_ROOT%{progdir}/extensions/%{gdata_extname}/chrome.manifest
+unzip -qod $RPM_BUILD_ROOT%{progdir}/extensions/%{gdata_extname} \
+        mozilla/dist/xpi-stage/gdata-provider.xpi
+
 %if %with lightning
 # Avoid "Chrome Registration Failed" message on first startup and extension installation
 touch $RPM_BUILD_ROOT%{progdir}/extensions/%{lightning_extname}/chrome.manifest
+touch $RPM_BUILD_ROOT%{progdir}/extensions/%{gdata_extname}/chrome.manifest
 
-# Lightning
+# Lightning and GData provider for it
 unzip -qod $RPM_BUILD_ROOT%{_libdir}/thunderbird-lightning mozilla/dist/xpi-stage/lightning.xpi
+unzip -qod $RPM_BUILD_ROOT%{_libdir}/thunderbird-lightning-gdata mozilla/dist/xpi-stage/gdata-provider.xpi
 install -p -m 755 %{SOURCE3} $RPM_BUILD_ROOT%{_libdir}/thunderbird-lightning/mozilla-extension-update.sh
 
 # No langpacks for preview release
@@ -222,11 +243,13 @@ fi
 %if %with lightning
 %post -n thunderbird-lightning
 %{tbupdate_lightning} install ||Â :
+%{tbupdate_gdata} install ||Â :
 
 
 %preun -n thunderbird-lightning
 if [ $1 = 0 ]; then
         %{tbupdate_lightning} remove ||Â :
+        %{tbupdate_gdata} remove ||Â :
 fi
 
 
@@ -236,19 +259,23 @@ fi
 # which is run on self-upgrade, though triggerpostun isn't
 if [ $1 != 0 ]; then
         %{tbupdate_lightning} install || :
+        %{tbupdate_gdata} install ||Â :
 fi
 
 %triggerin -n thunderbird-lightning -- thunderbird
 %{tbupdate_lightning} install ||Â :
+%{tbupdate_gdata} install ||Â :
 
 %triggerun -n thunderbird-lightning -- thunderbird
 %{tbupdate_lightning} remove ||Â :
+%{tbupdate_gdata} remove ||Â :
 
 %triggerpostun -n thunderbird-lightning -- thunderbird
 # Guard against being run post-self-uninstall, even though that
 # doesn't happen currently (see comment above)
 if [ $1 != 0 ]; then
         %{tbupdate_lightning} install ||Â :
+        %{tbupdate_gdata} install ||Â :
 fi
 %endif
 
@@ -267,10 +294,18 @@ fi
 %doc mozilla/LEGAL mozilla/LICENSE mozilla/README.txt
 %defattr(-,root,root,-)
 %{_libdir}/thunderbird-lightning
+%{_libdir}/thunderbird-lightning-gdata
 %endif
 
 
 %changelog
+* Sun Jun 28 2009 Lubomir Rintel <lkundrak at v3.sk> - 1.0-0.5.20090513hg
+- Sync up with Thunderbird
+- Enable the Google Data Provider
+
+* Fri May 15 2009 Lubomir Rintel <lkundrak at v3.sk> - 1.0-0.4.20090302hg
+- Fixed thunderbird dependency
+
 * Thu May 12 2009 Lubomir Rintel <lkundrak at v3.sk> - 1.0-0.3.20090302hg
 - Fix migration window size (0x0 is considered too small by some) (#499346)
 


--- sunbird-1.0-migwindow.patch DELETED ---


--- thunderbird-shared-error.patch DELETED ---