rpms/evolution/devel evolution-1.4.4-ldap-x86_64-hack.patch, 1.1, 1.2 evolution-2.5.4-fix-conduit-dir.patch, 1.3, 1.4 evolution.spec, 1.345, 1.346

[Tom Callaway (spot)]

Author: spot

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

Modified Files:
	evolution-1.4.4-ldap-x86_64-hack.patch 
	evolution-2.5.4-fix-conduit-dir.patch evolution.spec 
Log Message:
fix license tag

evolution-1.4.4-ldap-x86_64-hack.patch:

Index: evolution-1.4.4-ldap-x86_64-hack.patch
===================================================================
RCS file: /cvs/pkgs/rpms/evolution/devel/evolution-1.4.4-ldap-x86_64-hack.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- evolution-1.4.4-ldap-x86_64-hack.patch	9 Sep 2004 04:39:04 -0000	1.1
+++ evolution-1.4.4-ldap-x86_64-hack.patch	18 Jul 2008 13:16:37 -0000	1.2
@@ -1,11 +1,12 @@
---- evolution-1.4.4/configure.ldaphack	2003-08-05 02:06:26.000000000 -0400
-+++ evolution-1.4.4/configure	2003-08-05 02:06:45.000000000 -0400
-@@ -12135,7 +12135,7 @@
+diff -up evolution-2.23.4/configure.ldaphack evolution-2.23.4/configure
+--- evolution-2.23.4/configure.ldaphack	2008-06-16 07:12:17.000000000 -0400
++++ evolution-2.23.4/configure	2008-07-18 09:08:21.000000000 -0400
+@@ -27729,7 +27729,7 @@ if test "${ac_cv_lib_ldap_ldap_open+set}
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
    ac_check_lib_save_LIBS=$LIBS
 -LIBS="-lldap $LDAP_LDFLAGS $LDAP_LIBS $LIBS"
 +LIBS="-lldap -lresolv $LDAP_LDFLAGS $LDAP_LIBS $LIBS"
  cat >conftest.$ac_ext <<_ACEOF
- #line $LINENO "configure"
  /* confdefs.h.  */
+ _ACEOF

evolution-2.5.4-fix-conduit-dir.patch:

Index: evolution-2.5.4-fix-conduit-dir.patch
===================================================================
RCS file: /cvs/pkgs/rpms/evolution/devel/evolution-2.5.4-fix-conduit-dir.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- evolution-2.5.4-fix-conduit-dir.patch	4 Jun 2007 20:07:28 -0000	1.3
+++ evolution-2.5.4-fix-conduit-dir.patch	18 Jul 2008 13:16:37 -0000	1.4
@@ -1,6 +1,7 @@
---- evolution-2.11.3/addressbook/conduit/Makefile.am.fix-conduit-dir	2007-06-03 11:07:44.000000000 -0400
-+++ evolution-2.11.3/addressbook/conduit/Makefile.am	2007-06-04 12:55:32.000000000 -0400
-@@ -28,7 +28,7 @@ e-address.conduit: e-address.conduit.in
+diff -up evolution-2.23.4/addressbook/conduit/Makefile.am.fix-conduit-dir evolution-2.23.4/addressbook/conduit/Makefile.am
+--- evolution-2.23.4/addressbook/conduit/Makefile.am.fix-conduit-dir	2008-06-15 23:20:16.000000000 -0400
++++ evolution-2.23.4/addressbook/conduit/Makefile.am	2008-07-18 09:10:29.000000000 -0400
+@@ -25,7 +25,7 @@ e-address.conduit: e-address.conduit.in
  	    -e 's^\@BASE_VERSION\@^$(BASE_VERSION)^g' 			\
  	    $< > $@
  
@@ -9,9 +10,10 @@
  conduit_DATA = e-address.conduit
  
  BUILT_SOURCES = $(conduit_DATA)
---- evolution-2.11.3/addressbook/conduit/Makefile.in.fix-conduit-dir	2007-06-04 07:36:46.000000000 -0400
-+++ evolution-2.11.3/addressbook/conduit/Makefile.in	2007-06-04 12:55:53.000000000 -0400
-@@ -459,7 +459,7 @@ libeaddress_conduit_la_LIBADD = \
+diff -up evolution-2.23.4/addressbook/conduit/Makefile.in.fix-conduit-dir evolution-2.23.4/addressbook/conduit/Makefile.in
+--- evolution-2.23.4/addressbook/conduit/Makefile.in.fix-conduit-dir	2008-06-16 07:11:50.000000000 -0400
++++ evolution-2.23.4/addressbook/conduit/Makefile.in	2008-07-18 09:10:29.000000000 -0400
+@@ -421,7 +421,7 @@ libeaddress_conduit_la_LIBADD = \
  	$(top_builddir)/widgets/misc/libemiscwidgets.la			\
  	$(EVOLUTION_ADDRESSBOOK_CONDUIT_LIBS)
  
