Hello community, here is the log from the commit of package librsync for openSUSE:Factory checked in at 2014-05-16 17:56:26 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/librsync (Old) and /work/SRC/openSUSE:Factory/.librsync.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "librsync" Changes: -------- --- /work/SRC/openSUSE:Factory/librsync/librsync.changes 2013-05-03 09:17:32.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.librsync.new/librsync.changes 2014-05-16 17:56:30.000000000 +0200 @@ -1,0 +2,12 @@ +Wed May 14 13:55:34 UTC 2014 - [email protected] + +- Remove accidentaly added file. + +------------------------------------------------------------------- +Tue May 13 13:21:43 UTC 2014 - [email protected] + +- Cleanup with spec-cleaner +- Add patch librsync-0.9.7-getopt.patch fixing debian bug#435894 + * makes rdiff avare of -i and -z getopt options + +------------------------------------------------------------------- Old: ---- series New: ---- librsync-0.9.7-getopt.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ librsync.spec ++++++ --- /var/tmp/diff_new_pack.BicVWN/_old 2014-05-16 17:56:30.000000000 +0200 +++ /var/tmp/diff_new_pack.BicVWN/_new 2014-05-16 17:56:30.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package librsync # -# Copyright (c) 2013 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 @@ -16,17 +16,13 @@ # -Name: librsync %define lname librsync1 -BuildRequires: libbz2-devel -BuildRequires: libtool -BuildRequires: popt-devel -BuildRequires: zlib-devel +Name: librsync +Version: 0.9.7 +Release: 0 Summary: A Library for Generating Network Deltas License: LGPL-2.1+ Group: Development/Libraries/C and C++ -Version: 0.9.7 -Release: 0 Url: http://librsync.sourceforge.net/ Source: http://prdownloads.sourceforge.net/rproxy/%{name}-%{version}.tar.bz2 Patch0: %{name}-%{version}-strictalias.diff @@ -35,6 +31,11 @@ Patch3: librsync-logn-sumset.patch Patch4: librsync-man-example.diff Patch5: librsync-serial-tests.patch +Patch6: librsync-0.9.7-getopt.patch +BuildRequires: libbz2-devel +BuildRequires: libtool +BuildRequires: popt-devel +BuildRequires: zlib-devel BuildRoot: %{_tmppath}/%{name}-%{version}-build %description @@ -43,14 +44,14 @@ file's checksum, so the two files need not both be present to generate a delta. -%package -n %lname +%package -n %{lname} Summary: A Library for Generating Network Deltas Group: System/Libraries # O/P added 2011-11-26 -Obsoletes: librsync < %version-%release -Provides: librsync = %version-%release +Obsoletes: librsync < %{version}-%{release} +Provides: librsync = %{version}-%{release} -%description -n %lname +%description -n %{lname} librsync implements the "rsync" algorithm, which allows remote differencing of binary files. librsync computes a delta relative to a file's checksum, so the two files need not both be present to generate @@ -59,7 +60,7 @@ %package devel Summary: Development files for librsync Group: Development/Libraries/C and C++ -Requires: %lname = %version +Requires: %{lname} = %{version} %description devel librsync implements the "rsync" algorithm, which allows remote @@ -82,24 +83,29 @@ %patch3 -p1 %patch4 -p1 %patch5 -p1 +%patch6 -p1 + +autoreconf -fvi + %build -autoreconf -fi -%configure --enable-shared --disable-static --with-pic +%configure \ + --enable-shared \ + --disable-static \ + --with-pic make %{?_smp_mflags} %install -%makeinstall -%{__rm} %{buildroot}%{_libdir}/librsync.la +make DESTDIR=%{buildroot} install %{?_smp_mflags} +rm %{buildroot}%{_libdir}/librsync.la %check -pushd testsuite make %{?_smp_mflags} check -%post -n %lname -p /sbin/ldconfig +%post -n %{lname} -p /sbin/ldconfig -%postun -n %lname -p /sbin/ldconfig +%postun -n %{lname} -p /sbin/ldconfig -%files -n %lname +%files -n %{lname} %defattr(-,root,root) %{_libdir}/librsync.so.1* %doc AUTHORS COPYING NEWS README THANKS TODO ++++++ librsync-0.9.7-getopt.patch ++++++ Patch by Daniel Baumann <[email protected]> for librsync >= 0.9.7, which makes rdiff aware of -i and -z getopt options mentioned in --help output. For further information, please have a look to Debian bug ID #435894. --- librsync-0.9.7/rdiff.c 2004-09-17 23:35:50.000000000 +0200 +++ librsync-0.9.7/rdiff.c.getopt 2008-12-20 13:45:58.000000000 +0100 @@ -97,8 +97,8 @@ { "sum-size", 'S', POPT_ARG_INT, &strong_len }, { "statistics", 's', POPT_ARG_NONE, &show_stats }, { "stats", 0, POPT_ARG_NONE, &show_stats }, - { "gzip", 0, POPT_ARG_NONE, 0, OPT_GZIP }, - { "bzip2", 0, POPT_ARG_NONE, 0, OPT_BZIP2 }, + { "gzip", 'z', POPT_ARG_NONE, 0, OPT_GZIP }, + { "bzip2", 'i', POPT_ARG_NONE, 0, OPT_BZIP2 }, { "paranoia", 0, POPT_ARG_NONE, &rs_roll_paranoia }, { 0 } }; -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
