rpms/evolution/devel evolution-2.10.1-fix-gnome-doc-utils.patch, NONE, 1.1 evolution.spec, 1.242, 1.243

[fedora-cvs-commits at redhat.com]

Author: mbarnes

Update of /cvs/dist/rpms/evolution/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv9897

Modified Files:
	evolution.spec 
Added Files:
	evolution-2.10.1-fix-gnome-doc-utils.patch 
Log Message:

* Mon Apr 09 2007 Matthew Barnes <mbarnes at redhat.com> - 2.10.1-1.fc7
- Update to 2.10.1
- Fix buggy gnome-doc-utils.make (GNOME bug #427939).
- Remove patch for CVE-2007-1002 (fixed upstream).
- Remove patch for RH bug #231767 (fixed upstream).
- Remove patch for RH bug #235056 (fixed upstream).
- Remove patch for GNOME bug #352713 (fixed upstream).


evolution-2.10.1-fix-gnome-doc-utils.patch:
 gnome-doc-utils.make |    2 --
 1 files changed, 2 deletions(-)

--- NEW FILE evolution-2.10.1-fix-gnome-doc-utils.patch ---
--- evolution-2.10.1/gnome-doc-utils.make.fix-gnome-doc-utils	2007-04-09 21:16:29.000000000 -0400
+++ evolution-2.10.1/gnome-doc-utils.make	2007-04-09 21:16:42.000000000 -0400
@@ -130,11 +130,9 @@
 _credits ?= `$(PKG_CONFIG) --variable xmldir gnome-doc-utils`/gnome/xslt/docbook/utils/credits.xsl
 _ids ?= `$(PKG_CONFIG) --variable xmldir gnome-doc-utils`/gnome/xslt/docbook/utils/ids.xsl
 
-if ENABLE_SK
 _skpkgdatadir ?= `scrollkeeper-config --pkgdatadir`
 _sklocalstatedir ?= `scrollkeeper-config --pkglocalstatedir`
 _skcontentslist ?= $(_skpkgdatadir)/Templates/C/scrollkeeper_cl.xml
-endif
 
 
 ################################################################################


Index: evolution.spec
===================================================================
RCS file: /cvs/dist/rpms/evolution/devel/evolution.spec,v
retrieving revision 1.242
retrieving revision 1.243
diff -u -r1.242 -r1.243
--- evolution.spec	9 Apr 2007 18:09:26 -0000	1.242
+++ evolution.spec	10 Apr 2007 03:16:52 -0000	1.243
@@ -158,6 +158,9 @@
 # GNOME bug #418971
 Patch47: evolution-2.10.0-drop-old-glib-support.patch
 
+# GNOME bug #427939 (gnome-doc-utils)
+Patch48: evolution-2.10.1-fix-gnome-doc-utils.patch
+
 ## Dependencies ###
 
 Requires(post): GConf2
@@ -310,6 +313,7 @@
 %patch45 -p1 -b .shell-main-cleanups
 %patch46 -p1 -b .use-glib-i18n
 %patch47 -p1 -b .drop-old-glib-support
+%patch48 -p1 -b .fix-gnome-doc-utils
 
 mkdir -p krb5-fakeprefix/include
 mkdir -p krb5-fakeprefix/lib
@@ -728,6 +732,7 @@
 %changelog
 * Mon Apr 09 2007 Matthew Barnes <mbarnes at redhat.com> - 2.10.1-1.fc7
 - Update to 2.10.1
+- Fix buggy gnome-doc-utils.make (GNOME bug #427939).
 - Remove patch for CVE-2007-1002 (fixed upstream).
 - Remove patch for RH bug #231767 (fixed upstream).
 - Remove patch for RH bug #235056 (fixed upstream).