rpms/evolution/devel evolution.spec,1.102,1.103

[fedora-cvs-commits at redhat.com]

Author: dmalcolm

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

Modified Files:
	evolution.spec 
Log Message:
* Fri Dec  2 2005 David Malcolm <dmalcolm at redhat.com> - 2.4.2-2
- force regeneration of the intltool files to prevent a problem where the 
  tarball copy of intltool-merge.in was out of sync with the intltool.m4 in the
  latest shipped copy of intltool, which resulted in a broken intltool-merge 
  script when the tree was reautotooled.  (appears that the tarball was built 
  with a CVS copy of intltool where @EXPANDED_LIBDIR@ had been renamed to
  @INTLTOOL_LIBDIR@, but our aclocal/intltool.m4 doesn't yet reflect that 
  change)




Index: evolution.spec
===================================================================
RCS file: /cvs/dist/rpms/evolution/devel/evolution.spec,v
retrieving revision 1.102
retrieving revision 1.103
diff -u -r1.102 -r1.103
--- evolution.spec	2 Dec 2005 18:36:33 -0000	1.102
+++ evolution.spec	2 Dec 2005 21:23:45 -0000	1.103
@@ -31,7 +31,7 @@
 
 Name: evolution
 Version: 2.4.2
-Release: 1
+Release: 2
 License: GPL
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
 URL: http://www.ximian.com/
@@ -276,7 +276,12 @@
 %endif
 
 # Rerun autotools since we patched configure.in (patch for new-mail-notify plugin) and some Makefile.am files (conduit paths):
-autoreconf -i
+aclocal
+autoheader
+automake
+libtoolize
+intltoolize --force
+autoconf
 
 %configure \
   --enable-gtk-doc=yes \
@@ -478,6 +483,15 @@
 %{_libdir}/evolution/%{evo_major}/*.so
 
 %changelog
+* Fri Dec  2 2005 David Malcolm <dmalcolm at redhat.com> - 2.4.2-2
+- force regeneration of the intltool files to prevent a problem where the 
+  tarball copy of intltool-merge.in was out of sync with the intltool.m4 in the
+  latest shipped copy of intltool, which resulted in a broken intltool-merge 
+  script when the tree was reautotooled.  (appears that the tarball was built 
+  with a CVS copy of intltool where @EXPANDED_LIBDIR@ had been renamed to
+  @INTLTOOL_LIBDIR@, but our aclocal/intltool.m4 doesn't yet reflect that 
+  change)
+
 * Tue Nov 29 2005 David Malcolm <dmalcolm at redhat.com> - 2.4.2-1
 - 2.4.2
 - explicitly list the plugins that are packaged (#166234)