SPECS: mozilla-thunderbird.spec - updated to 1.5 - updated enigmai...

adamg adamg at pld-linux.org
Thu Jan 19 15:26:04 CET 2006 

Author: adamg                        Date: Thu Jan 19 14:26:04 2006 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- updated to 1.5
- updated enigmail to 0.94 (includes ipc)
- -nopangoxft, -bug305970 and -bug304720 patches added
- dropped -fontconfig.patch and ft218 bcond
- switched to preferred build method (mozconfig and ac_add_options instead
  of configure and its parameters)
- %files revisited 
- works (apart from enigmail), release 0.1 

---- Files affected:
SPECS:
   mozilla-thunderbird.spec (1.47 -> 1.48) 

---- Diffs:

================================================================
Index: SPECS/mozilla-thunderbird.spec
diff -u SPECS/mozilla-thunderbird.spec:1.47 SPECS/mozilla-thunderbird.spec:1.48
--- SPECS/mozilla-thunderbird.spec:1.47	Thu Jan 19 10:45:57 2006
+++ SPECS/mozilla-thunderbird.spec	Thu Jan 19 15:25:57 2006
@@ -1,41 +1,41 @@
 # $Revision$, $Date$
+# TODO:
+#   - enigmail doesn't work
+#   - check -alpha-gcc3, -gfx, -blockimage, -gcc-bugs patches
+#   - check %files
 #
 # Conditional builds
-%bcond_without	ft218	    # compile with freetype < 2.1.8
 %bcond_without	enigmail    # don't build enigmail - GPG/PGP support
 %bcond_without	spellcheck  # build without spellcheck function
 #
 Summary:	Mozilla Thunderbird - email client
 Summary(pl):	Mozilla Thunderbird - klient poczty
 Name:		mozilla-thunderbird
-Version:	1.0.7
-Release:	1
+Version:	1.5
+Release:	0.1
 License:	MPL/LGPL
 Group:		Applications/Networking
 Source0:	http://ftp.mozilla.org/pub/mozilla.org/thunderbird/releases/%{version}/source/thunderbird-%{version}-source.tar.bz2
-# Source0-md5:	e6388feb0ffcd189af779f165c124b4d
-Source1:	%{name}.desktop
-Source2:	%{name}.sh
-Source3:	http://www.mozilla-enigmail.org/downloads/src/ipc-1.1.3.tar.gz
-# Source3-md5:	64ba4c6e3b52568468c4f6680ec7e679
-Source4:	http://www.mozilla-enigmail.org/downloads/src/enigmail-0.93.0.tar.gz
-# Source4-md5:	cb7126705924cb7f0de205b4ff4e28b4
+# Source0-md5:	781c1cd1a01583d9b666d8c2fe4288e6
+Source1:	http://www.mozilla-enigmail.org/downloads/src/enigmail-0.94.0.tar.gz
+# Source1-md5:	d326c302c1d2d68217fffcaa01ca7632
+Source2:	%{name}.desktop
+Source3:	%{name}.sh
 Patch0:		%{name}-alpha-gcc3.patch
 Patch1:		%{name}-gfx.patch
 Patch2:		%{name}-nss.patch
 Patch3:		%{name}-lib_path.patch
-Patch4:		%{name}-freetype.patch
-Patch5:		%{name}-blockimage.patch
-Patch6:		%{name}-gcc-bugs.patch
+Patch4:		%{name}-blockimage.patch
+Patch5:		%{name}-gcc-bugs.patch
+Patch6:		%{name}-nopangoxft.patch
+# official patches
+# certain ui operations cause prolonged hang (cpu at 100%)
+Patch100:	%{name}-bug305970.patch
+# Ctrl-Shift-Home + typing with mozInlineSpellChecker causes NULL nsCOMPtr assertion
+Patch101:	%{name}-bug304720.patch
 URL:		http://www.mozilla.org/projects/thunderbird/
 BuildRequires:	automake
-%if %{with ft218}
 BuildRequires:	freetype-devel >= 1:2.1.8
-%else
-BuildRequires:	freetype-devel >= 2.1.3
-BuildRequires:	freetype-devel < 1:2.1.8
-BuildConflicts:	freetype-devel = 2.1.8
-%endif
 BuildRequires:	gtk+2-devel >= 1:2.0.0
 BuildRequires:	libIDL-devel >= 0.8.0
 BuildRequires:	libjpeg-devel >= 6b
@@ -49,13 +49,6 @@
 BuildRequires:	/bin/ex
 BuildRequires:	/bin/csh
 %endif
-%if %{with ft218}
-Requires:	freetype >= 1:2.1.3
-%else
-Requires:	freetype >= 2.1.3
-Requires:	freetype < 1:2.1.8
-Conflicts:	freetype = 2.1.8
-%endif
 Requires:	nspr >= 1:4.6-0.20041030.1
 Requires:	nss >= 3.8
 %if %{with spellcheck}
@@ -93,80 +86,100 @@
 
 %prep
 %setup -q -n mozilla
-%if %{with enigmail}
-cd extensions
-tar xvfz %{SOURCE3}
-tar xvfz %{SOURCE4}
-cd ..
-%endif
+%{?with_enigmail:tar xvfz %{SOURCE1} -C mailnews/extensions}
 
