Hello community, here is the log from the commit of package nant checked in at Tue Nov 21 02:06:19 CET 2006. -------- --- nant/nant.changes 2006-10-27 18:59:25.000000000 +0200 +++ /mounts/work_src_done/NOARCH/nant/nant.changes 2006-11-21 01:15:51.000000000 +0100 @@ -1,0 +2,6 @@ +Tue Nov 21 01:13:11 CET 2006 - wberrier@suse.de + +- nant-remove_pkgconfig_garbage.patch: fix random builds failures + of nant and boo (mostly on 64bit archs). Workaround for now... + +------------------------------------------------------------------- New: ---- nant-remove_pkgconfig_garbage.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ nant.spec ++++++ --- /var/tmp/diff_new_pack.kQSPb1/_old 2006-11-21 02:05:50.000000000 +0100 +++ /var/tmp/diff_new_pack.kQSPb1/_new 2006-11-21 02:05:50.000000000 +0100 @@ -15,11 +15,12 @@ # nant's progression: 0.85-rc4, 0.85 # working rpm upgrade path requires: 0.85-rc4, 0.85.0 Version: 0.85.0 -Release: 2 -License: GNU General Public License (GPL) - all versions, GNU Library General Public License v. 2.0 and 2.1 (LGPL) +Release: 9 +License: GNU General Public License (GPL), GNU Library General Public License v. 2.0 and 2.1 (LGPL) BuildArch: noarch URL: http://nant.sourceforge.net Source0: %{name}-0.85-src.tar.gz +Patch0: nant-remove_pkgconfig_garbage.patch BuildRequires: mono-data mono-devel pkgconfig Summary: Ant for .NET Group: Development/Tools/Building @@ -51,6 +52,7 @@ /usr/lib/mono/gac/nunit.util %prep %setup -q -n %{name}-0.85 +%patch0 %build make @@ -82,6 +84,9 @@ rm -rf "$RPM_BUILD_ROOT" %changelog -n nant +* Tue Nov 21 2006 - wberrier@suse.de +- nant-remove_pkgconfig_garbage.patch: fix random builds failures + of nant and boo (mostly on 64bit archs). Workaround for now... * Fri Oct 27 2006 - dmueller@suse.de - don't build as root * Wed Oct 25 2006 - wberrier@suse.de ++++++ nant-remove_pkgconfig_garbage.patch ++++++ diff -ur ../../nant-0.85/src/NAnt.Core/Functions/PkgConfigFunctions.cs ./src/NAnt.Core/Functions/PkgConfigFunctions.cs --- ../../nant-0.85/src/NAnt.Core/Functions/PkgConfigFunctions.cs 2005-10-10 16:51:26.000000000 +0200 +++ ./src/NAnt.Core/Functions/PkgConfigFunctions.cs 2006-11-21 00:35:28.000000000 +0100 @@ -260,7 +260,8 @@ execTask.Execute(); ms.Position = 0; StreamReader sr = new StreamReader(ms); - string output = sr.ReadLine(); + // Temporary workaround Replace \x00 that sometimes gets returned by this on 64bit... ? + string output = sr.ReadLine().Replace("\x00", ""); sr.Close(); return output; } catch (Exception ex) { ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org