rpms/evolution/F-12 evolution.spec,1.394.2.69,1.394.2.70

[Matthew Barnes]

Author: mbarnes

Update of /cvs/pkgs/rpms/evolution/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7475

Modified Files:
      Tag: private-mbarnes-kb
	evolution.spec 
Log Message:

* Tue Nov 17 2009 Matthew Barnes <mbarnes at redhat.com> - 2.28.99-1.kb.6.fc12
- Synchronize spec file with the official F-13 package.



Index: evolution.spec
===================================================================
RCS file: /cvs/pkgs/rpms/evolution/F-12/evolution.spec,v
retrieving revision 1.394.2.69
retrieving revision 1.394.2.70
diff -u -p -r1.394.2.69 -r1.394.2.70
--- evolution.spec	17 Nov 2009 00:36:22 -0000	1.394.2.69
+++ evolution.spec	17 Nov 2009 13:16:32 -0000	1.394.2.70
@@ -10,11 +10,10 @@
 %define gnome_icon_theme_version 2.19.91
 %define gnome_pilot_version 2.0.15
 %define gtk2_version 2.14.0
-%define gtkhtml_version 3.25.3
+%define gtkhtml_version 3.29.2
 %define intltool_version 0.35.5
 %define last_libgal2_version 2:2.5.3-2
 %define libgweather_version 2.25.4
-%define orbit2_version 2.9.8
 %define pilot_link_version 2:0.12.1
 %define scrollkeeper_version 0.1.4
 %define soup_version 2.2.2
@@ -25,6 +24,7 @@
 %define inline_audio_support 1
 %define ldap_support 1
 %define libnotify_support 1
+%define libpst_support 1
 %define krb5_support 1
 %define nntp_support 1
 %ifnarch s390 s390x
@@ -37,7 +37,6 @@
 %else
 %define build_conduits 1
 %endif
-%define use_mozilla_nss 1
 
 %define evo_plugin_dir %{_libdir}/evolution/%{evo_major}/plugins
 
@@ -45,7 +44,7 @@
 
 Name: evolution
 Version: 2.28.99
-Release: 1.kb.5%{?dist}
+Release: 1.kb.6%{?dist}
 Group: Applications/Productivity
 Summary: Mail and calendar client for GNOME
 License: GPLv2+ and GFDL
@@ -73,7 +72,10 @@ Patch13: evolution-kb-override-version.p
 
 ## Dependencies ###
 
+Requires(pre): GConf2
 Requires(post): GConf2
+Requires(preun): GConf2
+
 Requires(post): scrollkeeper >= %{scrollkeeper_version}
 Requires(postun): scrollkeeper >= %{scrollkeeper_version}
 
@@ -86,7 +88,6 @@ Requires: gnome-themes
 ### Build Dependencies ###
 
 BuildRequires: GConf2-devel
-BuildRequires: ORBit2-devel >= %{orbit2_version}
 BuildRequires: atk-devel
 BuildRequires: autoconf >= 2.59
 BuildRequires: automake >= 1.9
@@ -116,26 +117,20 @@ BuildRequires: libpst-devel
 BuildRequires: libsoup-devel >= %{soup_version}
 BuildRequires: libtool >= 1.5
 BuildRequires: libxml2-devel
-BuildRequires: pkgconfig
-BuildRequires: unique-devel
-
-%if %{use_mozilla_nss}
 BuildRequires: nspr-devel
 BuildRequires: nss-devel
-%else
-BuildRequires: openssl-devel
-%endif
+BuildRequires: pkgconfig
+BuildRequires: unique-devel
 
 %if %{inline_audio_support}
-# audio-inline plugin requires gstreamer to build:
 BuildRequires: gstreamer-devel
 %endif
 
-%if %{ldap_support} 
+%if %{ldap_support}
 BuildRequires: openldap-devel >= 2.0.11 
 %endif
 
-%if %{build_conduits} 
+%if %{build_conduits}
 BuildRequires: gnome-pilot-devel >= %{gnome_pilot_version}
 %endif
 
