- 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)
This commit is contained in:
dmalcolm 2005-12-02 21:23:45 +00:00
parent dd03ddd6a1
commit e6ce31837f

View File

@ -31,7 +31,7 @@
Name: evolution Name: evolution
Version: 2.4.2 Version: 2.4.2
Release: 1 Release: 2
License: GPL License: GPL
BuildRoot: %{_tmppath}/%{name}-%{version}-root BuildRoot: %{_tmppath}/%{name}-%{version}-root
URL: http://www.ximian.com/ URL: http://www.ximian.com/
@ -276,7 +276,12 @@ fi
%endif %endif
# Rerun autotools since we patched configure.in (patch for new-mail-notify plugin) and some Makefile.am files (conduit paths): # 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 \ %configure \
--enable-gtk-doc=yes \ --enable-gtk-doc=yes \
@ -478,6 +483,15 @@ rm -rf $RPM_BUILD_ROOT
%{_libdir}/evolution/%{evo_major}/*.so %{_libdir}/evolution/%{evo_major}/*.so
%changelog %changelog
* Fri Dec 2 2005 David Malcolm <dmalcolm@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@redhat.com> - 2.4.2-1 * Tue Nov 29 2005 David Malcolm <dmalcolm@redhat.com> - 2.4.2-1
- 2.4.2 - 2.4.2
- explicitly list the plugins that are packaged (#166234) - explicitly list the plugins that are packaged (#166234)