rpms/evolution/FC-4 evolution-2.2.2-fix-conduit-dir.patch, NONE, 1.1 evolution-2.2.2-no-gnome-common.patch, NONE, 1.1 .cvsignore, 1.30, 1.31 evolution.spec, 1.74, 1.75 sources, 1.30, 1.31

Wed Jun 29 18:38:01 UTC 2005

Author: dmalcolm

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

Modified Files:
	.cvsignore evolution.spec sources 
Added Files:
	evolution-2.2.2-fix-conduit-dir.patch 
	evolution-2.2.2-no-gnome-common.patch 
Log Message:
* Wed Jun 29 2005 David Malcolm <dmalcolm at redhat.com> - 2.2.3-1.fc4
- 2.2.3
- Moved .conduit files to libdir/gnome-pilot/conduits, rather than beneath datadir, to match gnome-pilot (patch 802)
- Remove GNOME_COMPILE_WARNINGS from configure.in (since gnome-common might not be available when we rerun the autotools; patch 803)



evolution-2.2.2-fix-conduit-dir.patch:
 addressbook/conduit/Makefile.am        |    2 +-
 calendar/conduits/calendar/Makefile.am |    2 +-
 calendar/conduits/todo/Makefile.am     |    2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

--- NEW FILE evolution-2.2.2-fix-conduit-dir.patch ---
--- evolution-2.2.2/addressbook/conduit/Makefile.am.fix-conduit-dir	2005-06-28 15:29:52.000000000 -0400
+++ evolution-2.2.2/addressbook/conduit/Makefile.am	2005-06-28 15:30:56.000000000 -0400
@@ -28,7 +28,7 @@
 	    -e 's^\@BASE_VERSION\@^$(BASE_VERSION)^g' 			\
 	    $< > $@
 
-conduitdir = $(datadir)/gnome-pilot/conduits/
+conduitdir = $(libdir)/gnome-pilot/conduits/
 conduit_DATA = e-address-$(BASE_VERSION).conduit
 
 BUILT_SOURCES = $(conduit_DATA)
--- evolution-2.2.2/calendar/conduits/calendar/Makefile.am.fix-conduit-dir	2005-06-28 15:30:22.000000000 -0400
+++ evolution-2.2.2/calendar/conduits/calendar/Makefile.am	2005-06-28 15:32:34.000000000 -0400
@@ -24,7 +24,7 @@
 	    -e 's^\@BASE_VERSION\@^$(BASE_VERSION)^g' 			\
 	    $< > $@
 
-conduitdir = $(datadir)/gnome-pilot/conduits/
+conduitdir = $(libdir)/gnome-pilot/conduits/
 conduit_DATA = e-calendar-$(BASE_VERSION).conduit
 
 BUILT_SOURCES = $(conduit_DATA)
--- evolution-2.2.2/calendar/conduits/todo/Makefile.am.fix-conduit-dir	2005-06-28 15:30:32.000000000 -0400
+++ evolution-2.2.2/calendar/conduits/todo/Makefile.am	2005-06-28 15:32:26.000000000 -0400
@@ -24,7 +24,7 @@
 	    -e 's^\@BASE_VERSION\@^$(BASE_VERSION)^g' 			\
 	    $< > $@
 
-conduitdir = $(datadir)/gnome-pilot/conduits/
+conduitdir = $(libdir)/gnome-pilot/conduits/
 conduit_DATA = e-todo-$(BASE_VERSION).conduit
 
 BUILT_SOURCES = $(conduit_DATA)

evolution-2.2.2-no-gnome-common.patch:
 configure.in |    3 ---
 1 files changed, 3 deletions(-)

--- NEW FILE evolution-2.2.2-no-gnome-common.patch ---
--- evolution-2.2.2/configure.in.no-gnome-common	2005-06-28 16:12:26.000000000 -0400
+++ evolution-2.2.2/configure.in	2005-06-28 16:14:46.000000000 -0400
@@ -1060,9 +1060,6 @@
 dnl *************************
 dnl CFLAGS and LIBS and stuff
 dnl *************************
