diff --git a/gettext-0.17-no-autoconf-tests.diff b/gettext-0.17-no-autoconf-tests.diff new file mode 100644 index 0000000..8edc2cb --- /dev/null +++ b/gettext-0.17-no-autoconf-tests.diff @@ -0,0 +1,11 @@ +--- Makefile.am ++++ Makefile.am 2008/10/14 11:08:15 +@@ -19,7 +19,7 @@ + AUTOMAKE_OPTIONS = 1.5 gnu no-dependencies + ACLOCAL = build-aux/fixaclocal @ACLOCAL@ + +-SUBDIRS = gnulib-local gettext-runtime gettext-tools autoconf-lib-link ++SUBDIRS = gnulib-local gettext-runtime gettext-tools + + EXTRA_DIST = \ + version.sh DEPENDENCIES PACKAGING HACKING ChangeLog.0 autogen.sh \ diff --git a/gettext-csharp.changes b/gettext-csharp.changes index 00d77c6..7162c7f 100644 --- a/gettext-csharp.changes +++ b/gettext-csharp.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Tue Oct 14 13:11:43 CEST 2008 - kukuk@suse.de + +- Never install files in %check section +- Disable autoconf/libtool tests + ------------------------------------------------------------------- Mon Oct 13 16:03:05 CEST 2008 - kukuk@suse.de diff --git a/gettext-csharp.spec b/gettext-csharp.spec index 2a6f467..8ff97bc 100644 --- a/gettext-csharp.spec +++ b/gettext-csharp.spec @@ -26,7 +26,7 @@ License: LGPL v2.1 or later Group: Development/Tools/Other AutoReqProv: on Version: 0.17 -Release: 92 +Release: 93 Summary: Native Language Support (NLS) for C# PreReq: %{install_info_prereq} BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -45,6 +45,7 @@ Patch8: gettext-gl_AC_TYPE_LONG_LONG.patch Patch9: gettext-needlessly_init_vars.patch Patch10: gettext-open_missing_mode.patch Patch11: gettext-typo_to_segfault.patch +Patch12: gettext-0.17-no-autoconf-tests.diff %description Mono with its 'resgen' program uses a design that Microsoft created and @@ -86,14 +87,12 @@ Authors: %patch9 %patch10 %patch11 +%patch12 pushd gettext-tools/misc tar xfz archive.tar.gz find . -name gettext.m4,v -print0 | xargs -0 perl -spi -e 's/\(int\) /\(long\) /g' tar cfz archive.tar.gz archive/ popd -aclocal -I m4 --install --force -libtoolize --force --automake --copy -automake --add-missing --copy autoreconf -fiv %build @@ -143,6 +142,9 @@ rm -rf $RPM_BUILD_ROOT %_libdir/gettext/msgunfmt.net.exe %changelog +* Tue Oct 14 2008 kukuk@suse.de +- Never install files in %%check section +- Disable autoconf/libtool tests * Mon Oct 13 2008 kukuk@suse.de - Fix autoreconf call * Sun May 18 2008 pth@suse.de diff --git a/gettext-java.changes b/gettext-java.changes index 780c682..ecd9a2f 100644 --- a/gettext-java.changes +++ b/gettext-java.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Tue Oct 14 13:14:11 CEST 2008 - kukuk@suse.de + +- Never install files in %check section +- Disable autoconf/libtool tests + ------------------------------------------------------------------- Mon Oct 13 16:03:16 CEST 2008 - kukuk@suse.de diff --git a/gettext-java.spec b/gettext-java.spec index 0f25d2d..7938590 100644 --- a/gettext-java.spec +++ b/gettext-java.spec @@ -25,7 +25,7 @@ License: LGPL v2.1 or later Group: Development/Tools/Other AutoReqProv: on Version: 0.17 -Release: 104 +Release: 105 Summary: Java Support for Native Language Support (NLS) PreReq: %{install_info_prereq} BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -44,6 +44,7 @@ Patch8: gettext-gl_AC_TYPE_LONG_LONG.patch Patch9: gettext-needlessly_init_vars.patch Patch10: gettext-open_missing_mode.patch Patch11: gettext-typo_to_segfault.patch +Patch12: gettext-0.17-no-autoconf-tests.diff %description This package includes the tools needed to support message catalogs in @@ -70,14 +71,12 @@ Authors: %patch9 %patch10 %patch11 +%patch12 pushd gettext-tools/misc tar xfz archive.tar.gz find . -name gettext.m4,v -print0 | xargs -0 perl -spi -e 's/\(int\) /\(long\) /g' tar cfz archive.tar.gz archive/ popd -aclocal -I m4 --install --force -libtoolize --force --automake --copy -automake --add-missing --copy autoreconf -fiv %build @@ -147,6 +146,9 @@ rm -rf $RPM_BUILD_ROOT %_libdir/gettext/gnu.gettext.GetURL %changelog +* Tue Oct 14 2008 kukuk@suse.de +- Never install files in %%check section +- Disable autoconf/libtool tests * Mon Oct 13 2008 kukuk@suse.de - Fix autoreconf call * Sun May 18 2008 pth@suse.de diff --git a/gettext-runtime.changes b/gettext-runtime.changes index 47e058a..186d714 100644 --- a/gettext-runtime.changes +++ b/gettext-runtime.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Tue Oct 14 13:14:16 CEST 2008 - kukuk@suse.de + +- Never install files in %check section +- Disable autoconf/libtool tests + ------------------------------------------------------------------- Mon Oct 13 16:03:21 CEST 2008 - kukuk@suse.de diff --git a/gettext-runtime.spec b/gettext-runtime.spec index 27c0792..1f1f1e5 100644 --- a/gettext-runtime.spec +++ b/gettext-runtime.spec @@ -21,7 +21,7 @@ Name: gettext-runtime %define pacname gettext Version: 0.17 -Release: 59 +Release: 60 BuildRequires: gcc-c++ perl-libintl-perl tcl # To get an updated linkdupes.sh (in case there are new dupes), temproarily enable: #BuildRequires: fdupes @@ -49,6 +49,7 @@ Patch8: gettext-gl_AC_TYPE_LONG_LONG.patch Patch9: gettext-needlessly_init_vars.patch Patch10: gettext-open_missing_mode.patch Patch11: gettext-typo_to_segfault.patch +Patch12: gettext-0.17-no-autoconf-tests.diff %description This package contains the intl library as well as tools that ease the @@ -102,6 +103,7 @@ Authors: %patch9 %patch10 %patch11 +%patch12 pushd gettext-tools/misc tar xfz archive.tar.gz find . -name gettext.m4,v -print0 | xargs -0 perl -spi -e 's/\(int\) /\(long\) /g' @@ -110,9 +112,6 @@ popd %build # expect a couple "You should update your `aclocal.m4' by running aclocal." -aclocal -I m4 --install --force -libtoolize --force --automake --copy -automake --add-missing --copy autoreconf -fiv #sh autogen.sh export CFLAGS="$RPM_OPT_FLAGS -pipe -W -Wall -Dgcc_is_lint" @@ -150,11 +149,13 @@ sh %{SOURCE3} # moved to gettext-java and gettext-csharp: rm -rf *csharp* *java* ../javadoc* ../csharpdoc* rm -f %{buildroot}%{_defaultdocdir}/%name/README.woe32 +cd $RPM_BUILD_ROOT/%{_mandir}/man3 +echo ".so man3/dngettext.3" > dcngettext.3 +echo ".so man3/dgettext.3" > dcgettext.3 %check # s390s fails this test, # Starting test_recursive_lock ...test-lock: pthread_mutex_lock.c:66: __pthread_mutex_lock: Assertion `mutex->__data.__owner == 0' failed. -%if %{?__debug_package:1}0 make check || { %ifarch s390x echo "got this during mbuild testing on s390x (on both times which make check ran):" @@ -165,10 +166,6 @@ make check || { exit 5 %endif } -%endif -cd $RPM_BUILD_ROOT/%{_mandir}/man3 -ln -f dngettext.3.gz dcngettext.3.gz -ln -f dgettext.3.gz dcgettext.3.gz %clean rm -rf $RPM_BUILD_ROOT @@ -264,6 +261,9 @@ rm -rf $RPM_BUILD_ROOT %_datadir/aclocal/* %changelog +* Tue Oct 14 2008 kukuk@suse.de +- Never install files in %%check section +- Disable autoconf/libtool tests * Mon Oct 13 2008 kukuk@suse.de - Fix autoreconf call * Sun May 18 2008 pth@suse.de