@@ -20,31 +22,34 @@
  conduit_DATA = e-address.conduit
  BUILT_SOURCES = $(conduit_DATA)
  CLEANFILES = $(BUILT_SOURCES)
---- evolution-2.11.3/calendar/conduits/todo/Makefile.am.fix-conduit-dir	2007-06-03 11:08:16.000000000 -0400
-+++ evolution-2.11.3/calendar/conduits/todo/Makefile.am	2007-06-04 12:56:19.000000000 -0400
-@@ -25,7 +25,7 @@ e-todo.conduit: e-todo.conduit.in
+diff -up evolution-2.23.4/calendar/conduits/calendar/Makefile.am.fix-conduit-dir evolution-2.23.4/calendar/conduits/calendar/Makefile.am
+--- evolution-2.23.4/calendar/conduits/calendar/Makefile.am.fix-conduit-dir	2008-06-15 23:22:48.000000000 -0400
++++ evolution-2.23.4/calendar/conduits/calendar/Makefile.am	2008-07-18 09:10:29.000000000 -0400
+@@ -28,7 +28,7 @@ e-calendar.conduit: e-calendar.conduit.i
  	    -e 's^\@BASE_VERSION\@^$(BASE_VERSION)^g' 			\
  	    $< > $@
  
 -conduitdir = $(datadir)/gnome-pilot/conduits/
 +conduitdir = $(libdir)/gnome-pilot/conduits/
- conduit_DATA = e-todo.conduit
+ conduit_DATA = e-calendar.conduit
  
  BUILT_SOURCES = $(conduit_DATA)
---- evolution-2.11.3/calendar/conduits/todo/Makefile.in.fix-conduit-dir	2007-06-04 07:36:51.000000000 -0400
-+++ evolution-2.11.3/calendar/conduits/todo/Makefile.in	2007-06-04 12:56:28.000000000 -0400
-@@ -456,7 +456,7 @@ libetodo_conduit_la_LIBADD = \
- 	$(top_builddir)/widgets/misc/libemiscwidgets.la			\
+diff -up evolution-2.23.4/calendar/conduits/calendar/Makefile.in.fix-conduit-dir evolution-2.23.4/calendar/conduits/calendar/Makefile.in
+--- evolution-2.23.4/calendar/conduits/calendar/Makefile.in.fix-conduit-dir	2008-06-16 07:11:53.000000000 -0400
++++ evolution-2.23.4/calendar/conduits/calendar/Makefile.in	2008-07-18 09:13:04.000000000 -0400
+@@ -426,7 +426,7 @@ libecalendar_conduit_la_LIBADD = \
+ 	$(top_builddir)/calendar/conduits/common/libecalendar_common_conduit.la	\
  	$(EVOLUTION_CALENDAR_CONDUIT_LIBS)
  
 -conduitdir = $(datadir)/gnome-pilot/conduits/
 +conduitdir = $(libdir)/gnome-pilot/conduits/
- conduit_DATA = e-todo.conduit
+ conduit_DATA = e-calendar.conduit
  BUILT_SOURCES = $(conduit_DATA)
  CLEANFILES = $(BUILT_SOURCES)
---- evolution-2.11.3/calendar/conduits/memo/Makefile.am.fix-conduit-dir	2007-06-03 11:08:16.000000000 -0400
-+++ evolution-2.11.3/calendar/conduits/memo/Makefile.am	2007-06-04 12:56:49.000000000 -0400
-@@ -25,7 +25,7 @@ e-memo.conduit: e-memo.conduit.in
+diff -up evolution-2.23.4/calendar/conduits/memo/Makefile.am.fix-conduit-dir evolution-2.23.4/calendar/conduits/memo/Makefile.am
+--- evolution-2.23.4/calendar/conduits/memo/Makefile.am.fix-conduit-dir	2008-06-15 23:22:48.000000000 -0400
++++ evolution-2.23.4/calendar/conduits/memo/Makefile.am	2008-07-18 09:10:29.000000000 -0400
+@@ -28,7 +28,7 @@ e-memo.conduit: e-memo.conduit.in
  	    -e 's^\@BASE_VERSION\@^$(BASE_VERSION)^g' 			\
  	    $< > $@
  
@@ -53,10 +58,11 @@
  conduit_DATA = e-memo.conduit
  
  BUILT_SOURCES = $(conduit_DATA)
---- evolution-2.11.3/calendar/conduits/memo/Makefile.in.fix-conduit-dir	2007-06-04 07:36:50.000000000 -0400
-+++ evolution-2.11.3/calendar/conduits/memo/Makefile.in	2007-06-04 12:56:40.000000000 -0400
-@@ -456,7 +456,7 @@ libememo_conduit_la_LIBADD = \
- 	$(top_builddir)/widgets/misc/libemiscwidgets.la			\
+diff -up evolution-2.23.4/calendar/conduits/memo/Makefile.in.fix-conduit-dir evolution-2.23.4/calendar/conduits/memo/Makefile.in
+--- evolution-2.23.4/calendar/conduits/memo/Makefile.in.fix-conduit-dir	2008-06-16 07:11:53.000000000 -0400
++++ evolution-2.23.4/calendar/conduits/memo/Makefile.in	2008-07-18 09:12:17.000000000 -0400
+@@ -424,7 +424,7 @@ libememo_conduit_la_LIBADD = \
+ 	$(top_builddir)/calendar/conduits/common/libecalendar_common_conduit.la	\
  	$(EVOLUTION_CALENDAR_CONDUIT_LIBS)
  
 -conduitdir = $(datadir)/gnome-pilot/conduits/
