From f341de843c3e85f301765c24d73d900b8df48174 Mon Sep 17 00:00:00 2001 From: Tom Callaway Date: Fri, 18 Jul 2008 13:16:37 +0000 Subject: [PATCH] fix license tag --- evolution-1.4.4-ldap-x86_64-hack.patch | 9 +- evolution-2.5.4-fix-conduit-dir.patch | 122 +++++++++++++------------ evolution.spec | 8 +- 3 files changed, 76 insertions(+), 63 deletions(-) diff --git a/evolution-1.4.4-ldap-x86_64-hack.patch b/evolution-1.4.4-ldap-x86_64-hack.patch index 47cafbd..44cf1c7 100644 --- a/evolution-1.4.4-ldap-x86_64-hack.patch +++ b/evolution-1.4.4-ldap-x86_64-hack.patch @@ -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 diff --git a/evolution-2.5.4-fix-conduit-dir.patch b/evolution-2.5.4-fix-conduit-dir.patch index 31726ab..334564b 100644 --- a/evolution-2.5.4-fix-conduit-dir.patch +++ b/evolution-2.5.4-fix-conduit-dir.patch @@ -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,53 +22,10 @@ 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 - -e 's^\@BASE_VERSION\@^$(BASE_VERSION)^g' \ - $< > $@ - --conduitdir = $(datadir)/gnome-pilot/conduits/ -+conduitdir = $(libdir)/gnome-pilot/conduits/ - conduit_DATA = e-todo.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 \ - $(EVOLUTION_CALENDAR_CONDUIT_LIBS) - --conduitdir = $(datadir)/gnome-pilot/conduits/ -+conduitdir = $(libdir)/gnome-pilot/conduits/ - conduit_DATA = e-todo.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 - -e 's^\@BASE_VERSION\@^$(BASE_VERSION)^g' \ - $< > $@ - --conduitdir = $(datadir)/gnome-pilot/conduits/ -+conduitdir = $(libdir)/gnome-pilot/conduits/ - 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 \ - $(EVOLUTION_CALENDAR_CONDUIT_LIBS) - --conduitdir = $(datadir)/gnome-pilot/conduits/ -+conduitdir = $(libdir)/gnome-pilot/conduits/ - 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/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' \ $< > $@ @@ -75,10 +34,11 @@ conduit_DATA = e-calendar.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/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/ @@ -86,3 +46,51 @@ conduit_DATA = e-calendar.conduit BUILT_SOURCES = $(conduit_DATA) CLEANFILES = $(BUILT_SOURCES) +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' \ + $< > $@ + +-conduitdir = $(datadir)/gnome-pilot/conduits/ ++conduitdir = $(libdir)/gnome-pilot/conduits/ + conduit_DATA = e-memo.conduit + + BUILT_SOURCES = $(conduit_DATA) +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/ ++conduitdir = $(libdir)/gnome-pilot/conduits/ + conduit_DATA = e-memo.conduit + BUILT_SOURCES = $(conduit_DATA) + CLEANFILES = $(BUILT_SOURCES) +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-todo.conduit + + BUILT_SOURCES = $(conduit_DATA) +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-todo.conduit + BUILT_SOURCES = $(conduit_DATA) + CLEANFILES = $(BUILT_SOURCES) diff --git a/evolution.spec b/evolution.spec index 7e61574..68d0c0f 100644 --- a/evolution.spec +++ b/evolution.spec @@ -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 @@ rm -rf $RPM_BUILD_ROOT %{evo_plugin_dir}/liborg-gnome-sa-junk-plugin.so %changelog +* Fri Jul 18 2008 Tom "spot" Callaway - 2.23.4-3.fc10 +- fix license tag +- fix patches to apply with fuzz=0 + * Thu Jun 19 2008 Matthew Barnes - 2.23.4-2.fc10 - Don't ship the unfinished "Custom Header" plugin.