SPECS: mozilla-thunderbird.spec - merged glen's changes from AC-br...

Mon Nov 20 14:03:13 CET 2006

Author: qboosh                       Date: Mon Nov 20 13:03:13 2006 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- merged glen's changes from AC-branch

---- Files affected:
SPECS:
   mozilla-thunderbird.spec (1.72 -> 1.73) 

---- Diffs:

================================================================
Index: SPECS/mozilla-thunderbird.spec
diff -u SPECS/mozilla-thunderbird.spec:1.72 SPECS/mozilla-thunderbird.spec:1.73

--- SPECS/mozilla-thunderbird.spec:1.72	Wed Nov 15 13:10:25 2006
+++ SPECS/mozilla-thunderbird.spec	Mon Nov 20 14:03:07 2006
@@ -1,7 +1,9 @@
 # $Revision$, $Date$
 # TODO:
-#   - use own builddir (%%setup -qc && cd mozilla)
-#   - CHECK all features of enigmail
+# - use own builddir (%%setup -qc && cd mozilla)
+# - CHECK all features of enigmail
+# - separate pkg for enigmail
+# - merge changes from mozilla-firefox at DEVEL
 #
 # Conditional builds
 %bcond_without	enigmail    # don't build enigmail - GPG/PGP support
@@ -105,8 +107,8 @@
 cp -f %{_datadir}/automake/config.* nsprpub/build/autoconf
 cp -f %{_datadir}/automake/config.* directory/c-sdk/config/autoconf
 
-cat << EOF > .mozconfig
-. \$topsrcdir/mail/config/mozconfig
+cat << 'EOF' > .mozconfig
+. $topsrcdir/mail/config/mozconfig
 
 export BUILD_OFFICIAL=1
 export MOZILLA_OFFICIAL=1
@@ -174,29 +176,29 @@
 
 EOF
 
-
 %{__make} -j1 -f client.mk build_all \
 	CC="%{__cc}" \
 	CXX="%{__cxx}"
 
 %if %{with enigmail}
-   cd mailnews/extensions/enigmail
-   ./makemake -r
-   %{__make}
+	cd mailnews/extensions/enigmail
+	./makemake -r
+	%{__make}
 %endif
 
 %install
 rm -rf $RPM_BUILD_ROOT
 install -d $RPM_BUILD_ROOT{%{_bindir},%{_libdir},%{_pixmapsdir},%{_desktopdir}}
 
-%{__make} -C xpinstall/packager \
-	MOZ_PKG_APPNAME="mozilla-thunderbird" \
-	MOZILLA_BIN="\$(DIST)/bin/thunderbird-bin" \
-	EXCLUDE_NSPR_LIBS=1
+%{__make} -C xpinstall/packager stage-package \
+	MOZ_PKG_APPNAME=%{name} \
+	SIGN_NSS= \
+	PKG_SKIP_STRIP=1
 
-%{__sed} -e 's, at LIBDIR@,%{_libdir},' %{SOURCE3} > $RPM_BUILD_ROOT%{_bindir}/mozilla-thunderbird
+cp -a dist/%{name} $RPM_BUILD_ROOT%{_libdir}
 
-tar -xvz -C $RPM_BUILD_ROOT%{_libdir} -f dist/mozilla-thunderbird-*.tar.gz
+%{__sed} -e 's, at LIBDIR@,%{_libdir},' %{SOURCE3} > $RPM_BUILD_ROOT%{_bindir}/mozilla-thunderbird
+ln -s %{name} $RPM_BUILD_ROOT%{_bindir}/thunderbird
 
 install %{SOURCE2} $RPM_BUILD_ROOT%{_desktopdir}/mozilla-thunderbird.desktop
 
@@ -213,16 +215,21 @@
 mv -f $RPM_BUILD_ROOT%{_thunderbirddir}/defaults/preferences/enigmail.js $_enig_dir/defaults/preferences
 cp -f mailnews/extensions/enigmail/package/install.rdf $_enig_dir
 rm -rf $RPM_BUILD_ROOT%{_thunderbirddir}/defaults/preferences
