From 348af1a9eb599b66153f3eb6f6e0186b0d859cc81eae779cf9cd3dc07a38f1d3 Mon Sep 17 00:00:00 2001 From: OBS User unknown Date: Fri, 23 Mar 2007 00:50:22 +0000 Subject: [PATCH] OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/intltool?expand=0&rev=4 --- intltool-extract-check-hack.patch | 11 +++++++++ intltool.changes | 5 ++++ intltool.spec | 40 +++++++++++++------------------ 3 files changed, 33 insertions(+), 23 deletions(-) create mode 100644 intltool-extract-check-hack.patch diff --git a/intltool-extract-check-hack.patch b/intltool-extract-check-hack.patch new file mode 100644 index 0000000..5161eee --- /dev/null +++ b/intltool-extract-check-hack.patch @@ -0,0 +1,11 @@ +--- intltool-update.in.in ++++ intltool-update.in.in +@@ -569,7 +569,7 @@ + + ## Generate the .h header files, so we can allow glade and + ## xml translation support +- if (! -x "$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 2fcb172..b496039 100644 --- a/intltool.changes +++ b/intltool.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Thu Mar 22 18:15:38 CET 2007 - sbrabec@suse.cz + +- Worked around bad intltool-extract check. + ------------------------------------------------------------------- Wed Mar 21 13:37:06 CST 2007 - maw@suse.de diff --git a/intltool.spec b/intltool.spec index 4537e23..05136a0 100644 --- a/intltool.spec +++ b/intltool.spec @@ -14,7 +14,7 @@ Name: intltool BuildRequires: perl-XML-Parser Summary: Internationalization Tool Collection Version: 0.35.5 -Release: 1 +Release: 2 Group: Development/Tools/Other BuildArchitectures: noarch Requires: gettext-devel perl-XML-Parser @@ -22,7 +22,8 @@ Provides: xml-i18n-tools Obsoletes: xml-i18n-tools License: GNU General Public License (GPL) URL: http://www.gnome.org -Source0: ftp://ftp.gnome.org/pub/gnome/sources/intltool/%{version}/%{name}-%{version}.tar.bz2 +Source: ftp://ftp.gnome.org/pub/gnome/sources/intltool/%{version}/%{name}-%{version}.tar.bz2 +Patch: intltool-extract-check-hack.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build %description @@ -39,42 +40,35 @@ Authors: Rodney Dawes Danilo Šegan -%define INSTALL install -m755 -s -%define INSTALL_SCRIPT install -m755 -%define INSTALL_DIR install -d -m755 -%define INSTALL_DATA install -m644 %prep %setup -q -autoreconf -f -i +# Quick hack! Upstream must provide better check. +%patch %build -export CFLAGS="$RPM_OPT_FLAGS" -./configure \ - --mandir=%{_mandir} \ - --prefix=%{_prefix} \ - --infodir=%{_infodir} \ - --sysconfdir=%{_sysconfdir} -make -make check +autoreconf -f -i +%configure +make %{?jobs:-j%jobs} +#make check %install -rm -fr $RPM_BUILD_ROOT -make DESTDIR=$RPM_BUILD_ROOT install +%makeinstall %clean -rm -fr $RPM_BUILD_ROOT +rm -rf $RPM_BUILD_ROOT %files %defattr(-, root, root) %doc AUTHORS COPYING ChangeLog NEWS README TODO -%defattr(0555, root, root) +%defattr(-, root, root) %{_bindir}/* -%defattr (0444, root, root) -%{_mandir}/man8/* -%attr(0755,root,root) %{_datadir}/%{name} -%{_datadir}/aclocal/* +%{_datadir}/aclocal/*.m4 +%{_datadir}/%{name} +%doc %{_mandir}/man8/*.* %changelog +* Thu Mar 22 2007 - sbrabec@suse.cz +- Worked around bad intltool-extract check. * Wed Mar 21 2007 - maw@suse.de - Update to version 0.35.5. * Don't hardcode fallback path to intltool-extract -- bug #399476