@@ -154,6 +149,11 @@ BuildRequires: NetworkManager-glib-devel
 BuildRequires: libnotify-devel
 %endif
 
+%if %{libpst_support}
+BuildRequires: libpst-devel
+BuildRequires: libytnef-devel
+%endif
+
 %description
 Evolution is the GNOME mailer, calendar, contact manager and
 communications tool.  The components which make up Evolution
@@ -222,6 +222,19 @@ Requires: %{name} = %{version}-%{release
 %description perl
 This package contains supplemental utilities for %{name} that require Perl.
 
+%if %{libpst_support}
+%package pst
+Group: Applications/Productivity
+Summary: PST importer plugin for Evolution
+Requires: %{name} = %{version}-%{release}
+Requires: libpst
+Requires: libytnef
+
+%description pst
+This package contains the plugin to import Microsoft Personal Storage Table
+(PST) files used by Microsoft Outlook and Microsoft Exchange.
+%endif
+
 %prep
 %setup -q -n %{name}-2.29.2-kill-bonobo-%{hash}
 %patch10 -p1 -b .ldaphack
@@ -264,18 +277,12 @@ done
 %define nntp_flags --disable-nntp
 %endif
 
-%if %{use_mozilla_nss}
 %define ssl_flags --enable-nss=yes --enable-smime=yes
-%else
-%define ssl_flags --enable-openssl=yes
-%endif
 
-%if %{use_mozilla_nss}
 if ! pkg-config --exists nss; then 
   echo "Unable to find suitable version of mozilla nss to use!"
   exit 1
 fi
-%endif
 
 %if %{exchange_support}
 %define exchange_flags --enable-exchange
@@ -285,12 +292,6 @@ fi
 
 CPPFLAGS="-I%{_includedir}/et"; export CPPFLAGS
 CFLAGS="$RPM_OPT_FLAGS -fPIC -DLDAP_DEPRECATED -I%{_includedir}/et -Wno-sign-compare"; export CFLAGS
-%if ! %{use_mozilla_nss}
-if pkg-config openssl ; then
-	CFLAGS="$CFLAGS `pkg-config --cflags openssl`"
-	LDFLAGS="$LDFLAGS `pkg-config --libs-only-L openssl`"
-fi
-%endif
 
 # Regenerate mail/Makefile.in (this is temporary).
 autoreconf --force
@@ -370,25 +371,64 @@ rm -f $RPM_BUILD_ROOT%{_datadir}/mime-in
 grep "/usr/share/locale" evolution-%{evo_major}.lang > translations.lang
 grep -v "/usr/share/locale" evolution-%{evo_major}.lang > help.lang
 
+%pre
+if [ "$1" -gt 1 ] ; then
+export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
+gconftool-2 --makefile-uninstall-rule %{_sysconfdir}/gconf/schemas/apps-evolution-mail-notification.schemas > /dev/null || :
+gconftool-2 --makefile-uninstall-rule %{_sysconfdir}/gconf/schemas/apps-evolution-mail-prompts-checkdefault.schemas > /dev/null || :
+gconftool-2 --makefile-uninstall-rule %{_sysconfdir}/gconf/schemas/apps_evolution_addressbook.schemas > /dev/null || :
+gconftool-2 --makefile-uninstall-rule %{_sysconfdir}/gconf/schemas/apps-evolution-attachment-reminder.schemas > /dev/null || :
+gconftool-2 --makefile-uninstall-rule %{_sysconfdir}/gconf/schemas/apps_evolution_calendar.schemas > /dev/null || :
+gconftool-2 --makefile-uninstall-rule %{_sysconfdir}/gconf/schemas/apps_evolution_shell.schemas > /dev/null || :
+gconftool-2 --makefile-uninstall-rule %{_sysconfdir}/gconf/schemas/apps-evolution-template-placeholders.schemas > /dev/null || :
+gconftool-2 --makefile-uninstall-rule %{_sysconfdir}/gconf/schemas/apps_evolution_email_custom_header.schemas > /dev/null || :
+gconftool-2 --makefile-uninstall-rule %{_sysconfdir}/gconf/schemas/evolution-mail.schemas > /dev/null || :
+fi
+
+%pre bogofilter
+export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
+gconftool-2 --makefile-uninstall-rule %{_sysconfdir}/gconf/schemas/bogo-junk-plugin.schemas > /dev/null || :
+
 %post
 /sbin/ldconfig
 scrollkeeper-update -q
 touch --no-create %{_datadir}/icons/hicolor || :
 %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
+
 export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
-gconftool-2 --makefile-install-rule %{_sysconfdir}/gconf/schemas/apps-evolution-mail-notification.schemas > /dev/null
-gconftool-2 --makefile-install-rule %{_sysconfdir}/gconf/schemas/apps-evolution-mail-prompts-checkdefault.schemas > /dev/null
-gconftool-2 --makefile-install-rule %{_sysconfdir}/gconf/schemas/apps_evolution_addressbook.schemas > /dev/null
-gconftool-2 --makefile-install-rule %{_sysconfdir}/gconf/schemas/apps-evolution-attachment-reminder.schemas > /dev/null
-gconftool-2 --makefile-install-rule %{_sysconfdir}/gconf/schemas/apps_evolution_calendar.schemas > /dev/null
-gconftool-2 --makefile-install-rule %{_sysconfdir}/gconf/schemas/apps_evolution_shell.schemas > /dev/null
-gconftool-2 --makefile-install-rule %{_sysconfdir}/gconf/schemas/apps-evolution-template-placeholders.schemas > /dev/null
-gconftool-2 --makefile-install-rule %{_sysconfdir}/gconf/schemas/apps_evolution_email_custom_header.schemas > /dev/null
-gconftool-2 --makefile-install-rule %{_sysconfdir}/gconf/schemas/evolution-mail.schemas > /dev/null
+gconftool-2 --makefile-install-rule %{_sysconfdir}/gconf/schemas/apps-evolution-mail-notification.schemas > /dev/null || :
+gconftool-2 --makefile-install-rule %{_sysconfdir}/gconf/schemas/apps-evolution-mail-prompts-checkdefault.schemas > /dev/null || :
+gconftool-2 --makefile-install-rule %{_sysconfdir}/gconf/schemas/apps_evolution_addressbook.schemas > /dev/null || :
+gconftool-2 --makefile-install-rule %{_sysconfdir}/gconf/schemas/apps-evolution-attachment-reminder.schemas > /dev/null || :
+gconftool-2 --makefile-install-rule %{_sysconfdir}/gconf/schemas/apps_evolution_calendar.schemas > /dev/null || :
+gconftool-2 --makefile-install-rule %{_sysconfdir}/gconf/schemas/apps_evolution_shell.schemas > /dev/null || :
+gconftool-2 --makefile-install-rule %{_sysconfdir}/gconf/schemas/apps-evolution-template-placeholders.schemas > /dev/null || :
+gconftool-2 --makefile-install-rule %{_sysconfdir}/gconf/schemas/apps_evolution_email_custom_header.schemas > /dev/null || :
+gconftool-2 --makefile-install-rule %{_sysconfdir}/gconf/schemas/evolution-mail.schemas > /dev/null || :
 
 %post bogofilter
 export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
-gconftool-2 --makefile-install-rule %{_sysconfdir}/gconf/schemas/bogo-junk-plugin.schemas > /dev/null
+gconftool-2 --makefile-install-rule %{_sysconfdir}/gconf/schemas/bogo-junk-plugin.schemas > /dev/null || :
+
+%preun
+if [ "$1" -eq 0 ] ; then
+export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
+gconftool-2 --makefile-uninstall-rule %{_sysconfdir}/gconf/schemas/apps-evolution-mail-notification.schemas > /dev/null || :
+gconftool-2 --makefile-uninstall-rule %{_sysconfdir}/gconf/schemas/apps-evolution-mail-prompts-checkdefault.schemas > /dev/null || :
+gconftool-2 --makefile-uninstall-rule %{_sysconfdir}/gconf/schemas/apps_evolution_addressbook.schemas > /dev/null || :
+gconftool-2 --makefile-uninstall-rule %{_sysconfdir}/gconf/schemas/apps-evolution-attachment-reminder.schemas > /dev/null || :
+gconftool-2 --makefile-uninstall-rule %{_sysconfdir}/gconf/schemas/apps_evolution_calendar.schemas > /dev/null || :
+gconftool-2 --makefile-uninstall-rule %{_sysconfdir}/gconf/schemas/apps_evolution_shell.schemas > /dev/null || :
+gconftool-2 --makefile-uninstall-rule %{_sysconfdir}/gconf/schemas/apps-evolution-template-placeholders.schemas > /dev/null || :
+gconftool-2 --makefile-uninstall-rule %{_sysconfdir}/gconf/schemas/apps_evolution_email_custom_header.schemas > /dev/null || :
+gconftool-2 --makefile-uninstall-rule %{_sysconfdir}/gconf/schemas/evolution-mail.schemas > /dev/null || :
+fi
+
+%preun bogofilter
+if [ "$1" -eq 0 ] ; then
+export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
+gconftool-2 --makefile-uninstall-rule %{_sysconfdir}/gconf/schemas/bogo-junk-plugin.schemas > /dev/null || :
+fi
 
 %postun
 /sbin/ldconfig
@@ -445,7 +485,6 @@ rm -rf $RPM_BUILD_ROOT
 # Shared libraries:
 %{_libdir}/evolution/%{evo_major}/libcomposer.so.*
 %{_libdir}/evolution/%{evo_major}/libeabutil.so.*
-%{_libdir}/evolution/%{evo_major}/libeconduit.so.*
 %{_libdir}/evolution/%{evo_major}/libecontacteditor.so.*
 %{_libdir}/evolution/%{evo_major}/libecontactlisteditor.so.*
 %{_libdir}/evolution/%{evo_major}/libemformat.so.*
@@ -457,15 +496,12 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/evolution/%{evo_major}/libetimezonedialog.so.*
 %{_libdir}/evolution/%{evo_major}/libeutil.so.*
 %{_libdir}/evolution/%{evo_major}/libevolution-a11y.so.*
-#%{_libdir}/evolution/%{evo_major}/libevolution-addressbook-a11y.so.*
 %{_libdir}/evolution/%{evo_major}/libevolution-addressbook-importers.so.*
 %{_libdir}/evolution/%{evo_major}/libevolution-calendar.so.*
-#%{_libdir}/evolution/%{evo_major}/libevolution-calendar-a11y.so.*
 %{_libdir}/evolution/%{evo_major}/libevolution-calendar-importers.so.*
 %{_libdir}/evolution/%{evo_major}/libevolution-mail-importers.so.*
 %{_libdir}/evolution/%{evo_major}/libevolution-mail.so.*
 %{_libdir}/evolution/%{evo_major}/libevolution-smime.so.*
-#%{_libdir}/evolution/%{evo_major}/libevolution-widgets-a11y.so.*
 %{_libdir}/evolution/%{evo_major}/libfilter.so.*
 %{_libdir}/evolution/%{evo_major}/libmenus.so.*
 
@@ -528,19 +564,10 @@ rm -rf $RPM_BUILD_ROOT
 %{evo_plugin_dir}/org-gnome-evolution-startup-wizard.eplug
 %{evo_plugin_dir}/liborg-gnome-evolution-startup-wizard.so
 
-#%{evo_plugin_dir}/org-gnome-exchange-ab-subscription.xml
-#%{evo_plugin_dir}/org-gnome-exchange-cal-subscription.xml
-#%{evo_plugin_dir}/org-gnome-exchange-tasks-subscription.xml
-#%{evo_plugin_dir}/org-gnome-folder-permissions.xml
-#%{evo_plugin_dir}/org-gnome-folder-subscription.xml
-
 %{evo_plugin_dir}/org-gnome-groupwise-features.eplug
 %{evo_plugin_dir}/liborg-gnome-groupwise-features.so
 %{evo_plugin_dir}/org-gnome-compose-send-options.xml
 
-#%{evo_plugin_dir}/org-gnome-gw-account-setup.eplug
-#%{evo_plugin_dir}/liborg-gnome-gw-account-setup.so
-
 %{evo_plugin_dir}/org-gnome-imap-features.eplug
 %{evo_plugin_dir}/liborg-gnome-imap-features.so
 
@@ -565,9 +592,6 @@ rm -rf $RPM_BUILD_ROOT
 %{evo_plugin_dir}/org-gnome-prefer-plain.eplug
 %{evo_plugin_dir}/liborg-gnome-prefer-plain.so
 
-%{evo_plugin_dir}/org-gnome-pst-import.eplug
-%{evo_plugin_dir}/liborg-gnome-pst-import.so
-
 %{evo_plugin_dir}/org-gnome-publish-calendar.eplug
 %{evo_plugin_dir}/liborg-gnome-publish-calendar.so
 
@@ -596,7 +620,6 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/pkgconfig/evolution-plugin.pc
 %{_libdir}/pkgconfig/evolution-shell.pc
 %{_libdir}/evolution/%{evo_major}/libcomposer.so
-#%{_libdir}/evolution/%{evo_major}/libefilterbar.so
 %{_libdir}/evolution/%{evo_major}/libeabutil.so
 %{_libdir}/evolution/%{evo_major}/libeconduit.so
 %{_libdir}/evolution/%{evo_major}/libecontacteditor.so
@@ -610,15 +633,12 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/evolution/%{evo_major}/libetimezonedialog.so
 %{_libdir}/evolution/%{evo_major}/libeutil.so
 %{_libdir}/evolution/%{evo_major}/libevolution-a11y.so
-#%{_libdir}/evolution/%{evo_major}/libevolution-addressbook-a11y.so
 %{_libdir}/evolution/%{evo_major}/libevolution-addressbook-importers.so
 %{_libdir}/evolution/%{evo_major}/libevolution-calendar.so
-#%{_libdir}/evolution/%{evo_major}/libevolution-calendar-a11y.so
 %{_libdir}/evolution/%{evo_major}/libevolution-calendar-importers.so
 %{_libdir}/evolution/%{evo_major}/libevolution-mail-importers.so
 %{_libdir}/evolution/%{evo_major}/libevolution-mail.so
 %{_libdir}/evolution/%{evo_major}/libevolution-smime.so
-#%{_libdir}/evolution/%{evo_major}/libevolution-widgets-a11y.so
 %{_libdir}/evolution/%{evo_major}/libfilter.so
 %{_libdir}/evolution/%{evo_major}/libmenus.so
 
@@ -630,6 +650,7 @@ rm -rf $RPM_BUILD_ROOT
 %files conduits
 %defattr(-, root, root)
 %dir %{_libdir}/evolution/%{evo_major}/conduits
+%{_libdir}/evolution/%{evo_major}/libeconduit.so.*
 %{_libdir}/evolution/%{evo_major}/conduits/libeaddress_conduit.so
 %{_libdir}/evolution/%{evo_major}/conduits/libecalendar_common_conduit.so
 %{_libdir}/evolution/%{evo_major}/conduits/libecalendar_conduit.so
@@ -657,7 +678,17 @@ rm -rf $RPM_BUILD_ROOT
 %{_libexecdir}/evolution/%{evo_major}/csv2vcard
 %{_libexecdir}/evolution/%{evo_major}/evolution-addressbook-clean
 
+%if %{libpst_support}
+%files pst
+%defattr(-, root, root)
+%{evo_plugin_dir}/org-gnome-pst-import.eplug
+%{evo_plugin_dir}/liborg-gnome-pst-import.so
+%endif
+
 %changelog
+* Tue Nov 17 2009 Matthew Barnes <mbarnes at redhat.com> - 2.28.99-1.kb.6.fc12
+- Synchronize spec file with the official F-13 package.
+
 * Mon Nov 16 2009 Matthew Barnes <mbarnes at redhat.com> - 2.28.99-1.kb.5.fc12
 - Snapshot of "kill-bonobo" progress at commit 2d59066.