rpms/evolution/devel evolution.spec, 1.319, 1.320 evolution-2.7.1-notification-cleanups.patch, 1.2, NONE evolution-2.9.3-source-path-entry.patch, 1.1, NONE

[Matthew Barnes (mbarnes)]

Author: mbarnes

Update of /cvs/pkgs/rpms/evolution/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2054

Modified Files:
	evolution.spec 
Removed Files:
	evolution-2.7.1-notification-cleanups.patch 
	evolution-2.9.3-source-path-entry.patch 
Log Message:

* Sat Feb 02 2008 Matthew Barnes <mbarnes at redhat.com> - 2.21.90-4.fc9
- Remove some obsolete configure options:
  --enable-file-chooser, --enable-file-locking, --enable-dot-locking
- Remove gnome-doc-utils work-around for GNOME bug #427939 (fixed upstream).
- Remove patch for RH bug #215478 (fixed upstream).



Index: evolution.spec
===================================================================
RCS file: /cvs/pkgs/rpms/evolution/devel/evolution.spec,v
retrieving revision 1.319
retrieving revision 1.320
diff -u -r1.319 -r1.320
--- evolution.spec	29 Jan 2008 15:41:07 -0000	1.319
+++ evolution.spec	2 Feb 2008 23:23:51 -0000	1.320
@@ -46,7 +46,7 @@
 
 Name: evolution
 Version: 2.21.90
-Release: 3%{?dist}
+Release: 4%{?dist}
 License: GPLv2 and GFDL+
 Group: Applications/Productivity
 Summary: GNOME's next-generation groupware suite
@@ -78,19 +78,14 @@
 # We do not ship gnome-common (or at least we're not supposed to).
 Patch14: evolution-2.7.1-no-gnome-common.patch
 
-#Patch15: evolution-2.7.1-notification-cleanups.patch
-
 # RH bug #176400
-Patch17: evolution-2.9.1-im-context-reset.patch
-
-# RH bug #215478 / GNOME bug #383842
-Patch18: evolution-2.9.3-source-path-entry.patch
+Patch15: evolution-2.9.1-im-context-reset.patch
 
 # GNOME bug #240073
-Patch19: evolution-2.21.90-click-to-add.patch
+Patch16: evolution-2.21.90-click-to-add.patch
 
 # Deal with recent G_GNUC_FUNCTION deprecation
-Patch20: evolution-2.21.90-no-gnuc-function.patch
+Patch17: evolution-2.21.90-no-gnuc-function.patch
 
 ## Dependencies ###
 
@@ -233,11 +228,9 @@
 #patch12 -p1 -b .fix-conduits  # leave commented
 %patch13 -p1 -b .fix-conduit-dir
 %patch14 -p1 -b .no-gnome-common
-#patch15 -p1 -b .notification-cleanups
-%patch17 -p1 -b .im-context-reset
-%patch18 -p1 -b .source-path-entry
-%patch19 -p1 -b .click-to-add
-%patch20 -p1 -b .no-gnuc-function
+%patch15 -p1 -b .im-context-reset
+%patch16 -p1 -b .click-to-add
+%patch17 -p1 -b .no-gnuc-function
 
 mkdir -p krb5-fakeprefix/include
 mkdir -p krb5-fakeprefix/lib
@@ -321,18 +314,11 @@
 # TODO: Make -DCAMEL_DISABLE_DEPRECATED work.
 %endif
 
-# Temporary work-around for a bad gnome-doc-utils.make.
-# See GNOME bug #427939.  Should be fixed in evolution-2.10.2.
-sed -i -e 's/@ENABLE_SK_TRUE at _s/_s/' help/Makefile.in
-
 %configure \
-  --disable-scrollkeeper \
   --enable-gtk-doc \
   --enable-ipv6 \
-  --enable-file-locking=fcntl --enable-dot-locking=no \
   --with-sub-version=" (%{version}-%{release})" \
   --with-kde-applnk-path=no \
-  --enable-file-chooser=yes \
   %ldap_flags %pilot_flags %krb5_flags %nntp_flags %ssl_flags %exchange_flags \
   --enable-plugins=all
 export tagname=CC
@@ -672,6 +658,12 @@
 %{evo_plugin_dir}/liborg-gnome-sa-junk-plugin.so
 
 %changelog
+* Sat Feb 02 2008 Matthew Barnes <mbarnes at redhat.com> - 2.21.90-4.fc9
+- Remove some obsolete configure options:
+  --enable-file-chooser, --enable-file-locking, --enable-dot-locking
+- Remove gnome-doc-utils work-around for GNOME bug #427939 (fixed upstream).
+- Remove patch for RH bug #215478 (fixed upstream).
+
 * Tue Jan 29 2008 Matthew Barnes <mbarnes at redhat.com> - 2.21.90-3.fc9
 - Add patch to address the recent deprecation of G_GNUC_FUNCTION.
 


--- evolution-2.7.1-notification-cleanups.patch DELETED ---


--- evolution-2.9.3-source-path-entry.patch DELETED ---