From 4bc647d2526c5b974023ba821454d85c84adc16303e9716712efefc1bda7ed51 Mon Sep 17 00:00:00 2001
From: OBS User unknown <null@suse.de>
Date: Fri, 23 Nov 2007 16:14:52 +0000
Subject: [PATCH] OBS-URL:
https://build.opensuse.org/package/show/openSUSE:Factory/gettext-runtime?expand=0&rev=2
---
gettext-csharp.changes | 5 +++++
gettext-csharp.spec | 6 +++---
gettext-disable_test.patch | 11 -----------
gettext-java.changes | 5 +++++
gettext-java.spec | 6 +++---
gettext-runtime.changes | 7 +++++++
gettext-runtime.spec | 17 ++++++++++-------
7 files changed, 33 insertions(+), 24 deletions(-)
delete mode 100644 gettext-disable_test.patch
diff --git a/gettext-csharp.changes b/gettext-csharp.changes
index 2d1fab9..590d045 100644
--- a/gettext-csharp.changes
+++ b/gettext-csharp.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Fri Nov 23 14:47:34 CET 2007 - pth@suse.de
+
+- Remove the patch for disabling a test.
+
-------------------------------------------------------------------
Fri Nov 16 13:59:43 CET 2007 - pth@suse.de
diff --git a/gettext-csharp.spec b/gettext-csharp.spec
index c5e00cb..bb8c71a 100644
--- a/gettext-csharp.spec
+++ b/gettext-csharp.spec
@@ -18,7 +18,7 @@ License: LGPL v2.1 or later
Group: Development/Tools/Other
AutoReqProv: on
Version: 0.17
-Release: 1
+Release: 2
Summary: Native Language Support (NLS) for C#
PreReq: %{install_info_prereq}
BuildRoot: %{_tmppath}/%{name}-%{version}-build
@@ -35,7 +35,6 @@ Patch6: gettext-0.15-docdir.diff
Patch7: gettext-autotools.patch
Patch8: gettext-gl_AC_TYPE_LONG_LONG.patch
Patch9: gettext-needlessly_init_vars.patch
-Patch10: gettext-disable_test.patch
%description
Mono with its 'resgen' program uses a design that Microsoft created and
@@ -75,7 +74,6 @@ Authors:
%patch7
%patch8
%patch9
-%patch10
pushd gettext-tools/misc
tar xfz archive.tar.gz
find . -name gettext.m4,v -print0 | xargs -0 perl -spi -e 's/\(int\) /\(long\) /g'
@@ -130,6 +128,8 @@ rm -rf $RPM_BUILD_ROOT
%_libdir/gettext/msgunfmt.net.exe
%changelog
+* Fri Nov 23 2007 - pth@suse.de
+- Remove the patch for disabling a test.
* Fri Nov 16 2007 - pth@suse.de
- Don't run the testsuite.
* Thu Nov 15 2007 - pth@suse.de
diff --git a/gettext-disable_test.patch b/gettext-disable_test.patch
deleted file mode 100644
index 8299e78..0000000
--- a/gettext-disable_test.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- gettext-tools/tests/Makefile.am
-+++ gettext-tools/tests/Makefile.am
-@@ -55,7 +55,7 @@
- msgmerge-13 msgmerge-14 msgmerge-15 msgmerge-16 msgmerge-17 \
- msgmerge-18 msgmerge-19 msgmerge-20 msgmerge-21 msgmerge-22 \
- msgmerge-compendium-1 msgmerge-compendium-2 msgmerge-compendium-3 \
-- msgmerge-compendium-4 msgmerge-compendium-5 msgmerge-compendium-6 \
-+ msgmerge-compendium-4 msgmerge-compendium-6 \
- msgmerge-properties-1 msgmerge-properties-2 \
- msgmerge-update-1 msgmerge-update-2 msgmerge-update-3 \
- msgunfmt-1 msgunfmt-2 \
diff --git a/gettext-java.changes b/gettext-java.changes
index ee6f789..65ee07e 100644
--- a/gettext-java.changes
+++ b/gettext-java.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Fri Nov 23 14:48:47 CET 2007 - pth@suse.de
+
+- Remove the patch for disabling a test.
+
-------------------------------------------------------------------
Fri Nov 16 14:00:51 CET 2007 - pth@suse.de
diff --git a/gettext-java.spec b/gettext-java.spec
index 1eb8921..88db4db 100644
--- a/gettext-java.spec
+++ b/gettext-java.spec
@@ -17,7 +17,7 @@ License: LGPL v2.1 or later
Group: Development/Tools/Other
AutoReqProv: on
Version: 0.17
-Release: 1
+Release: 2
Summary: Java Support for Native Language Support (NLS)
PreReq: %{install_info_prereq}
BuildRoot: %{_tmppath}/%{name}-%{version}-build
@@ -34,7 +34,6 @@ Patch6: gettext-0.15-docdir.diff
Patch7: gettext-autotools.patch
Patch8: gettext-gl_AC_TYPE_LONG_LONG.patch
Patch9: gettext-needlessly_init_vars.patch
-Patch10: gettext-disable_test.patch
%description
This package includes the tools needed to support message catalogs in
@@ -59,7 +58,6 @@ Authors:
%patch7
%patch8
%patch9
-%patch10
pushd gettext-tools/misc
tar xfz archive.tar.gz
find . -name gettext.m4,v -print0 | xargs -0 perl -spi -e 's/\(int\) /\(long\) /g'
@@ -134,6 +132,8 @@ rm -rf $RPM_BUILD_ROOT
%_libdir/gettext/gnu.gettext.GetURL
%changelog
+* Fri Nov 23 2007 - pth@suse.de
+- Remove the patch for disabling a test.
* Fri Nov 16 2007 - pth@suse.de
- Don't run the testsuite.
* Thu Nov 15 2007 - pth@suse.de
diff --git a/gettext-runtime.changes b/gettext-runtime.changes
index 7658e03..8d1f267 100644
--- a/gettext-runtime.changes
+++ b/gettext-runtime.changes
@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Fri Nov 23 14:43:11 CET 2007 - pth@suse.de
+
+- Reenable msgmerge-compendium-5 now that gcc has been fixed.
+- Change Provides/Obsoletes to match guidelines
+- Add Comment as to when the rename happened.
+
-------------------------------------------------------------------
Thu Nov 15 12:51:17 CET 2007 - pth@suse.de
diff --git a/gettext-runtime.spec b/gettext-runtime.spec
index 99aed90..7d9a7e4 100644
--- a/gettext-runtime.spec
+++ b/gettext-runtime.spec
@@ -18,10 +18,11 @@ BuildRequires: gcc-c++ perl-libintl-perl tcl
Url: http://www.gnu.org/software/gettext/
License: GPL v3 or later; LGPL v2.0 or later
Group: Development/Tools/Other
-Provides: gettext < 0.17
-Obsoletes: gettext < 0.17
+#Rename done for openSUSE 11.0
+Provides: gettext = %{version}
+Obsoletes: gettext < %{version}
Version: 0.17
-Release: 1
+Release: 2
Summary: Tools for Native Language Support (NLS)
PreReq: %{install_info_prereq}
BuildRoot: %{_tmppath}/%{name}-%{version}-build
@@ -38,7 +39,6 @@ Patch6: gettext-0.15-docdir.diff
Patch7: gettext-autotools.patch
Patch8: gettext-gl_AC_TYPE_LONG_LONG.patch
Patch9: gettext-needlessly_init_vars.patch
-Patch10: gettext-disable_test.patch
%description
This package contains the intl library as well as tools that ease the
@@ -59,8 +59,8 @@ Authors:
Summary: Tools for Native Language Support (NLS)
Group: Development/Tools/Other
Requires: %{name} = %{version} cvs
-Provides: gettext-devel < 0.17
-Obsoletes: gettext-devel < 0.17
+Provides: gettext-devel = %{version}
+Obsoletes: gettext-devel < %{version}
%description -n gettext-tools
This package contains the `intl' library as well as tools that ease the
@@ -88,7 +88,6 @@ Authors:
%patch7
%patch8
%patch9
-%patch10
pushd gettext-tools/misc
tar xfz archive.tar.gz
find . -name gettext.m4,v -print0 | xargs -0 perl -spi -e 's/\(int\) /\(long\) /g'
@@ -250,6 +249,10 @@ rm -rf $RPM_BUILD_ROOT
%_datadir/aclocal/*
%changelog
+* Fri Nov 23 2007 - pth@suse.de
+- Reenable msgmerge-compendium-5 now that gcc has been fixed.
+- Change Provides/Obsoletes to match guidelines
+- Add Comment as to when the rename happened.
* Thu Nov 15 2007 - pth@suse.de
- Rename packages: gettext -> gettext-runtime and
gettext-devel -> gettext->tools