@@ -64,25 +70,27 @@
  conduit_DATA = e-memo.conduit
  BUILT_SOURCES = $(conduit_DATA)
  CLEANFILES = $(BUILT_SOURCES)
---- evolution-2.11.3/calendar/conduits/calendar/Makefile.am.fix-conduit-dir	2007-06-03 11:08:16.000000000 -0400
-+++ evolution-2.11.3/calendar/conduits/calendar/Makefile.am	2007-06-04 12:57:02.000000000 -0400
-@@ -25,7 +25,7 @@ e-calendar.conduit: e-calendar.conduit.i
+diff -up evolution-2.23.4/calendar/conduits/todo/Makefile.am.fix-conduit-dir evolution-2.23.4/calendar/conduits/todo/Makefile.am
+--- evolution-2.23.4/calendar/conduits/todo/Makefile.am.fix-conduit-dir	2008-06-15 23:22:48.000000000 -0400
++++ evolution-2.23.4/calendar/conduits/todo/Makefile.am	2008-07-18 09:10:29.000000000 -0400
+@@ -28,7 +28,7 @@ e-todo.conduit: e-todo.conduit.in
  	    -e 's^\@BASE_VERSION\@^$(BASE_VERSION)^g' 			\
  	    $< > $@
  
 -conduitdir = $(datadir)/gnome-pilot/conduits/
 +conduitdir = $(libdir)/gnome-pilot/conduits/
- conduit_DATA = e-calendar.conduit
+ conduit_DATA = e-todo.conduit
  
  BUILT_SOURCES = $(conduit_DATA)
---- evolution-2.11.3/calendar/conduits/calendar/Makefile.in.fix-conduit-dir	2007-06-04 07:36:50.000000000 -0400
-+++ evolution-2.11.3/calendar/conduits/calendar/Makefile.in	2007-06-04 12:57:11.000000000 -0400
-@@ -458,7 +458,7 @@ libecalendar_conduit_la_LIBADD = \
- 	$(top_builddir)/widgets/misc/libemiscwidgets.la			\
+diff -up evolution-2.23.4/calendar/conduits/todo/Makefile.in.fix-conduit-dir evolution-2.23.4/calendar/conduits/todo/Makefile.in
+--- evolution-2.23.4/calendar/conduits/todo/Makefile.in.fix-conduit-dir	2008-06-16 07:11:53.000000000 -0400
++++ evolution-2.23.4/calendar/conduits/todo/Makefile.in	2008-07-18 09:11:53.000000000 -0400
+@@ -424,7 +424,7 @@ libetodo_conduit_la_LIBADD = \
+ 	$(top_builddir)/calendar/conduits/common/libecalendar_common_conduit.la	\
  	$(EVOLUTION_CALENDAR_CONDUIT_LIBS)
  
 -conduitdir = $(datadir)/gnome-pilot/conduits/
 +conduitdir = $(libdir)/gnome-pilot/conduits/
- conduit_DATA = e-calendar.conduit
+ conduit_DATA = e-todo.conduit
  BUILT_SOURCES = $(conduit_DATA)
  CLEANFILES = $(BUILT_SOURCES)


Index: evolution.spec
===================================================================
RCS file: /cvs/pkgs/rpms/evolution/devel/evolution.spec,v
retrieving revision 1.345
retrieving revision 1.346
diff -u -r1.345 -r1.346
--- evolution.spec	19 Jun 2008 13:00:31 -0000	1.345
+++ evolution.spec	18 Jul 2008 13:16:37 -0000	1.346
@@ -45,8 +45,8 @@
 
 Name: evolution
 Version: 2.23.4
-Release: 2%{?dist}
-License: GPLv2 and GFDL+
+Release: 3%{?dist}
+License: GPLv2 and GFDL
 Group: Applications/Productivity
 Summary: Mail and calendar client for GNOME
 URL: http://www.gnome.org/projects/evolution/
@@ -646,6 +646,10 @@
 %{evo_plugin_dir}/liborg-gnome-sa-junk-plugin.so
 
 %changelog
+* Fri Jul 18 2008 Tom "spot" Callaway <tcallawa at redhat.com> - 2.23.4-3.fc10
+- fix license tag
+- fix patches to apply with fuzz=0
+
 * Thu Jun 19 2008 Matthew Barnes <mbarnes at redhat.com> - 2.23.4-2.fc10
 - Don't ship the unfinished "Custom Header" plugin.