3
0
OBS User unknown 2008-10-22 15:27:33 +00:00 committed by Git OBS Bridge
parent c5672ef234
commit 6dd8a960f8
7 changed files with 50 additions and 17 deletions

View File

@ -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 \

View File

@ -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 Mon Oct 13 16:03:05 CEST 2008 - kukuk@suse.de

View File

@ -26,7 +26,7 @@ License: LGPL v2.1 or later
Group: Development/Tools/Other Group: Development/Tools/Other
AutoReqProv: on AutoReqProv: on
Version: 0.17 Version: 0.17
Release: 92 Release: 93
Summary: Native Language Support (NLS) for C# Summary: Native Language Support (NLS) for C#
PreReq: %{install_info_prereq} PreReq: %{install_info_prereq}
BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRoot: %{_tmppath}/%{name}-%{version}-build
@ -45,6 +45,7 @@ Patch8: gettext-gl_AC_TYPE_LONG_LONG.patch
Patch9: gettext-needlessly_init_vars.patch Patch9: gettext-needlessly_init_vars.patch
Patch10: gettext-open_missing_mode.patch Patch10: gettext-open_missing_mode.patch
Patch11: gettext-typo_to_segfault.patch Patch11: gettext-typo_to_segfault.patch
Patch12: gettext-0.17-no-autoconf-tests.diff
%description %description
Mono with its 'resgen' program uses a design that Microsoft created and Mono with its 'resgen' program uses a design that Microsoft created and
@ -86,14 +87,12 @@ Authors:
%patch9 %patch9
%patch10 %patch10
%patch11 %patch11
%patch12
pushd gettext-tools/misc pushd gettext-tools/misc
tar xfz archive.tar.gz tar xfz archive.tar.gz
find . -name gettext.m4,v -print0 | xargs -0 perl -spi -e 's/\(int\) /\(long\) /g' find . -name gettext.m4,v -print0 | xargs -0 perl -spi -e 's/\(int\) /\(long\) /g'
tar cfz archive.tar.gz archive/ tar cfz archive.tar.gz archive/
popd popd
aclocal -I m4 --install --force
libtoolize --force --automake --copy
automake --add-missing --copy
autoreconf -fiv autoreconf -fiv
%build %build
@ -143,6 +142,9 @@ rm -rf $RPM_BUILD_ROOT
%_libdir/gettext/msgunfmt.net.exe %_libdir/gettext/msgunfmt.net.exe
%changelog %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 * Mon Oct 13 2008 kukuk@suse.de
- Fix autoreconf call - Fix autoreconf call
* Sun May 18 2008 pth@suse.de * Sun May 18 2008 pth@suse.de

View File

@ -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 Mon Oct 13 16:03:16 CEST 2008 - kukuk@suse.de

View File

@ -25,7 +25,7 @@ License: LGPL v2.1 or later
Group: Development/Tools/Other Group: Development/Tools/Other
AutoReqProv: on AutoReqProv: on
Version: 0.17 Version: 0.17
Release: 104 Release: 105
Summary: Java Support for Native Language Support (NLS) Summary: Java Support for Native Language Support (NLS)
PreReq: %{install_info_prereq} PreReq: %{install_info_prereq}
BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRoot: %{_tmppath}/%{name}-%{version}-build
@ -44,6 +44,7 @@ Patch8: gettext-gl_AC_TYPE_LONG_LONG.patch
Patch9: gettext-needlessly_init_vars.patch Patch9: gettext-needlessly_init_vars.patch
Patch10: gettext-open_missing_mode.patch Patch10: gettext-open_missing_mode.patch
Patch11: gettext-typo_to_segfault.patch Patch11: gettext-typo_to_segfault.patch
Patch12: gettext-0.17-no-autoconf-tests.diff
%description %description
This package includes the tools needed to support message catalogs in This package includes the tools needed to support message catalogs in
@ -70,14 +71,12 @@ Authors:
%patch9 %patch9
%patch10 %patch10
%patch11 %patch11
%patch12
pushd gettext-tools/misc pushd gettext-tools/misc
tar xfz archive.tar.gz tar xfz archive.tar.gz
find . -name gettext.m4,v -print0 | xargs -0 perl -spi -e 's/\(int\) /\(long\) /g' find . -name gettext.m4,v -print0 | xargs -0 perl -spi -e 's/\(int\) /\(long\) /g'
tar cfz archive.tar.gz archive/ tar cfz archive.tar.gz archive/
popd popd
aclocal -I m4 --install --force
libtoolize --force --automake --copy
automake --add-missing --copy
autoreconf -fiv autoreconf -fiv
%build %build
@ -147,6 +146,9 @@ rm -rf $RPM_BUILD_ROOT
%_libdir/gettext/gnu.gettext.GetURL %_libdir/gettext/gnu.gettext.GetURL
%changelog %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 * Mon Oct 13 2008 kukuk@suse.de
- Fix autoreconf call - Fix autoreconf call
* Sun May 18 2008 pth@suse.de * Sun May 18 2008 pth@suse.de

