From 03a0cc6f6121d111e1c192cb6e6e609fde1c9d5ac553133d085451f6074059ad Mon Sep 17 00:00:00 2001
From: OBS User unknown <null@suse.de>
Date: Sat, 7 Feb 2009 07:20:47 +0000
Subject: [PATCH] OBS-URL:
 https://build.opensuse.org/package/show/openSUSE:Factory/intltool?expand=0&rev=13

---
 intltool-extract-check-hack.patch | 13 -------------
 intltool.changes                  |  9 +++++++++
 intltool.spec                     | 22 ++++++++++++----------
 3 files changed, 21 insertions(+), 23 deletions(-)
 delete mode 100644 intltool-extract-check-hack.patch

diff --git a/intltool-extract-check-hack.patch b/intltool-extract-check-hack.patch
deleted file mode 100644
index 51e90b2..0000000
--- a/intltool-extract-check-hack.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: intltool-update.in
-===================================================================
---- intltool-update.in.orig
-+++ intltool-update.in
-@@ -629,7 +629,7 @@ sub GenerateHeaders
- 
-     ## Generate the .h header files, so we can allow glade and
-     ## xml translation support
--    if (! isProgramInPath ("$EXTRACT"))
-+    if (0)
-     {
- 	print STDERR "\n *** The intltool-extract script wasn't found!"
- 	     ."\n *** Without it, intltool-update can not generate files.\n";
diff --git a/intltool.changes b/intltool.changes
index 4842c42..2442515 100644
--- a/intltool.changes
+++ b/intltool.changes
@@ -1,3 +1,12 @@
+-------------------------------------------------------------------
+Fri Jan 30 15:06:58 CET 2009 - vuntz@novell.com
+
+- Requires gettext-tools instead of gettext-devel. Fix bnc#459088.
+- Drop intltool-extract-check-hack.patch: it shouldn't be needed
+  anymore since upstream now ships intltool-extract with intltool
+  instead of shipping it with each tarballs. So it's always
+  available.
+
 -------------------------------------------------------------------
 Sun Oct 12 04:36:14 EST 2008 - mboman@suse.de
 
diff --git a/intltool.spec b/intltool.spec
index 95ce6a0..c1b8ad1 100644
--- a/intltool.spec
+++ b/intltool.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package intltool (Version 0.40.5)
 #
-# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -22,17 +22,15 @@ Name:           intltool
 BuildRequires:  perl-XML-Parser
 Summary:        Internationalization Tool Collection
 Version:        0.40.5
-Release:        1
+Release:        3
 Group:          Development/Tools/Other
 BuildArch:      noarch
-Requires:       gettext-devel perl-XML-Parser
+Requires:       gettext-tools perl-XML-Parser
 Provides:       xml-i18n-tools
 Obsoletes:      xml-i18n-tools
 License:        GPL v2 or later
 Url:            http://www.gnome.org
 Source:         ftp://ftp.gnome.org/pub/gnome/sources/intltool/%{version}/%{name}-%{version}.tar.bz2
-# PATCH-FIX-OPENSUSE: intltool-extract-check-hack.patch sbrabec@suse.cz
-Patch:          intltool-extract-check-hack.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 
 %description
@@ -51,8 +49,6 @@ Authors:
 
 %prep
 %setup -q
-# Quick hack! Upstream must provide better check.
-%patch
 
 %build
 autoreconf -f -i
@@ -76,6 +72,12 @@ rm -rf $RPM_BUILD_ROOT
 %doc %{_mandir}/man8/*.*
 
 %changelog
+* Fri Jan 30 2009 vuntz@novell.com
+- Requires gettext-tools instead of gettext-devel. Fix bnc#459088.
+- Drop intltool-extract-check-hack.patch: it shouldn't be needed
+  anymore since upstream now ships intltool-extract with intltool
+  instead of shipping it with each tarballs. So it's always
+  available.
 * Sun Oct 12 2008 mboman@suse.de
 - Update to version 0.40.5:
   + Fixed bug bgo#554280
@@ -104,7 +106,7 @@ rm -rf $RPM_BUILD_ROOT
   + Bugs fixed: bgo#436241, bgo#377573, bgo#489135, bgo#490620,
   bgo#517559, bgo#508320, bgo#516501, bgo#518257, and bgo#509411
 - Respin intltool-extract-check-hack.patch.
-* Mon Mar 03 2008 maw@suse.de
+* Tue Mar 04 2008 maw@suse.de
 - Update to version 0.37.1:
   + Bugs fixed: bgo#508320, bgo#516501, bgo#518257, bgo#487818,
   bgo#487666, bgo#499590, bgo#493267, bgo#487817, bgo#499179,
@@ -131,7 +133,7 @@ rm -rf $RPM_BUILD_ROOT
 * Fri Feb 16 2007 maw@suse.de
 - Update to version 0.35.4.
   * Fix logic of checking for leftout files in builddir or srcdir
-* Thu Dec 21 2006 sreeves@suse.de
+* Fri Dec 22 2006 sreeves@suse.de
 - ver 0.35 of intltool is needed for Fate#301648.
   The menu editor we will use is alacarte which requires >=0.35 version
   of intltool. Talked with dobey, jpr and gekker and this rev (0.35.2) was
@@ -291,7 +293,7 @@ rm -rf $RPM_BUILD_ROOT
 - Apply xml-i18n-tools-prepare.diff to fix typo.
 * Fri May 18 2001 ke@suse.de
 - Update to version 0.8.4.
-* Thu Mar 01 2001 egger@suse.de
+* Fri Mar 02 2001 egger@suse.de
 - Updated to version 0.8.1.
 * Fri Feb 16 2001 hhetter@suse.de
 - Updated to version 0.8.