-
-GNOME_COMPILE_WARNINGS(yes)
-CFLAGS="$CFLAGS $WARN_CFLAGS"
 case $CFLAGS in
 *-Wall*)
 	# Turn off the annoying "comparison between signed and unsigned"


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/evolution/FC-4/.cvsignore,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- .cvsignore	12 Apr 2005 03:17:25 -0000	1.30
+++ .cvsignore	29 Jun 2005 18:37:58 -0000	1.31
@@ -1 +1,2 @@
 evolution-2.2.2.tar.bz2
+evolution-2.2.3.tar.bz2


Index: evolution.spec
===================================================================
RCS file: /cvs/dist/rpms/evolution/FC-4/evolution.spec,v
retrieving revision 1.74
retrieving revision 1.75
diff -u -r1.74 -r1.75
--- evolution.spec	28 Jun 2005 00:33:03 -0000	1.74
+++ evolution.spec	29 Jun 2005 18:37:58 -0000	1.75
@@ -27,8 +27,8 @@
 %define nntp_support 1
 
 Name: evolution
-Version: 2.2.2
-Release: 8.fc4
+Version: 2.2.3
+Release: 1.fc4
 License: GPL
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
 URL: http://www.ximian.com/
@@ -70,6 +70,12 @@
 Patch800: rh-161817-attach-116019-conduit_pilot_link_updates.diff
 Patch801: gb-309138-attach-48417-fix-evo-conduit-memleaks.patch
 
+# Move .conduit files from share to lib (for the sake of multilib)
+Patch802: evolution-2.2.2-fix-conduit-dir.patch
+
+# Remove GNOME_COMPILE_WARNINGS from configure.in (since gnome-common might not be available when we rerun the autotools):
+Patch803: evolution-2.2.2-no-gnome-common.patch
+
 Summary: GNOME's next-generation groupware suite
 Group: Applications/Productivity
 
@@ -185,6 +191,8 @@
 
 %patch800 -p0 -b .fix-conduits
 %patch801 -p0 -b .fix-evo-conduit-memleaks
+%patch802 -p1 -b .fix-conduit-dir
+%patch803 -p1 -b .no-gnome-common
 
 mkdir -p krb5-fakeprefix/include
 mkdir -p krb5-fakeprefix/lib
@@ -238,8 +246,8 @@
 fi
 %endif
 
-# Rerun autoconf since we patched configure.in (patch for new-mail-notify plugin):
-autoconf
+# Rerun autotools since we patched configure.in (patch for new-mail-notify plugin) and some Makefile.am files (conduit paths):
+autoreconf -i
 
 %configure \
   --enable-gtk-doc=yes \
@@ -334,7 +342,7 @@
 %if %{pilot_support}
 %dir %{_libdir}/evolution/%{evo_major}/conduits
 %{_libdir}/evolution/%{evo_major}/conduits/*.so
-%{_datadir}/gnome-pilot/conduits/*
+%{_libdir}/gnome-pilot/conduits/*.conduit
 %endif
 
 %files devel
@@ -344,6 +352,11 @@
 %{_libdir}/evolution/%{evo_major}/*.so
 
 %changelog
+* Wed Jun 29 2005 David Malcolm <dmalcolm at redhat.com> - 2.2.3-1.fc4
+- 2.2.3
+- Moved .conduit files to libdir/gnome-pilot/conduits, rather than beneath datadir, to match gnome-pilot (patch 802)
+- Remove GNOME_COMPILE_WARNINGS from configure.in (since gnome-common might not be available when we rerun the autotools; patch 803)
+
 * Mon Jun 27 2005 David Malcolm <dmalcolm at redhat.com> - 2.2.2-8.fc4
 - Replaced patch to port conduits to pilot-link-0.12 with Mark G Adams's version of same (#161817)
 - Added Mark G Adams's memory leak fix (patch 801)


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/evolution/FC-4/sources,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- sources	12 Apr 2005 03:17:25 -0000	1.30
+++ sources	29 Jun 2005 18:37:58 -0000	1.31
@@ -1 +1,2 @@
 9b49942c8bdd1dc21f2d28792b12f400  evolution-2.2.2.tar.bz2
+1e01511c78b2dd0dcb8cf83521c167af  evolution-2.2.3.tar.bz2


