rpms/thunderbird/devel .cvsignore, 1.24, 1.25 sources, 1.31, 1.32 thunderbird-shared-error.patch, 1.1, 1.2 thunderbird.spec, 1.135, 1.136
Jan Horak
xhorak at fedoraproject.org
Tue Jul 21 11:43:38 UTC 2009
- Previous message (by thread): rpms/openoffice.org/devel workspace.cmcfixes61.patch, NONE, 1.1 openoffice.org.spec, 1.1969, 1.1970 openoffice.org-3.1.0.ooo103451.svx.64bit.patch, 1.1, NONE openoffice.org-3.1.0.ooo103651.canvas.nosubpixel.patch, 1.1, NONE
- Next message (by thread): rpms/gstreamer-plugins-base/devel .cvsignore, 1.25, 1.26 gstreamer-plugins-base.spec, 1.80, 1.81 sources, 1.26, 1.27
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: xhorak
Update of /cvs/pkgs/rpms/thunderbird/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13699
Modified Files:
.cvsignore sources thunderbird-shared-error.patch
thunderbird.spec
Log Message:
Update to 3.0 beta3
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/thunderbird/devel/.cvsignore,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -p -r1.24 -r1.25
--- .cvsignore 13 May 2009 06:22:26 -0000 1.24
+++ .cvsignore 21 Jul 2009 11:43:08 -0000 1.25
@@ -1 +1,3 @@
thunderbird-3.0-6a6386c16e98-source.tar.bz2
+thunderbird-3.0b3-source.tar.bz2
+thunderbird-langpacks-3.0-20090721.tar.bz2
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/thunderbird/devel/sources,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -p -r1.31 -r1.32
--- sources 13 May 2009 06:22:26 -0000 1.31
+++ sources 21 Jul 2009 11:43:08 -0000 1.32
@@ -1 +1,2 @@
-ec5efa909535d4a764d8a0c0fa5d4a38 thunderbird-3.0-6a6386c16e98-source.tar.bz2
+84a004d76e82325dd2cc5ff271fd3952 thunderbird-3.0b3-source.tar.bz2
+f38cc1a9e69bff77e4eba2385272c671 thunderbird-langpacks-3.0-20090721.tar.bz2
thunderbird-shared-error.patch:
Makefile.in | 2 ++
1 file changed, 2 insertions(+)
Index: thunderbird-shared-error.patch
===================================================================
RCS file: /cvs/pkgs/rpms/thunderbird/devel/thunderbird-shared-error.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- thunderbird-shared-error.patch 2 Mar 2009 12:57:03 -0000 1.1
+++ thunderbird-shared-error.patch 21 Jul 2009 11:43:08 -0000 1.2
@@ -1,39 +1,15 @@
-diff -upU8 thunderbird-3.0/mail/installer/Makefile.in.shared-error thunderbird-3.0/mail/installer/Makefile.in
---- thunderbird-3.0/mail/installer/Makefile.in.shared-error 2009-02-24 03:16:03.000000000 +0100
-+++ thunderbird-3.0/mail/installer/Makefile.in 2009-02-27 16:02:31.000000000 +0100
-@@ -56,16 +56,17 @@ NO_PKG_FILES = \
- PalmSyncInstall.exe \
- $(NULL)
-
- include $(topsrcdir)/config/rules.mk
-
- MOZ_PKG_REMOVALS = $(srcdir)/removed-files.in
-
- ifdef BUILD_STATIC_LIBS
+diff -up thunderbird-3.0/mail/installer/Makefile.in.shared-error thunderbird-3.0/mail/installer/Makefile.in
+--- thunderbird-3.0/mail/installer/Makefile.in.shared-error 2009-07-13 14:56:36.000000000 +0200
++++ thunderbird-3.0/mail/installer/Makefile.in 2009-07-14 12:41:16.000000000 +0200
+@@ -94,9 +94,11 @@ endif
+ # mozconfig instead.
+ ifndef MAIL_PKG_SHARED
+ ifndef BUILD_STATIC_LIBS
+ifeq (BUILD_STATIC_LIBS, 1)
- ifeq (WINNT,$(OS_ARCH))
- MOZ_PKG_MANIFEST_P = $(srcdir)/windows/packages-static
- endif
- else
- $(error you need a "--enable-static --disable-shared" build to create an installer)
+ $(error you need an "--enable-static" build to package a build)
endif
-
- MOZ_NONLOCALIZED_PKG_LIST = \
-@@ -80,16 +81,17 @@ MOZ_LOCALIZED_PKG_LIST = $(AB_CD)
- DEFINES += -DAB_CD=$(AB_CD)
-
- ifdef MOZ_PKG_MANIFEST_P
- MOZ_PKG_MANIFEST = packages-static
-
- $(MOZ_PKG_MANIFEST): $(MOZ_PKG_MANIFEST_P)
- $(PERL) $(MOZILLA_SRCDIR)/config/preprocessor.pl $(DEFINES) $(ACDEFINES) $< > $@
endif
+endif
- ifneq (,$(filter mac cocoa,$(MOZ_WIDGET_TOOLKIT)))
- MOZ_PKG_MAC_DSSTORE=branding/dsstore
- MOZ_PKG_MAC_BACKGROUND=branding/background.png
- MOZ_PKG_MAC_ICON=branding/disk.icns
- MOZ_PKG_MAC_EXTRA=--symlink "/Applications:/ "
- endif
+ include $(MOZILLA_SRCDIR)/toolkit/mozapps/installer/packager.mk
Index: thunderbird.spec
===================================================================
RCS file: /cvs/pkgs/rpms/thunderbird/devel/thunderbird.spec,v
retrieving revision 1.135
retrieving revision 1.136
diff -u -p -r1.135 -r1.136
--- thunderbird.spec 13 May 2009 06:22:26 -0000 1.135
+++ thunderbird.spec 21 Jul 2009 11:43:08 -0000 1.136
@@ -1,28 +1,28 @@
%define desktop_file_utils_version 0.9
%define nspr_version 4.6
-%define nss_version 3.10
+%define nss_version 3.12.3
%define cairo_version 1.0
%define dbus_glib_version 0.6
-%define version_internal 3.0b3pre
-%define build_langpacks 0
+%define version_internal 3.0b3
+%define build_langpacks 1
%define official_branding 1
Summary: Mozilla Thunderbird mail/newsgroup client
Name: thunderbird
Version: 3.0
-Release: 2.3.b3pre.hg.6a6386c16e98%{?dist}
+Release: 2.4.b3%{?dist}
URL: http://www.mozilla.org/projects/thunderbird/
License: MPLv1.1 or GPLv2+ or LGPLv2+
Group: Applications/Internet
%if %{official_branding}
-%define tarball thunderbird-%{version}-6a6386c16e98-source.tar.bz2
+%define tarball thunderbird-%{version}b3-source.tar.bz2
%else
%define tarball thunderbird-3.0b2-source.tar.bz2
%endif
Source0: %{tarball}
%if %{build_langpacks}
-Source1: thunderbird-langpacks-%{version}-20090302.tar.bz2
+Source1: thunderbird-langpacks-%{version}-20090721.tar.bz2
%endif
Source10: thunderbird-mozconfig
Source11: thunderbird-mozconfig-branded
@@ -173,18 +173,6 @@ install -Dm755 %{SOURCE30} $RPM_BUILD_RO
%{__rm} -f $RPM_BUILD_ROOT%{_bindir}/thunderbird-config
-cd $RPM_BUILD_ROOT%{mozappdir}/chrome
-find . -name "*" -type d -maxdepth 1 -exec %{__rm} -rf {} \;
-cd -
-
-%{__mkdir_p} $RPM_BUILD_ROOT%{mozappdir}/chrome/icons/default/
-%{__cp} other-licenses/branding/%{name}/default.xpm \
- $RPM_BUILD_ROOT%{mozappdir}/chrome/icons/default/
-
-%{__mkdir_p} $RPM_BUILD_ROOT%{mozappdir}/icons/
-%{__cp} other-licenses/branding/%{name}/default.xpm \
- $RPM_BUILD_ROOT%{mozappdir}/icons/
-
# own mozilla plugin dir (#135050)
%{__mkdir_p} $RPM_BUILD_ROOT%{_libdir}/mozilla/plugins
@@ -299,10 +287,14 @@ fi
%exclude %{mozappdir}/license.html
%exclude %{mozappdir}/dependentlibs.list
%exclude %{mozappdir}/removed-files
+%{mozappdir}/update.locale
#===============================================================================
%changelog
+* Tue Jul 21 2009 Jan Horak <jhorak at redhat.com> - 3.0-2.4.beta3
+- Update to 3.0 beta3
+
* Mon Mar 30 2009 Jan Horak <jhorak at redhat.com> - 3.0-2.2.beta2
- Fixed open-browser.sh to use xdg-open instead of gnome-open
- Previous message (by thread): rpms/openoffice.org/devel workspace.cmcfixes61.patch, NONE, 1.1 openoffice.org.spec, 1.1969, 1.1970 openoffice.org-3.1.0.ooo103451.svx.64bit.patch, 1.1, NONE openoffice.org-3.1.0.ooo103651.canvas.nosubpixel.patch, 1.1, NONE
- Next message (by thread): rpms/gstreamer-plugins-base/devel .cvsignore, 1.25, 1.26 gstreamer-plugins-base.spec, 1.80, 1.81 sources, 1.26, 1.27
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the fedora-extras-commits
mailing list