From e6ce31837fdc0bff12b38ab8f223c43d798cdecb Mon Sep 17 00:00:00 2001 From: dmalcolm Date: Fri, 2 Dec 2005 21:23:45 +0000 Subject: [PATCH] - 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) --- evolution.spec | 18 ++++++++++++++++-- 1 file changed, 16 insertions(+), 2 deletions(-) diff --git a/evolution.spec b/evolution.spec index a628872..6ced160 100644 --- a/evolution.spec +++ b/evolution.spec @@ -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 @@ fi %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 @@ rm -rf $RPM_BUILD_ROOT %{_libdir}/evolution/%{evo_major}/*.so %changelog +* Fri Dec 2 2005 David Malcolm - 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 - 2.4.2-1 - 2.4.2 - explicitly list the plugins that are packaged (#166234)