Hello community, here is the log from the commit of package xdelta3 for openSUSE:Factory checked in at 2014-06-24 22:46:13 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/xdelta3 (Old) and /work/SRC/openSUSE:Factory/.xdelta3.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "xdelta3" Changes: -------- --- /work/SRC/openSUSE:Factory/xdelta3/xdelta3.changes 2011-11-08 18:01:07.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.xdelta3.new/xdelta3.changes 2014-06-24 22:46:34.000000000 +0200 @@ -1,0 +2,12 @@ +Tue Jun 24 13:29:03 UTC 2014 - [email protected] + +- fix 32-bit build (testsuite helper) +- added patches: + * xdelta3-regtest.patch +------------------------------------------------------------------- +Mon Jun 23 13:41:54 UTC 2014 - [email protected] + +- updated to 3.0.8: + * bugfixes, see http://xdelta.org/ for details + +------------------------------------------------------------------- Old: ---- xdelta3.0.0.tar.bz2 New: ---- xdelta3-3.0.8.tar.xz xdelta3-regtest.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ xdelta3.spec ++++++ --- /var/tmp/diff_new_pack.cqqsMT/_old 2014-06-24 22:46:35.000000000 +0200 +++ /var/tmp/diff_new_pack.cqqsMT/_new 2014-06-24 22:46:35.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package xdelta3 # -# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2014 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 @@ -15,17 +15,20 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # + Name: xdelta3 -Version: 3.0.0 -Release: 1 -Group: Productivity/Archiving/Compression +Version: 3.0.8 +Release: 0 +Summary: A diff utility which works with binary files License: GPL-2.0 +Group: Productivity/Archiving/Compression +Url: http://xdelta.org/ +Source: https://xdelta.googlecode.com/files/xdelta3-%{version}.tar.xz +# upstream bug https://code.google.com/p/xdelta/issues/detail?id=161 +Patch0: %{name}-regtest.patch BuildRequires: gcc-c++ BuildRequires: xz BuildRoot: %{_tmppath}/%{name}-%{version}-build -Url: http://xdelta.org/ -Source: xdelta%{version}.tar.bz2 -Summary: A diff utility which works with binary files %description Xdelta3 is a set of tools designed to compute changes between @@ -35,18 +38,22 @@ stored in RFC3284 (VCDIFF) format. %prep -%setup -n xdelta%{version} +%setup -q +%patch0 -p1 %build -make CFLAGS="$RPM_OPT_FLAGS -Wall -Wshadow -fno-builtin" +sed -i -e '/python/s:2.6:2:' testing/xdelta3-regtest.py || die +sed -i -e '/python/s:2.7:2:' testing/xdelta3-test.py || die +%configure +make CFLAGS="%{optflags} -Wall -Wshadow -fno-builtin" %{?_smp_mflags} %check -make test +./xdelta3regtest %install -%{__strip} %{name} -%{__mkdir} -p $RPM_BUILD_ROOT/%{_bindir} -%{__cp} %{name} $RPM_BUILD_ROOT/%{_bindir} +strip %{name} +mkdir -p %{buildroot}/%{_bindir} +cp %{name} %{buildroot}/%{_bindir} %files %defattr(-, root, root) ++++++ xdelta3-regtest.patch ++++++ https://lists.fedoraproject.org/pipermail/scm-commits/Week-of-Mon-20130617/1041497.html diff --git a/testing/regtest.cc b/testing/regtest.cc index 12b712e..8219cc0 100644 --- a/testing/regtest.cc +++ b/testing/regtest.cc @@ -12,7 +12,7 @@ public: Options() : encode_srcwin_maxsz(1<<20), block_size(Constants::BLOCK_SIZE), size_known(false) { } - size_t encode_srcwin_maxsz; + uint64_t encode_srcwin_maxsz; size_t block_size; bool size_known; }; -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
