diff --git a/gettext-autotools.patch b/gettext-autotools.patch index b3c10c3..973acea 100644 --- a/gettext-autotools.patch +++ b/gettext-autotools.patch @@ -1,7 +1,7 @@ Index: gettext-runtime/configure.ac =================================================================== --- gettext-runtime/configure.ac.orig 2010-06-06 14:49:57.000000000 +0200 -+++ gettext-runtime/configure.ac 2010-12-20 18:47:12.027132323 +0100 ++++ gettext-runtime/configure.ac 2012-07-02 13:03:41.782082463 +0200 @@ -30,6 +30,7 @@ test "$docdir" != '${datarootdir}/doc/${ dnl Checks for programs. @@ -10,3 +10,16 @@ Index: gettext-runtime/configure.ac 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 diff --git a/gettext-csharp.spec b/gettext-csharp.spec index 9cc6b41..4db0c76 100644 --- a/gettext-csharp.spec +++ b/gettext-csharp.spec @@ -15,20 +15,20 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # -# norootforbuild - Name: gettext-csharp -BuildRequires: fdupes mono-devel perl-libintl-perl tcl +BuildRequires: fdupes BuildRequires: libtool +BuildRequires: mono-devel +BuildRequires: perl-libintl-perl +BuildRequires: tcl Requires: mono Url: http://www.gnu.org/software/gettext/ +Version: 0.18.1.1 +Release: 0 +Summary: Native Language Support (NLS) for C# License: LGPL-2.1+ Group: Development/Tools/Other -AutoReqProv: on -Version: 0.18.1.1 -Release: 2 -Summary: Native Language Support (NLS) for C# PreReq: %{install_info_prereq} BuildRoot: %{_tmppath}/%{name}-%{version}-build Source: gettext-%{version}.tar.bz2 diff --git a/gettext-java.spec b/gettext-java.spec index 849ae7c..c4db7fb 100644 --- a/gettext-java.spec +++ b/gettext-java.spec @@ -15,19 +15,20 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # -# norootforbuild - Name: gettext-java -BuildRequires: fdupes gcc-c++ gcc-java perl-libintl-perl tcl +BuildRequires: fdupes +BuildRequires: gcc-c++ +BuildRequires: gcc-java BuildRequires: libtool +BuildRequires: perl-libintl-perl +BuildRequires: tcl Url: http://www.gnu.org/software/gettext/ +Version: 0.18.1.1 +Release: 0 +Summary: Java Support for Native Language Support (NLS) License: LGPL-2.1+ Group: Development/Tools/Other -AutoReqProv: on -Version: 0.18.1.1 -Release: 2 -Summary: Java Support for Native Language Support (NLS) PreReq: %{install_info_prereq} BuildRoot: %{_tmppath}/%{name}-%{version}-build Source: gettext-%{version}.tar.bz2 diff --git a/gettext-runtime.changes b/gettext-runtime.changes index cdff0d4..eb89e5e 100644 --- a/gettext-runtime.changes +++ b/gettext-runtime.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Mon Jul 2 11:04:21 UTC 2012 - coolo@suse.com + +- do not use obsolete AM_PROG_MKDIR_P + ------------------------------------------------------------------- Thu Jan 12 15:57:24 UTC 2012 - aj@suse.de diff --git a/gettext-runtime.spec b/gettext-runtime.spec index 29a5642..35acd0f 100644 --- a/gettext-runtime.spec +++ b/gettext-runtime.spec @@ -15,20 +15,19 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # -# norootforbuild %define pacname gettext Name: gettext-runtime Version: 0.18.1.1 -Release: 2 -BuildRequires: gcc-c++ perl-libintl-perl tcl +Release: 0 +BuildRequires: gcc-c++ BuildRequires: libtool +BuildRequires: perl-libintl-perl +BuildRequires: tcl # To get an updated linkdupes.sh (in case there are new dupes), temproarily enable: #BuildRequires: fdupes Url: http://www.gnu.org/software/gettext/ -License: GPL-3.0+ ; LGPL-2.0+ -Group: Development/Tools/Other # bug437293 %ifarch ppc64 Obsoletes: gettext-64bit @@ -38,6 +37,8 @@ Obsoletes: gettext-64bit Provides: gettext = %{version} Obsoletes: gettext < %{version} Summary: Tools for Native Language Support (NLS) +License: GPL-3.0+ ; LGPL-2.0+ +Group: Development/Tools/Other PreReq: %{install_info_prereq} BuildRoot: %{_tmppath}/%{name}-%{version}-build Source: gettext-%{version}.tar.bz2 @@ -62,16 +63,9 @@ editing these catalogs (called PO files, for portable object) and adding translations. A special compiler turns these PO files into binary catalogs. - - -Authors: --------- - Ulrich Drepper - Bruno Haible - %package -n gettext-tools -License: LGPL-2.1+ Summary: Tools for Native Language Support (NLS) +License: LGPL-2.1+ Group: Development/Tools/Other Requires: %{name} = %{version} PreReq: info @@ -91,13 +85,6 @@ in editing these catalogs (called PO files, for portable object) and add translations. A special compiler will turn these PO files into binary catalogs. - - -Authors: --------- - Ulrich Drepper - Bruno Haible - %prep %setup -q -n %{pacname}-%{version} %patch