Hello community,
here is the log from the commit of package intltool
checked in at Fri Mar 23 01:50:22 CET 2007.
--------
--- GNOME/intltool/intltool.changes 2007-03-22 12:08:29.000000000 +0100
+++ /mounts/work_src_done/NOARCH/intltool/intltool.changes 2007-03-22 18:16:09.000000000 +0100
@@ -1,0 +2,5 @@
+Thu Mar 22 18:15:38 CET 2007 - sbrabec@suse.cz
+
+- Worked around bad intltool-extract check.
+
+-------------------------------------------------------------------
New:
----
intltool-extract-check-hack.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ intltool.spec ++++++
--- /var/tmp/diff_new_pack.js7262/_old 2007-03-23 01:50:14.000000000 +0100
+++ /var/tmp/diff_new_pack.js7262/_new 2007-03-23 01:50:14.000000000 +0100
@@ -14,7 +14,7 @@
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 @@
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 @@
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
++++++ intltool-extract-check-hack.patch ++++++
--- 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";
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org