rpms/sunbird/F-11 .cvsignore, 1.14, 1.15 sources, 1.14, 1.15 sunbird.spec, 1.31, 1.32

[Jan Horak]

Author: xhorak

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

Modified Files:
	.cvsignore sources sunbird.spec 
Log Message:
Sync up with Thunderbird


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/sunbird/F-11/.cvsignore,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -p -r1.14 -r1.15
--- .cvsignore	18 Aug 2009 11:14:39 -0000	1.14
+++ .cvsignore	22 Sep 2009 14:04:15 -0000	1.15
@@ -1,2 +1,3 @@
 thunderbird-3.0b3-source.tar.bz2
 sunbird-l10n.tar
+thunderbird-3.0b4-source.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/sunbird/F-11/sources,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -p -r1.14 -r1.15
--- sources	18 Aug 2009 11:14:39 -0000	1.14
+++ sources	22 Sep 2009 14:04:16 -0000	1.15
@@ -1,2 +1,2 @@
-84a004d76e82325dd2cc5ff271fd3952  thunderbird-3.0b3-source.tar.bz2
 70d060b6f6331c8cf123a39628ee859e  sunbird-l10n.tar
+0f7c7cdfebd8948b7e3fe835773b072d  thunderbird-3.0b4-source.tar.bz2


Index: sunbird.spec
===================================================================
RCS file: /cvs/pkgs/rpms/sunbird/F-11/sunbird.spec,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -p -r1.31 -r1.32
--- sunbird.spec	18 Aug 2009 11:14:39 -0000	1.31
+++ sunbird.spec	22 Sep 2009 14:04:16 -0000	1.32
@@ -11,16 +11,24 @@
 %define _use_internal_dependency_generator 0
 %define __find_requires %{SOURCE100} %{buildroot}
 
+# The tarball is pretty inconsistent with directory structure.
+# Sometimes there is a top level directory.  That goes here.
+#
+# IMPORTANT: If there is no top level directory, this should be 
+# set to the cwd, ie: '.'
+#%define tarballdir .
+%define tarballdir comm-central
+
 Name:           sunbird
 Version:        1.0
-Release:        0.6.20090715hg%{?dist}
+Release:        0.7.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:        thunderbird-3.0b3-source.tar.bz2
+Source0:        thunderbird-3.0b4-source.tar.bz2
 Source1:        sunbird.desktop
 Source2:        sunbird-l10n.tar
 #sunbird-langpacks-0.9.tar.gz
@@ -71,8 +79,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.6.b3
-Requires:       thunderbird < 3.0-2.6.b4
+Requires:       thunderbird >= 3.0-2.7.b4
+Requires:       thunderbird < 3.0-2.7.b5
 
 Obsoletes:      thunderbird-lightning-wcap <= 0.8
 Provides:       thunderbird-lightning-wcap = %{version}-%{release}
@@ -106,6 +114,7 @@ calendaring tasks.
 
 %prep
 %setup -c -q -a 2
+cd %{tarballdir}
 %patch0 -p0 -b .jemalloc
 %patch10 -p0 -b .libical
 %patch11 -p0 -b .uilocale
@@ -114,6 +123,8 @@ find . -name '*.cpp' -o -name '*.h' |xar
 
 
 %build
+cd %{tarballdir}
+
 cat >.mozconfig <<EOF
 ac_add_options --disable-crashreporter
 ac_add_options --disable-debug
@@ -146,6 +157,7 @@ make -f client.mk build
 
 %install
 rm -rf $RPM_BUILD_ROOT
+cd %{tarballdir}
 
 # make install is bogus
 # copy tree, break symlinks
@@ -295,6 +307,9 @@ fi
 
 
 %changelog
+* Tue Sep 22 2009 Jan Horak <jhorak at redhat.com> - 1.0-0.7.20090715hg
+- Sync up with Thunderbird
+
 * Tue Aug 18 2009 Lubomir Rintel <lkundrak at v3.sk> - 1.0-0.6.20090715hg
 - Update langpacks