-%patch0 -p1
-%patch1 -p1
+##%patch0 -p1
+##%patch1 -p1
 %patch2 -p1
 %patch3 -p1
-%{?with_ft218:%patch4 -p1}
-%patch5 -p1
+##%patch4 -p1
+##%patch5 -p1
 %patch6 -p1
 
-# %if %{with enigmail}
-# mv ipc extensions/ipc
-# mv enigmail extensions/enigmail
-# %endif
+# official patches
+%patch100 -p1
+%patch101 -p1
 
 %build
 export CFLAGS="%{rpmcflags} `%{_bindir}/pkg-config mozilla-nspr --cflags-only-I`"
 export CXXFLAGS="%{rpmcflags} `%{_bindir}/pkg-config mozilla-nspr --cflags-only-I`"
-export MOZ_THUNDERBIRD=1
-export BUILD_OFFICIAL="1"
-export MOZILLA_OFFICIAL="1"
 
 cp -f %{_datadir}/automake/config.* build/autoconf
 cp -f %{_datadir}/automake/config.* nsprpub/build/autoconf
 cp -f %{_datadir}/automake/config.* directory/c-sdk/config/autoconf
 
-%configure2_13 \
+cat << EOF > .mozconfig
+. \$topsrcdir/mail/config/mozconfig
+
+export BUILD_OFFICIAL=1
+export MOZILLA_OFFICIAL=1
+#export MOZ_THUNDERBID=1
+
+mk_add_options BUILD_OFFICIAL=1
+mk_add_options MOZILLA_OFFICIAL=1
+
+ac_add_options --prefix=%{_prefix}
+ac_add_options --exec-prefix=%{_exec_prefix}
+ac_add_options --bindir=%{_bindir}
+ac_add_options --sbindir=%{_sbindir}
+ac_add_options --sysconfdir=%{_sysconfdir}
+ac_add_options --datadir=%{_datadir}
+ac_add_options --includedir=%{_includedir}
+ac_add_options --libdir=%{_libdir}
+ac_add_options --libexecdir=%{_libexecdir}
+ac_add_options --localstatedir=%{_localstatedir}
+ac_add_options --sharedstatedir=%{_sharedstatedir}
+ac_add_options --mandir=%{_mandir}
+ac_add_options --infodir=%{_infodir}
 %if %{?debug:1}0
-	--enable-debug \
-	--enable-debug-modules \
+ac_add_options --enable-debug
+ac_add_options --enable-debug-modules
 %else
-	--disable-debug \
-	--disable-debug-modules \
+ac_add_options --disable-debug
+ac_add_options --disable-debug-modules
 %endif
 %if %{with tests}
-	--enable-tests \
+ac_add_options --enable-tests
 %else
-	--disable-tests \
+ac_add_options --disable-tests
 %endif
-	--disable-ldap \
-	--disable-installer \
-	--disable-jsd \
-	--disable-xprint \
-	--enable-crypto \
-	--enable-default-toolkit="gtk2" \
-	--enable-extensions="pref,cookie,wallet%{?with_spellcheck:,spellcheck}" \
-	--enable-freetype2 \
-	--enable-mathml \
-	--enable-optimize="%{rpmcflags}" \
-	--enable-reorder \
-	--enable-strip \
-	--enable-strip-libs \
-	--enable-xft \
-	--enable-xinerama \
-	--with-system-jpeg \
-	--with-system-nspr \
-	--with-system-png \
-	--with-system-zlib \
-	--with-pthreads \
-	--enable-single-profile \
-	--disable-profilesharing
 
-%{__make}
+ac_add_options --disable-ldap
+ac_add_options --disable-installer
+ac_add_options --disable-jsd
+ac_add_options --disable-xprint
+ac_add_options --enable-canvas
+ac_add_options --enable-crypto
+ac_add_options --enable-default-toolkit="gtk2"
+ac_add_options --enable-extensions="pref,cookie,wallet%{?with_spellcheck:,spellcheck}"
+ac_add_options --enable-mathml
+ac_add_options --enable-optimize="%{rpmcflags}"
+ac_add_options --enable-pango
+ac_add_options --enable-reorder
+ac_add_options --enable-strip
+ac_add_options --enable-strip-libs
+ac_add_options --enable-system-cairo
+ac_add_options --enable-svg
+ac_add_options --enable-xft
+ac_add_options --enable-xinerama
+ac_add_options --with-system-jpeg
+ac_add_options --with-system-nspr
+ac_add_options --with-system-nss
+ac_add_options --with-system-png
+ac_add_options --with-system-zlib
+ac_add_options --with-pthreads
+ac_add_options --enable-single-profile
+ac_add_options --disable-profilesharing
+
+EOF
+
+
+%{__make} -f client.mk build_all \
+	CC="%{__cc}" \
+	CXX="%{__cxx}"
 
 %if %{with enigmail}
-   cd extensions/ipc
-   ./makemake -r
-   %{__make}
-   cd ../enigmail
+   cd mailnews/extensions/enigmail
    ./makemake -r
    %{__make}
 %endif
