rpms/sunbird/devel sunbird.spec, 1.35, 1.36 sunbird-0.9-gcc44.patch, 1.3, NONE thunderbird-pango.patch, 1.3, NONE

[Lubomir Rintel]

Author: lkundrak

Update of /cvs/pkgs/rpms/sunbird/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27280

Modified Files:
	sunbird.spec 
Removed Files:
	sunbird-0.9-gcc44.patch thunderbird-pango.patch 
Log Message:
* Mon Aug 17 2009 Lubomir Rintel <lkundrak at v3.sk> - 1.0-0.10.20090715hg
- Sync up with Thunderbird



Index: sunbird.spec
===================================================================
RCS file: /cvs/pkgs/rpms/sunbird/devel/sunbird.spec,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -p -r1.35 -r1.36
--- sunbird.spec	11 Aug 2009 14:01:19 -0000	1.35
+++ sunbird.spec	17 Aug 2009 14:44:06 -0000	1.36
@@ -13,14 +13,14 @@
 
 Name:           sunbird
 Version:        1.0
-Release:        0.9.20090513hg%{?dist}
+Release:        0.10.20090715hg%{?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:        sunbird-1.0-20090513hg.tar.lzma
+Source0:        thunderbird-3.0b3-source.tar.bz2
 Source1:        sunbird.desktop
 Source2:        sunbird-l10n.tar
 #sunbird-langpacks-0.9.tar.gz
@@ -32,12 +32,10 @@ Source100:      find-external-requires
 
 # 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)
 
@@ -73,8 +71,8 @@ Summary:        The calendar extension t
 Group:          Applications/Productivity
 Requires:       thunderbird >= 3
 # Temporary, so we can be sure about the Thunderbird API
-#Requires:       thunderbird >= 3.0-2.3.b3pre
-Requires:       thunderbird = 3.0-3.8.b3
+Requires:       thunderbird >= 3.0-3.8.b3
+Requires:       thunderbird < 3.0-3.8.b4
 
 Obsoletes:      thunderbird-lightning-wcap <= 0.8
 Provides:       thunderbird-lightning-wcap = %{version}-%{release}
@@ -107,12 +105,10 @@ calendaring tasks.
 
 
 %prep
-%setup -q -a 2
+%setup -c -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
 
@@ -299,6 +295,9 @@ fi
 
 
 %changelog
+* Mon Aug 17 2009 Lubomir Rintel <lkundrak at v3.sk> - 1.0-0.10.20090715hg
+- Sync up with Thunderbird
+
 * Tue Aug 11 2009 Jan Horak <jhorak at redhat.com> - 1.0-0.8.20090513hg
 - Rebuild against new Thunderbird
 


--- sunbird-0.9-gcc44.patch DELETED ---


--- thunderbird-pango.patch DELETED ---