packages: icedove/icedove.spec - remove duplicate/opposite configure option...

[glen]

Author: glen                         Date: Tue Mar 23 20:12:20 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- remove duplicate/opposite configure options, sync options order with iceweasel

---- Files affected:
packages/icedove:
   icedove.spec (1.64 -> 1.65) 

---- Diffs:

================================================================
Index: packages/icedove/icedove.spec
diff -u packages/icedove/icedove.spec:1.64 packages/icedove/icedove.spec:1.65
--- packages/icedove/icedove.spec:1.64	Tue Mar  2 12:04:47 2010
+++ packages/icedove/icedove.spec	Tue Mar 23 21:12:15 2010
@@ -10,11 +10,13 @@
 %bcond_without	gnome		# disable all GNOME components (gnome+gnomeui+gnomevfs)
 %bcond_without	ldap		# disable e-mail address lookups in LDAP directories
 %bcond_without  lightning	# disable sunbird calendar
-#
+%bcond_with		xulrunner	# build with system xulrunner
+
 %if %{without gnome}
 %undefine	with_gnomeui
 %undefine	with_gnomevfs
 %endif
+
 %define		enigmail_ver		1.0.1
 
 Summary:	Icedove - email client
@@ -193,6 +195,8 @@
 ac_add_options --disable-logging
 ac_add_options --enable-optimize="%{rpmcflags} -Os"
 %endif
+ac_add_options --disable-strip
+ac_add_options --disable-strip-libs
 %if %{with tests}
 ac_add_options --enable-tests
 %else
@@ -214,11 +218,8 @@
 ac_add_options --disable-ldap
 %endif
 ac_add_options --disable-crashreporter
-ac_add_options --disable-updater
 ac_add_options --disable-xterm-updates
-ac_add_options --enable-ldap
 ac_add_options --enable-postscript
-ac_add_options --enable-startup-notification
 %if %{with lightning}
 ac_add_options --enable-calendar
 %else
@@ -226,36 +227,38 @@
 %endif
 ac_add_options --disable-installer
 ac_add_options --disable-jsd
+ac_add_options --disable-updater
 ac_add_options --disable-xprint
 ac_add_options --disable-permissions
 ac_add_options --disable-pref-extensions
 ac_add_options --enable-canvas
 ac_add_options --enable-crypto
-ac_add_options --enable-default-toolkit="gtk2"
 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-static
-ac_add_options --disable-strip
-ac_add_options --disable-strip-libs
+ac_add_options --enable-startup-notification
+ac_add_options --enable-svg
 ac_add_options --enable-system-cairo
 ac_add_options --enable-system-hunspell
-ac_add_options --enable-svg
 ac_add_options --enable-xft
 ac_add_options --enable-application=mail
 ac_add_options --enable-default-toolkit=cairo-gtk2
 ac_add_options --enable-xinerama
+ac_add_options --with-distribution-id=org.pld-linux
+ac_add_options --with-branding=icedove/branding
+%if %{with xulrunner}
+ac_add_options --with-libxul-sdk=%{_libdir}/xulrunner-sdk
+%endif
+ac_add_options --with-pthreads
+ac_add_options --with-system-bz2
 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
-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
 
@@ -411,6 +414,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.65  2010/03/23 20:12:15  glen
+- remove duplicate/opposite configure options, sync options order with iceweasel
+
 Revision 1.64  2010/03/02 11:04:47  duddits
 - up to 3.0.3
 - fixed in previous release (3.0.2): CVE-2009-1571, CVE-2010-0159
================================================================

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