View File

@ -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 Mon Oct 13 16:03:21 CEST 2008 - kukuk@suse.de

View File

@ -21,7 +21,7 @@
Name: gettext-runtime Name: gettext-runtime
%define pacname gettext %define pacname gettext
Version: 0.17 Version: 0.17
Release: 59 Release: 60
BuildRequires: gcc-c++ perl-libintl-perl tcl BuildRequires: gcc-c++ perl-libintl-perl tcl
# To get an updated linkdupes.sh (in case there are new dupes), temproarily enable: # To get an updated linkdupes.sh (in case there are new dupes), temproarily enable:
#BuildRequires: fdupes #BuildRequires: fdupes
@ -49,6 +49,7 @@ Patch8: gettext-gl_AC_TYPE_LONG_LONG.patch
Patch9: gettext-needlessly_init_vars.patch Patch9: gettext-needlessly_init_vars.patch
Patch10: gettext-open_missing_mode.patch Patch10: gettext-open_missing_mode.patch
Patch11: gettext-typo_to_segfault.patch Patch11: gettext-typo_to_segfault.patch
Patch12: gettext-0.17-no-autoconf-tests.diff
%description %description
This package contains the intl library as well as tools that ease the This package contains the intl library as well as tools that ease the
@ -102,6 +103,7 @@ Authors:
%patch9 %patch9
%patch10 %patch10
%patch11 %patch11
%patch12
pushd gettext-tools/misc pushd gettext-tools/misc
tar xfz archive.tar.gz tar xfz archive.tar.gz
find . -name gettext.m4,v -print0 | xargs -0 perl -spi -e 's/\(int\) /\(long\) /g' find . -name gettext.m4,v -print0 | xargs -0 perl -spi -e 's/\(int\) /\(long\) /g'
@ -110,9 +112,6 @@ popd
%build %build
# expect a couple "You should update your `aclocal.m4' by running aclocal." # 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 autoreconf -fiv
#sh autogen.sh #sh autogen.sh
export CFLAGS="$RPM_OPT_FLAGS -pipe -W -Wall -Dgcc_is_lint" export CFLAGS="$RPM_OPT_FLAGS -pipe -W -Wall -Dgcc_is_lint"
@ -150,11 +149,13 @@ sh %{SOURCE3}
# moved to gettext-java and gettext-csharp: # moved to gettext-java and gettext-csharp:
rm -rf *csharp* *java* ../javadoc* ../csharpdoc* rm -rf *csharp* *java* ../javadoc* ../csharpdoc*
rm -f %{buildroot}%{_defaultdocdir}/%name/README.woe32 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 %check
# s390s fails this test, # s390s fails this test,
# Starting test_recursive_lock ...test-lock: pthread_mutex_lock.c:66: __pthread_mutex_lock: Assertion `mutex->__data.__owner == 0' failed. # 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 || { make check || {
%ifarch s390x %ifarch s390x
echo "got this during mbuild testing on s390x (on both times which make check ran):" echo "got this during mbuild testing on s390x (on both times which make check ran):"
@ -165,10 +166,6 @@ make check || {
exit 5 exit 5
%endif %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 %clean
rm -rf $RPM_BUILD_ROOT rm -rf $RPM_BUILD_ROOT
@ -264,6 +261,9 @@ rm -rf $RPM_BUILD_ROOT
%_datadir/aclocal/* %_datadir/aclocal/*
%changelog %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 * Mon Oct 13 2008 kukuk@suse.de
- Fix autoreconf call - Fix autoreconf call
* Sun May 18 2008 pth@suse.de * Sun May 18 2008 pth@suse.de