Accepting request 177263 from Base:System

- do not call autoreconf, spares you all the ugly patches:
    gettext-no_silent_rules.patch
    gettext-0.15-docdir.diff
    gettext-autotools.patch

OBS-URL: https://build.opensuse.org/request/show/177263
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/gettext-runtime?expand=0&rev=42

gettext-0.15-docdir.diff

@@ -1,12 +0,0 @@
-Index: gettext-tools/doc/Makefile.am
-===================================================================
---- gettext-tools/doc/Makefile.am.orig	2010-06-06 14:49:57.000000000 +0200
-+++ gettext-tools/doc/Makefile.am	2010-12-20 18:47:12.009132367 +0100
-@@ -42,6 +42,7 @@ gettext_TEXINFOS = \
-   $(top_srcdir)/../gettext-runtime/doc/rt-ngettext.texi \
-   $(top_srcdir)/../gettext-runtime/doc/rt-envsubst.texi
- 
-+docdir=@docdir@
- # The FAQ. To be edited with Mozilla.
- # The tutorial. To be edited by hand.
- doc_DATA = FAQ.html tutorial.html

gettext-autotools.patch

@@ -1,25 +0,0 @@
-Index: gettext-runtime/configure.ac
-===================================================================
---- gettext-runtime/configure.ac.orig	2010-06-06 14:49:57.000000000 +0200
-+++ gettext-runtime/configure.ac	2012-07-02 13:03:41.782082463 +0200
-@@ -30,6 +30,7 @@ test "$docdir" != '${datarootdir}/doc/${
- 
- dnl Checks for programs.
- AC_PROG_CC
-+AM_PROG_CC_C_O
- AC_PROG_INSTALL
- AC_PROG_YACC
- 
-Index: gettext-runtime/m4/po.m4
-===================================================================
---- gettext-runtime/m4/po.m4.orig	2010-06-06 14:49:57.000000000 +0200
-+++ gettext-runtime/m4/po.m4	2012-07-02 13:04:05.086995921 +0200
-@@ -24,7 +24,7 @@ AC_DEFUN([AM_PO_SUBDIRS],
- [
-   AC_REQUIRE([AC_PROG_MAKE_SET])dnl
-   AC_REQUIRE([AC_PROG_INSTALL])dnl
--  AC_REQUIRE([AM_PROG_MKDIR_P])dnl defined by automake
-+  AC_REQUIRE([AC_PROG_MKDIR_P])
-   AC_REQUIRE([AM_NLS])dnl
- 
-   dnl Release version of the gettext macros. This is used to ensure that

gettext-csharp.spec

@@ -40,11 +40,8 @@ Patch2:         gettext-0.12.1-gettextize.patch
 Patch3:         gettext-codecleanup.patch
 Patch4:         gettext-po-mode.diff
 Patch5:         gettext-initialize_vars.patch
-Patch6:         gettext-0.15-docdir.diff
-Patch7:         gettext-autotools.patch
 Patch9:         gettext-needlessly_init_vars.patch
 Patch10:        getext-stdio.in.patch
-Patch11:        gettext-no_silent_rules.patch
 
 %description
 Mono with its 'resgen' program uses a design that Microsoft created and
@@ -75,11 +72,8 @@ reliably than 'resgen'.
 %patch3
 %patch4
 %patch5
-%patch6
-%patch7
 %patch9
 %patch10 -p1
-%patch11
 
 %build
 export CFLAGS="%{optflags} -pipe -W -Wall -Dgcc_is_lint"

gettext-java.spec

@@ -40,11 +40,8 @@ Patch2:         gettext-0.12.1-gettextize.patch
 Patch3:         gettext-codecleanup.patch
 Patch4:         gettext-po-mode.diff
 Patch5:         gettext-initialize_vars.patch
-Patch6:         gettext-0.15-docdir.diff
-Patch7:         gettext-autotools.patch
 Patch9:         gettext-needlessly_init_vars.patch
 Patch10:        getext-stdio.in.patch
-Patch11:        gettext-no_silent_rules.patch
 
 %description
 This package includes the tools needed to support message catalogs in
@@ -58,11 +55,8 @@ java+swing.
 %patch3
 %patch4
 %patch5
-%patch6
-%patch7
 %patch9
 %patch10 -p1
-%patch11
 
 %build
 export CFLAGS="%{optflags} -pipe -W -Wall -Dgcc_is_lint"

gettext-no_silent_rules.patch

@@ -1,13 +0,0 @@
-Index: configure.ac
-===================================================================
---- configure.ac.orig	2010-06-06 14:49:57.000000000 +0200
-+++ configure.ac	2012-09-24 17:28:10.184401496 +0200
-@@ -22,7 +22,7 @@ AC_CONFIG_SRCDIR([gettext-tools/src/msgf
- AC_CONFIG_AUX_DIR([build-aux])
- . $srcdir/version.sh
- gl_INIT_PACKAGE([gettext], [$VERSION_NUMBER])
--AM_INIT_AUTOMAKE([silent-rules])
-+AM_INIT_AUTOMAKE()
- 
- dnl Override automake's tar command used for creating distributions.
- am__tar='${AMTAR} chof - --owner=root --group=root "$$tardir"'

gettext-runtime.changes

@@ -1,3 +1,11 @@
+-------------------------------------------------------------------
+Fri May 31 07:47:08 UTC 2013 - coolo@suse.com
+
+- do not call autoreconf, spares you all the ugly patches:
+    gettext-no_silent_rules.patch
+    gettext-0.15-docdir.diff
+    gettext-autotools.patch
+
 -------------------------------------------------------------------
 Wed Mar 27 07:50:12 UTC 2013 - mmeister@suse.com
 

gettext-runtime.spec

@@ -51,11 +51,8 @@ Patch2:         gettext-0.12.1-gettextize.patch
 Patch3:         gettext-codecleanup.patch
 Patch4:         gettext-po-mode.diff
 Patch5:         gettext-initialize_vars.patch
-Patch6:         gettext-0.15-docdir.diff
-Patch7:         gettext-autotools.patch
 Patch9:         gettext-needlessly_init_vars.patch
 Patch10:        getext-stdio.in.patch
-Patch11:        gettext-no_silent_rules.patch
 
 %description
 This package contains the intl library as well as tools that ease the
@@ -94,15 +91,12 @@ binary catalogs.
 %patch3
 %patch4
 %patch5
-%patch6
-%patch7
 %patch9
 %patch10 -p1
-%patch11
 
 %build
 # expect a couple "You should update your `aclocal.m4' by running aclocal."
-autoreconf -fiv
+#autoreconf -fiv
 #sh autogen.sh
 export CFLAGS="%{optflags} -pipe -W -Wall -Dgcc_is_lint"
 export CXXFLAGS="$CFLAGS -Dgcc_is_lint"