Author: remi Update of /cvs/free/rpms/thunderbird-enigmail/devel In directory se02.es.rpmfusion.net:/tmp/cvs-serv20281 Modified Files: .cvsignore sources thunderbird-enigmail.spec thunderbird-shared-error.patch Added Files: thunderbird-3.0-ppc64.patch Removed Files: thunderbird-imap-startup-crash.patch thunderbird-pango.patch xulrunner-elif.patch Log Message: update to 0.97a for thunderbird 3.0b3 thunderbird-3.0-ppc64.patch: --- NEW FILE thunderbird-3.0-ppc64.patch --- --- configure.in.ppc64 2009-07-21 14:01:25.000000000 +0200 +++ configure.in 2009-07-21 14:01:51.000000000 +0200 @@ -1451,7 +1451,7 @@ CPU_ARCH=sparc ;; -x86_64 | ia64) +x86_64 | ia64 | ppc64) CPU_ARCH="$OS_TEST" ;; esac @@ -4148,6 +4148,9 @@ if test -n "${CPU_ARCH}" -a -n "${TARGET_COMPILER_ABI}"; then TARGET_XPCOM_ABI="${CPU_ARCH}-${TARGET_COMPILER_ABI}" fi +echo CPU_ARCH=${CPU_ARCH} +echo TARGET_COMPILER_ABI=${TARGET_COMPILER_ABI} +echo TARGET_XPCOM_ABI=$TARGET_XPCOM_ABI dnl Mozilla specific options dnl ======================================================== --- mozilla/configure.in.ppc64 2009-07-15 22:36:48.000000000 +0200 +++ mozilla/configure.in 2009-07-21 13:57:46.000000000 +0200 @@ -1317,7 +1317,7 @@ CPU_ARCH=sparc ;; -x86_64 | ia64) +x86_64 | ia64 | ppc64) CPU_ARCH="$OS_TEST" ;; esac @@ -4033,6 +4033,9 @@ if test -n "${CPU_ARCH}" -a -n "${TARGET_COMPILER_ABI}"; then TARGET_XPCOM_ABI="${CPU_ARCH}-${TARGET_COMPILER_ABI}" fi +echo CPU_ARCH=${CPU_ARCH} +echo TARGET_COMPILER_ABI=${TARGET_COMPILER_ABI} +echo TARGET_XPCOM_ABI=$TARGET_XPCOM_ABI dnl Mozilla specific options dnl ======================================================== Index: .cvsignore =================================================================== RCS file: /cvs/free/rpms/thunderbird-enigmail/devel/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 22 May 2009 18:42:43 -0000 1.2 +++ .cvsignore 21 Jul 2009 18:40:52 -0000 1.3 @@ -1,2 +1,2 @@ -enigmail-20090521.tgz -thunderbird-3.0b2-source.tar.bz2 +enigmail-20090721.tgz +thunderbird-3.0b3-source.tar.bz2 Index: sources =================================================================== RCS file: /cvs/free/rpms/thunderbird-enigmail/devel/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 22 May 2009 18:42:43 -0000 1.2 +++ sources 21 Jul 2009 18:40:52 -0000 1.3 @@ -1,2 +1,2 @@ -3356851fb5a3fb4302621008300ca8b2 enigmail-20090521.tgz -3a6a95040c4356139a02eab5d32b9ad1 thunderbird-3.0b2-source.tar.bz2 +b127a34e4a1c01c9a876405a2b5abe0e enigmail-20090721.tgz +84a004d76e82325dd2cc5ff271fd3952 thunderbird-3.0b3-source.tar.bz2 Index: thunderbird-enigmail.spec =================================================================== RCS file: /cvs/free/rpms/thunderbird-enigmail/devel/thunderbird-enigmail.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- thunderbird-enigmail.spec 22 May 2009 18:42:43 -0000 1.1 +++ thunderbird-enigmail.spec 21 Jul 2009 18:40:52 -0000 1.2 @@ -1,34 +1,41 @@ -%define nspr_version 4.6 -%define nss_version 3.10 -%define cairo_version 1.0 -%define dbus_glib_version 0.6 +%global nspr_version 4.6 +%global nss_version 3.10 +%global cairo_version 1.0 +%global dbus_glib_version 0.6 -%define official_branding 1 +%global official_branding 1 -%define thunver 3.0 +%global thunver 3.0 +%global thunbeta b3 -%define CVS 20090521 +%global CVS 20090721 Summary: Authentication and encryption extension for Mozilla Thunderbird Name: thunderbird-enigmail -Version: 0.96a -Release: 0.3.cvs%{CVS}%{?dist} +Version: 0.97a +%if 0%{?CVS} +Release: 0.1.cvs%{CVS}%{?dist} +%else +Release: 1%{?dist} +%endif URL: http://enigmail.mozdev.org/ License: MPLv1.1 or GPLv2+ Group: Applications/Internet -Source0: http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/%{thunve... +Source0: http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/%{thunve... Source10: thunderbird-mozconfig Source11: thunderbird-mozconfig-branded # ===== Enigmail files ===== -#Source100: http://www.mozilla-enigmail.org/downloads/src/enigmail-%{version}.tar.gz - +%if 0%{?CVS} # cvs -d :pserver:guest@mozdev.org:/cvs login # => password is guest # cvs -d :pserver:guest@mozdev.org:/cvs co enigmail/src -# tar czf /home/rpmbuild/SOURCES/enigmail-20090521.tgz -C enigmail/src . -Source100: enigmail-%{CVS}.tgz +# tar czf /home/rpmbuild/SOURCES/enigmail-20090721.tgz --exclude CVS -C enigmail/src . +Source100: enigmail-%{CVS}.tgz +%else +Source100: http://www.mozilla-enigmail.org/downloads/src/enigmail-%{version}.tar.gz +%endif # http://www.mozdev.org/pipermail/enigmail/2009-April/011018.html Source101: enigmail-fixlang.php @@ -39,9 +46,7 @@ # Build patches Patch1: mozilla-jemalloc.patch Patch2: thunderbird-shared-error.patch -Patch3: xulrunner-elif.patch -Patch4: thunderbird-pango.patch -Patch5: thunderbird-imap-startup-crash.patch +Patch3: thunderbird-3.0-ppc64.patch %if %{official_branding} @@ -76,10 +81,12 @@ BuildRequires: libgnomeui-devel -%define mozappdir %{_libdir}/thunderbird-%{thunver}b2 +%define mozappdir %{_libdir}/thunderbird-%{thunver}%{?thunbeta} ## For fixing lang +%if 0%{?CVS} BuildRequires: dos2unix, php-cli +%endif # Without this enigmmail will require libxpcom.so and other .so # which are not provided by thunderbird (to avoid mistake, @@ -114,9 +121,7 @@ %patch1 -p0 -b .jemalloc %patch2 -p1 -b .shared-error -%patch3 -p0 -b .xulrunner-elif -%patch4 -p1 -b .pango-fix -%patch5 -p1 -b .imap-startup-crash +%patch3 -p0 -b .ppc64 %if %{official_branding} # Required by Mozilla Corporation @@ -136,10 +141,11 @@ %endif # ===== Enigmail work ===== +# ===== Fixing langpack +%if 0%{?CVS} mkdir mailnews/extensions/enigmail tar xzf %{SOURCE100} -C mailnews/extensions/enigmail -# ===== Fixing langpack pushd mailnews/extensions/enigmail for rep in $(cat lang/current-languages.txt) do @@ -148,6 +154,9 @@ php %{SOURCE101} ui/locale/en-US lang/$rep done popd +%else +tar xzf %{SOURCE100} -C mailnews/extensions +%endif #=============================================================================== @@ -250,6 +259,9 @@ #=============================================================================== %changelog +* Tue Jul 21 2009 Remi Collet <rpms(a)famillecollet.com&gt; 0.97a-0.1.cvs20090721 +- new CVS snapshot (against thunderbird 3.0b3) + * Thu May 21 2009 Remi Collet <rpms(a)famillecollet.com&gt; 0.96a-0.3.cvs20090521 - new CVS snapshot - fix License and Sumnary thunderbird-shared-error.patch: Index: thunderbird-shared-error.patch =================================================================== RCS file: /cvs/free/rpms/thunderbird-enigmail/devel/thunderbird-shared-error.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- thunderbird-shared-error.patch 22 May 2009 18:42:43 -0000 1.1 +++ thunderbird-shared-error.patch 21 Jul 2009 18:40:52 -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 --- thunderbird-imap-startup-crash.patch DELETED --- --- thunderbird-pango.patch DELETED --- --- xulrunner-elif.patch DELETED ---