diff options
| -rw-r--r-- | thunderbird-install-dir.patch | 36 | ||||
| -rw-r--r-- | thunderbird.spec | 14 |
2 files changed, 27 insertions, 23 deletions
diff --git a/thunderbird-install-dir.patch b/thunderbird-install-dir.patch index 96342b9..480eb6d 100644 --- a/thunderbird-install-dir.patch +++ b/thunderbird-install-dir.patch @@ -1,19 +1,18 @@ -diff -up thunderbird-16.0/comm-release/config/autoconf.mk.in.dir thunderbird-16.0/comm-release/config/autoconf.mk.in ---- thunderbird-16.0/comm-release/config/autoconf.mk.in.dir 2012-10-05 23:20:26.000000000 +0200 -+++ thunderbird-16.0/comm-release/config/autoconf.mk.in 2012-10-09 12:57:24.290767832 +0200 -@@ -36,7 +36,7 @@ datadir = @datadir@ - mandir = @mandir@ - idldir = $(datadir)/idl/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION) - --installdir = $(libdir)/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION) -+installdir = $(libdir)/$(MOZ_APP_NAME) - sdkdir = $(libdir)/$(MOZ_APP_NAME)-devel-$(MOZ_APP_VERSION) +diff -up comm-release/config/baseconfig.mk.dir comm-release/config/baseconfig.mk +--- comm-release/config/baseconfig.mk.dir 2012-11-20 10:35:27.280236537 +0100 ++++ comm-release/config/baseconfig.mk 2012-11-20 10:35:45.208242562 +0100 +@@ -2,7 +2,7 @@ INCLUDED_AUTOCONF_MK = 1 - MOZDEPTH = $(DEPTH)/mozilla -diff -up thunderbird-16.0/comm-release/mozilla/config/autoconf.mk.in.dir thunderbird-16.0/comm-release/mozilla/config/autoconf.mk.in -diff -up thunderbird-16.0/comm-release/mozilla/config/baseconfig.mk.dir thunderbird-16.0/comm-release/mozilla/config/baseconfig.mk ---- thunderbird-16.0/comm-release/mozilla/config/baseconfig.mk.dir 2012-10-05 23:27:15.000000000 +0200 -+++ thunderbird-16.0/comm-release/mozilla/config/baseconfig.mk 2012-10-09 13:01:32.269317094 +0200 + includedir := $(includedir)/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION) + idldir = $(datadir)/idl/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION) +-installdir = $(libdir)/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION) ++installdir = $(libdir)/$(MOZ_APP_NAME) + sdkdir = $(libdir)/$(MOZ_APP_NAME)-devel-$(MOZ_APP_VERSION) + MOZILLA_SRCDIR = $(topsrcdir)/mozilla + MOZDEPTH = $(DEPTH)/mozilla +diff -up comm-release/mozilla/config/baseconfig.mk.dir comm-release/mozilla/config/baseconfig.mk +--- comm-release/mozilla/config/baseconfig.mk.dir 2012-11-16 22:16:02.000000000 +0100 ++++ comm-release/mozilla/config/baseconfig.mk 2012-11-20 10:34:30.610216973 +0100 @@ -2,7 +2,7 @@ INCLUDED_AUTOCONF_MK = 1 includedir := $(includedir)/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION) @@ -23,10 +22,9 @@ diff -up thunderbird-16.0/comm-release/mozilla/config/baseconfig.mk.dir thunderb sdkdir = $(libdir)/$(MOZ_APP_NAME)-devel-$(MOZ_APP_VERSION) DIST = $(DEPTH)/dist -diff -up thunderbird-16.0/comm-release/mozilla/js/src/config/autoconf.mk.in.dir thunderbird-16.0/comm-release/mozilla/js/src/config/autoconf.mk.in -diff -up thunderbird-16.0/comm-release/mozilla/js/src/config/baseconfig.mk.dir thunderbird-16.0/comm-release/mozilla/js/src/config/baseconfig.mk ---- thunderbird-16.0/comm-release/mozilla/js/src/config/baseconfig.mk.dir 2012-10-05 23:27:30.000000000 +0200 -+++ thunderbird-16.0/comm-release/mozilla/js/src/config/baseconfig.mk 2012-10-09 13:02:00.885495014 +0200 +diff -up comm-release/mozilla/js/src/config/baseconfig.mk.dir comm-release/mozilla/js/src/config/baseconfig.mk +--- comm-release/mozilla/js/src/config/baseconfig.mk.dir 2012-11-16 22:16:14.000000000 +0100 ++++ comm-release/mozilla/js/src/config/baseconfig.mk 2012-11-20 10:34:32.511217747 +0100 @@ -1,6 +1,6 @@ INCLUDED_AUTOCONF_MK = 1 diff --git a/thunderbird.spec b/thunderbird.spec index 59f09b9..4b61140 100644 --- a/thunderbird.spec +++ b/thunderbird.spec @@ -59,14 +59,14 @@ Summary: Mozilla Thunderbird mail/newsgroup client Name: thunderbird -Version: 16.0.2 +Version: 17.0 Release: 1%{?dist} URL: http://www.mozilla.org/projects/thunderbird/ License: MPLv1.1 or GPLv2+ or LGPLv2+ Group: Applications/Internet Source0: ftp://ftp.mozilla.org/pub/thunderbird/releases/%{version}%{?pre_version}/source/thunderbird-%{version}%{?pre_version}.source.tar.bz2 %if %{build_langpacks} -Source1: thunderbird-langpacks-%{version}-20121029.tar.xz +Source1: thunderbird-langpacks-%{version}-20121119.tar.xz %endif Source10: thunderbird-mozconfig Source11: thunderbird-mozconfig-branded @@ -191,7 +191,7 @@ sed -e "s/^Name=.*/Name=Thunderbird %{version} %{?relcan}/" \ cd %{tarballdir} -%patch0 -p2 -b .dir +%patch0 -p1 -b .dir # Mozilla (XULRunner) patches cd mozilla %patch8 -p3 -b .secondary-ipc @@ -276,7 +276,7 @@ cd %{tarballdir} # Disable C++ exceptions since Mozilla code is not exception-safe # MOZ_OPT_FLAGS=$(echo "$RPM_OPT_FLAGS -fpermissive" | \ - %{__sed} -e 's/-Wall//' -e 's/-fexceptions/-fno-exceptions/g') + %{__sed} -e 's/-Wall//') %if %{?debug_build} MOZ_OPT_FLAGS=$(echo "$MOZ_OPT_FLAGS" | %{__sed} -e 's/-O2//') %endif @@ -498,6 +498,12 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : #=============================================================================== %changelog +* Tue Nov 20 2012 Remi Collet <RPMS@FamilleCollet.com> - 17.0-1 +- Sync with rawhide, update to 17.0 + +* Mon Nov 19 2012 Jan Horak <jhorak@redhat.com> - 17.0-1 +- Update to 17.0 + * Mon Oct 29 2012 Remi Collet <RPMS@FamilleCollet.com> - 16.0.2-1 - Sync with rawhide, update to 16.0.2 |