-rm -rf $RPM_BUILD_ROOT%{_thunderbirddir}/chrome/enigmail-en-US.jar
-rm -rf $RPM_BUILD_ROOT%{_thunderbirddir}/chrome/enigmail-skin.jar
-rm -rf $RPM_BUILD_ROOT%{_thunderbirddir}/chrome/enigmime.jar
+rm -f $RPM_BUILD_ROOT%{_thunderbirddir}/chrome/enigmail-en-US.jar
+rm -f $RPM_BUILD_ROOT%{_thunderbirddir}/chrome/enigmail-skin.jar
+rm -f $RPM_BUILD_ROOT%{_thunderbirddir}/chrome/enigmime.jar
 rm -rf $RPM_BUILD_ROOT%{_thunderbirddir}/components/enig*
-rm -rf $RPM_BUILD_ROOT%{_thunderbirddir}/components/libenigmime.so
-rm -rf $RPM_BUILD_ROOT%{_thunderbirddir}/components/ipc.xpt
+rm -f $RPM_BUILD_ROOT%{_thunderbirddir}/components/libenigmime.so
+rm -f $RPM_BUILD_ROOT%{_thunderbirddir}/components/ipc.xpt
 cp -f %{SOURCE4} $_enig_dir/chrome.manifest
 cp -f %{SOURCE5} $RPM_BUILD_ROOT%{_pixmapsdir}/mozilla-thunderbird.png
 %endif
 
+install -d $RPM_BUILD_ROOT%{_thunderbirddir}/updates
+
+# win32 stuff
+rm -f $RPM_BUILD_ROOT%{_thunderbirddir}/dirver
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -251,7 +258,7 @@
 %attr(755,root,root) %{_thunderbirddir}/reg*
 %attr(755,root,root) %{_thunderbirddir}/thunderbird
 %{_thunderbirddir}/*.txt
-%{_thunderbirddir}/x*
+%attr(755,root,root) %{_thunderbirddir}/x*
 %{_thunderbirddir}/chrome/US.jar
 %{_thunderbirddir}/chrome/classic.jar
 %{_thunderbirddir}/chrome/comm.jar
@@ -270,6 +277,7 @@
 %if %{with enigmail}
 %{_thunderbirddir}/extensions/{847b3a00-7ab1-11d4-8f02-006008948af5}
 %endif
+%dir %{_thunderbirddir}/updates
 %{_thunderbirddir}/updater
 %{_thunderbirddir}/updater.ini
 %{_pixmapsdir}/*
@@ -288,6 +296,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.73  2006/11/20 13:03:07  qboosh
+- merged glen's changes from AC-branch
+
 Revision 1.72  2006/11/15 12:10:25  qboosh
 - todo: own builddir, like firefox
 
@@ -298,6 +309,15 @@
 Revision 1.70  2006/11/07 22:29:01  glen
 - do not list %{_desktopdir}/* -- dangerous, could list directories unexpectedly
 
+Revision 1.61.2.9  2006/11/02 16:51:22  glen
+- update install procedure from mozilla-firefox.spec which avoids creating temporary tgz
+
+Revision 1.61.2.8  2006/11/01 16:01:18  glen
+- typo, cleanup files
+
+Revision 1.61.2.7  2006/11/01 14:11:59  glen
+- fix some permissions, add some dirs, cleanups
+
 Revision 1.69  2006/09/16 09:47:44  qboosh
 - updated to 1.5.0.7
   (fixes CVE-2006-4253 CVE-2006-4340 CVE-2006-4565 CVE-2006-4566 CVE-2006-4567
@@ -320,8 +340,8 @@
 - rel 2
 
 Revision 1.64  2006/07/08 16:59:57  aflinta
- - added gcc patch
- - disabled smp build (otherwise it will fail)
+- added gcc patch
+- disabled smp build (otherwise it will fail)
 
 Revision 1.63  2006/06/09 08:03:16  qboosh
 - real xorg deps
@@ -337,7 +357,7 @@
 - tons of warnings burn my eyes. mozilla sources are evil.
 
 Revision 1.59  2006/04/30 20:36:57  mguevara
-1.5.0.2 rel 3 - ldap works fine - bcond enables it by default
+- 1.5.0.2 rel 3 - ldap works fine - bcond enables it by default
 
 Revision 1.58  2006/04/30 10:38:42  mguevara
 - 1.5.0.2-2.1 - added ldap bcond
================================================================

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

