- add upstream changeset 674 (GNOME bz#413461 - fix intltool-extract path)

This commit is contained in:
Bill Nottingham 2007-03-19 17:55:49 +00:00
parent fbcfa5b492
commit 3e23f0dabf
2 changed files with 31 additions and 1 deletions

View File

@ -0,0 +1,25 @@
--- trunk/intltool-update.in.in 2007/02/14 04:12:19 671
+++ trunk/intltool-update.in.in 2007/03/02 16:43:19 674
@@ -563,13 +563,21 @@
exit 1;
}
+sub isIntltoolExtractInPath
+{
+ my ($file) = @_;
+ # If either a file exists, or when run it returns 0 exit status
+ return 1 if ((-x $file) or (system("$file >/dev/null") == 0));
+ return 0;
+}
+
sub GenerateHeaders
{
my $EXTRACT = $ENV{"INTLTOOL_EXTRACT"} || "intltool-extract";
## Generate the .h header files, so we can allow glade and
## xml translation support
- if (! -x "$EXTRACT")
+ if (! isIntltoolExtractInPath("$EXTRACT"))
{
print STDERR "\n *** The intltool-extract script wasn't found!"
."\n *** Without it, intltool-update can not generate files.\n";

View File

@ -1,12 +1,13 @@
Name: intltool
Summary: Utility for internationalizing various kinds of data files
Version: 0.35.5
Release: 1%{?dist}
Release: 2%{?dist}
License: GPL
Group: Development/Tools
Source: http://ftp.gnome.org/pub/gnome/sources/intltool/0.35/%{name}-%{version}.tar.bz2
URL: http://www.gnome.org
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Patch: intltool-0.35.5-path.patch
Requires: patch
Obsoletes: xml-i18n-tools
Provides: xml-i18n-tools = 0.11
@ -21,6 +22,7 @@ them in the po files.
%prep
%setup -q
%patch -p1 -b .path
%build
%configure
@ -44,6 +46,9 @@ make
%{_mandir}/man*/*
%changelog
* Mon Mar 19 2007 Bill Nottingham <notting@redhat.com> - 0.35.5-2
- add upstream changeset 674 (GNOME bz#413461 - fix intltool-extract path)
* Sat Feb 24 2007 Matthias Clasen <mclasen@redhat.com> - 0.35.5-1
- Update to 0.35.5