rpms/evolution/devel evolution-2.9.3-aclocal-flags.patch, NONE, 1.1 evolution.spec, 1.212, 1.213

[fedora-cvs-commits at redhat.com]

Author: mbarnes

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

Modified Files:
	evolution.spec 
Added Files:
	evolution-2.9.3-aclocal-flags.patch 
Log Message:
- Think I got it this time.


evolution-2.9.3-aclocal-flags.patch:
 Makefile.am |    2 ++
 Makefile.in |    2 ++
 2 files changed, 4 insertions(+)

--- NEW FILE evolution-2.9.3-aclocal-flags.patch ---
--- evolution-2.9.3/Makefile.in.aclocal-flags	2006-12-09 21:00:16.000000000 -0500
+++ evolution-2.9.3/Makefile.in	2006-12-09 21:00:46.000000000 -0500
@@ -409,6 +409,8 @@
 	evolution-shell-$(BASE_VERSION).pc	\
 	evolution-plugin-$(BASE_VERSION).pc
 
+ACLOCAL_FLAGS=-I .
+
 EXTRA_DIST = \
 	AUTHORS			\
 	$(changelogs)		\
--- evolution-2.9.3/Makefile.am.aclocal-flags	2006-12-09 20:59:40.000000000 -0500
+++ evolution-2.9.3/Makefile.am	2006-12-09 20:59:59.000000000 -0500
@@ -10,6 +10,8 @@
 	evolution-shell-$(BASE_VERSION).pc	\
 	evolution-plugin-$(BASE_VERSION).pc
 
+ACLOCAL_FLAGS=-I .
+
 EXTRA_DIST = 			\
 	AUTHORS			\
 	$(changelogs)		\


Index: evolution.spec
===================================================================
RCS file: /cvs/dist/rpms/evolution/devel/evolution.spec,v
retrieving revision 1.212
retrieving revision 1.213
diff -u -r1.212 -r1.213
--- evolution.spec	10 Dec 2006 02:02:48 -0000	1.212
+++ evolution.spec	10 Dec 2006 02:22:24 -0000	1.213
@@ -163,6 +163,9 @@
 # RH bug #218801 / GNOME bug #383953
 Patch43: evolution-2.9.3-unread-messages.patch
 
+# Look for m4 files in local directory.
+Patch44: evolution-2.9.3-aclocal-flags.patch
+
 ## Dependencies ###
 
 Requires: ORBit2 >= %{orbit2_version}
@@ -308,6 +311,7 @@
 %patch41 -p1 -b .adopt-icons
 %patch42 -p1 -b .source-path-entry
 %patch43 -p1 -b .unread-messages
+%patch44 -p1 -b .aclocal-flags
 
 mkdir -p krb5-fakeprefix/include
 mkdir -p krb5-fakeprefix/lib
@@ -394,8 +398,6 @@
 
 # Rerun the GNU Autotools since we patched some of the input files.
 # Disable portability checking to keep automake 1.10 quiet.
-# See GNOME bug #355521 for why ACLOCAL_FLAGS is needed.
-export ACLOCAL_FLAGS="-I . $ACLOCAL_FLAGS"
 autoreconf --warnings=no-portability
 
 %configure \