@@ -180,13 +193,13 @@
 	MOZILLA_BIN="\$(DIST)/bin/thunderbird-bin" \
 	EXCLUDE_NSPR_LIBS=1
 
-install %{SOURCE2} $RPM_BUILD_ROOT%{_bindir}/mozilla-thunderbird
+install %{SOURCE3} $RPM_BUILD_ROOT%{_bindir}/mozilla-thunderbird
 %{__sed} -i 's@%{_prefix}/lib/@%{_libdir}/@g' $RPM_BUILD_ROOT%{_bindir}/mozilla-thunderbird
 
-tar -xvz -C $RPM_BUILD_ROOT%{_libdir} -f dist/mozilla-thunderbird-*-linux-gnu.tar.gz
+tar -xvz -C $RPM_BUILD_ROOT%{_libdir} -f dist/mozilla-thunderbird-%{version}.en-US.linux-%{_target_cpu}.tar.gz
 
 install mail/app/default.xpm $RPM_BUILD_ROOT%{_pixmapsdir}/mozilla-thunderbird.xpm
-install %{SOURCE1} $RPM_BUILD_ROOT%{_desktopdir}/mozilla-thunderbird.desktop
+install %{SOURCE2} $RPM_BUILD_ROOT%{_desktopdir}/mozilla-thunderbird.desktop
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -206,7 +219,7 @@
 %{_thunderbirddir}/defaults
 %{_thunderbirddir}/greprefs
 %{_thunderbirddir}/icons
-%{_thunderbirddir}/plugins
+#%{_thunderbirddir}/plugins
 %attr(755,root,root) %{_thunderbirddir}/*.so
 %attr(755,root,root) %{_thunderbirddir}/*.sh
 %attr(755,root,root) %{_thunderbirddir}/*-bin
@@ -214,27 +227,30 @@
 %attr(755,root,root) %{_thunderbirddir}/reg*
 %attr(755,root,root) %{_thunderbirddir}/thunderbird
 %attr(755,root,root) %{_thunderbirddir}/thunderbird-config
-%attr(755,root,root) %{_thunderbirddir}/TestGtkEmbed
-%ifarch %{ix86}
-%attr(755,root,root) %{_thunderbirddir}/elf-dynstr-gc
-%endif
+#%attr(755,root,root) %{_thunderbirddir}/TestGtkEmbed
+#%ifarch %{ix86}
+#%attr(755,root,root) %{_thunderbirddir}/elf-dynstr-gc
+#%endif
 %{_thunderbirddir}/*.txt
 %{_thunderbirddir}/x*
 %dir %{_thunderbirddir}/chrome
+%{_thunderbirddir}/chrome/US.jar
 %{_thunderbirddir}/chrome/classic.jar
 %{_thunderbirddir}/chrome/comm.jar
 %{_thunderbirddir}/chrome/en-US.jar
-%{_thunderbirddir}/chrome/help.jar
+#%{_thunderbirddir}/chrome/help.jar
 %{_thunderbirddir}/chrome/icons
 %{_thunderbirddir}/chrome/messenger.jar
-%{_thunderbirddir}/chrome/modern.jar
+#%{_thunderbirddir}/chrome/modern.jar
 %{_thunderbirddir}/chrome/newsblog.jar
 %{_thunderbirddir}/chrome/offline.jar
-%{_thunderbirddir}/chrome/pipnss.jar
+#%{_thunderbirddir}/chrome/pipnss.jar
 %{_thunderbirddir}/chrome/pippki.jar
 %{_thunderbirddir}/chrome/toolkit.jar
 %{_thunderbirddir}/chrome/*.txt
-%{_thunderbirddir}/chrome/embed-sample.jar
+#%{_thunderbirddir}/chrome/embed-sample.jar
+# TODO: check if we really need these
+%{_thunderbirddir}/chrome/*.manifest
 %if %{with enigmail}
 %{_thunderbirddir}/chrome/enigmail-en-US.jar
 %{_thunderbirddir}/chrome/enigmail-skin-tbird.jar
@@ -244,6 +260,10 @@
 %endif
 %dir %{_thunderbirddir}/init.d
 %{_thunderbirddir}/init.d/README
+%{_thunderbirddir}/dependentlibs.list
+%{_thunderbirddir}/extensions
+%{_thunderbirddir}/updater
+%{_thunderbirddir}/updater.ini
 %{_pixmapsdir}/*
 %{_desktopdir}/*
 
@@ -260,6 +280,16 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.48  2006/01/19 14:25:57  adamg
+- updated to 1.5
+- updated enigmail to 0.94 (includes ipc)
+- -nopangoxft, -bug305970 and -bug304720 patches added
+- dropped -fontconfig.patch and ft218 bcond
+- switched to preferred build method (mozconfig and ac_add_options instead
+  of configure and its parameters)
+- %files revisited
+- works (apart from enigmail), release 0.1
+
 Revision 1.47  2006/01/19 09:45:57  adamg
 - do not bcond SourceX entries
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/mozilla-thunderbird.spec?r1=1.47&r2=1.48&f=u

More information about the pld-cvs-commit mailing list