rpms/thunderbird/F-12 thunderbird-version.patch, NONE, 1.1 .cvsignore, 1.32, 1.33 sources, 1.40, 1.41 thunderbird.spec, 1.156, 1.157
Martin Stransky
stransky at fedoraproject.org
Wed Jan 20 21:33:16 UTC 2010
Author: stransky
Update of /cvs/pkgs/rpms/thunderbird/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27777
Modified Files:
.cvsignore sources thunderbird.spec
Added Files:
thunderbird-version.patch
Log Message:
Update to 3.0.1
thunderbird-version.patch:
Makefile.in | 2 ++
1 file changed, 2 insertions(+)
--- NEW FILE thunderbird-version.patch ---
--- comm-1.9.1/mail/installer/Makefile.in.old 2010-01-20 14:27:43.000000000 +0100
+++ comm-1.9.1/mail/installer/Makefile.in 2010-01-20 14:29:21.000000000 +0100
@@ -42,6 +42,8 @@ VPATH = @srcdir@
include $(DEPTH)/config/autoconf.mk
+MOZ_APP_VERSION="__RPM_VERSION_INTERNAL__"
+
NO_PKG_FILES = \
thunderbird-bin.elf \
thunderbird-config \
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/thunderbird/F-12/.cvsignore,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -p -r1.32 -r1.33
--- .cvsignore 9 Dec 2009 09:13:10 -0000 1.32
+++ .cvsignore 20 Jan 2010 21:33:15 -0000 1.33
@@ -11,3 +11,5 @@ thunderbird-3.0rc2.source.tar.bz2
thunderbird-langpacks-3.0rc2-20091203.tar.bz2
thunderbird-3.0.source.tar.bz2
thunderbird-langpacks-3.0-20091209.tar.bz2
+thunderbird-3.0.1.source.tar.bz2
+thunderbird-langpacks-3.0.1-20100120.tar.bz2
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/thunderbird/F-12/sources,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -p -r1.40 -r1.41
--- sources 9 Dec 2009 09:13:10 -0000 1.40
+++ sources 20 Jan 2010 21:33:15 -0000 1.41
@@ -1,2 +1,2 @@
-9a564ac2489b1b0f9348dc298b913f6c thunderbird-3.0.source.tar.bz2
-1263a513f4d5e7663f3fdfc23fbf8eaf thunderbird-langpacks-3.0-20091209.tar.bz2
+f004aa5ddf2a30b5df96e06df416b0c9 thunderbird-3.0.1.source.tar.bz2
+ed52d606c5bc0593f23a50a66538917f thunderbird-langpacks-3.0.1-20100120.tar.bz2
Index: thunderbird.spec
===================================================================
RCS file: /cvs/pkgs/rpms/thunderbird/F-12/thunderbird.spec,v
retrieving revision 1.156
retrieving revision 1.157
diff -u -p -r1.156 -r1.157
--- thunderbird.spec 9 Dec 2009 09:13:10 -0000 1.156
+++ thunderbird.spec 20 Jan 2010 21:33:15 -0000 1.157
@@ -14,14 +14,16 @@
#%define tarballdir .
%define tarballdir comm-1.9.1
-%define mozappdir %{_libdir}/thunderbird-%{version}
%define official_branding 1
%define include_debuginfo 0
+%define version_internal 3.0
+%define mozappdir %{_libdir}/%{name}-%{version_internal}
+
Summary: Mozilla Thunderbird mail/newsgroup client
Name: thunderbird
-Version: 3.0
-Release: 4%{?dist}
+Version: 3.0.1
+Release: 1%{?dist}
URL: http://www.mozilla.org/projects/thunderbird/
License: MPLv1.1 or GPLv2+ or LGPLv2+
Group: Applications/Internet
@@ -32,7 +34,7 @@ Group: Applications/Internet
%endif
Source0: %{tarball}
%if %{build_langpacks}
-Source1: thunderbird-langpacks-%{version}-20091209.tar.bz2
+Source1: thunderbird-langpacks-%{version}-20100120.tar.bz2
%endif
Source10: thunderbird-mozconfig
Source11: thunderbird-mozconfig-branded
@@ -43,6 +45,7 @@ Source21: thunderbird.sh.in
Source30: thunderbird-open-browser.sh
Source100: find-external-requires
+Patch0: thunderbird-version.patch
Patch1: mozilla-jemalloc.patch
Patch2: thunderbird-shared-error.patch
Patch3: thunderbird-debuginfo-fix-include.patch
@@ -103,6 +106,10 @@ Mozilla Thunderbird is a standalone mail
%setup -q -c
cd %{tarballdir}
+sed -e 's/__RPM_VERSION_INTERNAL__/%{version_internal}/' %{P:%%PATCH0} \
+ > version.patch
+%{__patch} -p1 -b --suffix .version --fuzz=0 < version.patch
+
%patch1 -p0 -b .jemalloc
%patch2 -p1 -b .shared-error
@@ -137,6 +144,9 @@ cd %{tarballdir}
%build
cd %{tarballdir}
+INTERNAL_GECKO=%{version_internal}
+MOZ_APP_DIR=%{mozappdir}
+
# Build with -Os as it helps the browser; also, don't override mozilla's warning
# level; they use -Wall but disable a few warnings that show up _everywhere_
MOZ_OPT_FLAGS=$(echo $RPM_OPT_FLAGS | %{__sed} -e 's/-O2/-Os/' -e 's/-Wall//')
@@ -168,6 +178,11 @@ make buildsymbols
%{__rm} -rf $RPM_BUILD_ROOT
cd %{tarballdir}
+INTERNAL_GECKO=%{version_internal}
+
+INTERNAL_APP_NAME=%{name}-${INTERNAL_GECKO}
+MOZ_APP_DIR=%{_libdir}/${INTERNAL_APP_NAME}
+
cd %{moz_objdir}
DESTDIR=$RPM_BUILD_ROOT make install
@@ -204,7 +219,7 @@ desktop-file-install --vendor mozilla \
# set up the thunderbird start script
rm -f $RPM_BUILD_ROOT/%{_bindir}/thunderbird
-%{__cat} %{SOURCE21} | %{__sed} -e 's,TBIRD_VERSION,%{version},g' > \
+%{__cat} %{SOURCE21} | %{__sed} -e 's,TBIRD_VERSION,%{version_internal},g' > \
$RPM_BUILD_ROOT%{_bindir}/thunderbird
%{__chmod} 755 $RPM_BUILD_ROOT/%{_bindir}/thunderbird
@@ -353,6 +368,9 @@ fi
#===============================================================================
%changelog
+* Wed Jan 20 2010 Martin Stransky <stransky at redhat.com> - 3.0.1-1
+- Update to 3.0.1
+
* Wed Dec 9 2009 Jan Horak <jhorak at redhat.com> - 3.0-4
- Update to 3.0
More information about the scm-commits
mailing list