packages: icedove/icedove.spec - patch8 is back (updated) - added --with-di...

[paszczus]

Author: paszczus                     Date: Thu Dec 17 11:55:42 2009 GMT
Module: packages                      Tag: HEAD
---- Log message:
- patch8 is back (updated)
- added --with-distribution-id=org.pld-linux
- enabled calendar by default
- switched to firefox-like build

---- Files affected:
packages/icedove:
   icedove.spec (1.33 -> 1.34) 

---- Diffs:

================================================================
Index: packages/icedove/icedove.spec
diff -u packages/icedove/icedove.spec:1.33 packages/icedove/icedove.spec:1.34
--- packages/icedove/icedove.spec:1.33	Thu Dec 17 10:03:34 2009
+++ packages/icedove/icedove.spec	Thu Dec 17 12:55:37 2009
@@ -134,7 +134,7 @@
 #%patch5 -p1
 #%patch6 -p1
 #%patch7 -p1
-#%patch8 -p1
+%patch8 -p1
 #%patch9 -p1
 
 ##:> config/gcc_hidden.h
@@ -151,6 +151,8 @@
 cat << 'EOF' > .mozconfig
 #. $topsrcdir/mail/config/mozconfig
 
+mk_add_options MOZ_OBJDIR=@TOPSRCDIR@/obj-%{_target_cpu}
+
 ac_add_options --prefix=%{_prefix}
 ac_add_options --exec-prefix=%{_exec_prefix}
 ac_add_options --bindir=%{_bindir}
@@ -191,6 +193,7 @@
 %else
 ac_add_options --disable-ldap
 %endif
+ac_add_options --enable-calendar
 ac_add_options --disable-installer
 ac_add_options --disable-jsd
 ac_add_options --disable-xprint
@@ -220,11 +223,12 @@
 ac_add_options --with-pthreads
 ac_add_options --enable-single-profile
 ac_add_options --disable-profilesharing
+ac_add_options --with-distribution-id=org.pld-linux
 #ac_add_options --with-branding=icedove/branding
 ac_add_options --with-default-mozilla-five-home=%{_libdir}/%{name}
 EOF
 
-%{__make} -j1 -f client.mk build_all \
+%{__make} -j1 -f client.mk build \
 	CC="%{__cc}" \
 	CXX="%{__cxx}"
 
@@ -240,7 +244,7 @@
 	$RPM_BUILD_ROOT%{_datadir}/%{name}
 
 cd comm-1.9.1
-%{__make} -C mozilla/xpinstall/packager stage-package \
+%{__make} -C obj-%{_target_cpu}/mail/installer stage-package \
 	DESTDIR=$RPM_BUILD_ROOT \
 	MOZ_PKG_APPDIR=%{_libdir}/%{name} \
 	PKG_SKIP_STRIP=1
@@ -371,6 +375,12 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.34  2009/12/17 11:55:37  paszczus
+- patch8 is back (updated)
+- added --with-distribution-id=org.pld-linux
+- enabled calendar by default
+- switched to firefox-like build
+
 Revision 1.33  2009/12/17 09:03:34  paszczus
 - commented out branding for now (need update); %build done
 - %install fails
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/icedove/icedove.spec?r1=1.33&r2=1.34&f=u