Hello community, here is the log from the commit of package libmemcached for openSUSE:Factory checked in at 2014-01-13 10:53:30 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/libmemcached (Old) and /work/SRC/openSUSE:Factory/.libmemcached.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "libmemcached" Changes: -------- --- /work/SRC/openSUSE:Factory/libmemcached/libmemcached.changes 2013-04-19 09:58:29.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.libmemcached.new/libmemcached.changes 2014-01-13 10:53:32.000000000 +0100 @@ -1,0 +2,17 @@ +Sat Jan 4 23:08:40 UTC 2014 - dmuel...@suse.com + +- use rpmoptflags + +------------------------------------------------------------------- +Fri Aug 2 22:56:56 UTC 2013 - ch...@computersalat.de + +- update to 1.0.17 + * fix #1091599 Can not make a rpm package on CentOS 6.3 + * fix #1123153 increment/decrement can erroneously report + MEMCACHED_UNKNOWN_READ_FAILURE + * fix #1126601 Double clean up leads to accessing invalid memory +- rebase pthread patch +- add with-memcached patch + * http://bazaar.launchpad.net/~brianaker/libmemcached/1164440/revision/1158 + +------------------------------------------------------------------- Old: ---- libmemcached-1.0.16.tar.gz libmemcached-1.0.16.tar.gz.asc New: ---- libmemcached-1.0.17.tar.gz libmemcached-1.0.17.tar.gz.asc libmemcached-with-memcached.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libmemcached.spec ++++++ --- /var/tmp/diff_new_pack.D6bFW6/_old 2014-01-13 10:53:33.000000000 +0100 +++ /var/tmp/diff_new_pack.D6bFW6/_new 2014-01-13 10:53:33.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package libmemcached # -# 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 @@ -21,7 +21,7 @@ Summary: A C and C++ client library to the memcached server License: BSD-3-Clause Group: Development/Libraries/C and C++ -Version: 1.0.16 +Version: 1.0.17 Release: 0 Url: http://libmemcached.org Source0: https://launchpad.net/libmemcached/1.0/%{version}/+download/libmemcached-%{version}.tar.gz @@ -29,6 +29,8 @@ Source2: %{name}.keyring # PATCH-FIX-UPSTREAM libmemcached-pthread.patch lp#133614 dims...@opensuse.org -- Fix pthread detection Patch0: libmemcached-pthread.patch +# PATCH-FIX-UPSTREAM libmemcached-with-memcached.patch -- Fix --with-memchached bug: 'HAVE_MEMCACHED_BINARY' was not declared in this scope +Patch1: libmemcached-with-memcached.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build # List of additional build dependencies BuildRequires: bison @@ -96,6 +98,7 @@ %gpg_verify %{S:1} %setup -q %patch0 +%patch1 %build autoreconf -fiv @@ -103,10 +106,10 @@ --disable-static \ --enable-libmemcachedprotocol \ --with-memcached=%{_sbindir}/memcached -make %{?_smp_mflags} +make CFLAGS="-std=c99 %optflags" CXXFLAGS="%optflags" %{?_smp_mflags} %install -%makeinstall +%makeinstall CFLAGS="-std=c99 %optflags" CXXFLAGS="%optflags" %__rm -f %{buildroot}%{_libdir}/*.la %if 0%{?suse_version} > 1020 # create symlinks for man pages ++++++ libmemcached-1.0.16.tar.gz -> libmemcached-1.0.17.tar.gz ++++++ ++++ 14814 lines of diff (skipped) ++++++ libmemcached-pthread.patch ++++++ --- /var/tmp/diff_new_pack.D6bFW6/_old 2014-01-13 10:53:33.000000000 +0100 +++ /var/tmp/diff_new_pack.D6bFW6/_new 2014-01-13 10:53:33.000000000 +0100 @@ -1,7 +1,9 @@ === modified file 'm4/ax_pthread.m4' ---- m4/ax_pthread.m4 2012-07-27 04:00:47 +0000 -+++ m4/ax_pthread.m4 2012-11-09 03:56:45 +0000 -@@ -123,7 +123,7 @@ +Index: m4/ax_pthread.m4 +=================================================================== +--- m4/ax_pthread.m4.orig ++++ m4/ax_pthread.m4 +@@ -123,7 +123,7 @@ fi # which indicates that we try without any flags at all, and "pthread-config" # which is a program returning the flags for the Pth emulation library. @@ -10,5 +12,3 @@ # The ordering *is* (sometimes) important. Some notes on the # individual items follow: - - ++++++ libmemcached-with-memcached.patch ++++++ === modified file 'm4/ax_memcached.m4' Index: m4/ax_memcached.m4 =================================================================== --- m4/ax_memcached.m4.orig +++ m4/ax_memcached.m4 @@ -44,15 +44,26 @@ # (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -#serial 3 +#serial 4 AC_DEFUN([AX_PROG_MEMCACHED], - [AX_WITH_PROG([MEMCACHED_BINARY],[memcached]) - AS_IF([test -f "$ac_cv_path_MEMCACHED_BINARY"], - [AC_DEFINE([HAVE_MEMCACHED_BINARY], [1], [If Memcached binary is available]) - AC_DEFINE_UNQUOTED([MEMCACHED_BINARY],"$ac_cv_path_MEMCACHED_BINARY",[Name of the memcached binary used in make test]) - ax_memcached_version=`$MEMCACHED_BINARY -h | sed 1q | awk '{print \$ 2 }' | sed 's|[\-a-z0-9]*$||' | awk -F. '{printf "%d.%d.%d", $[]1, $[]2, $[]3}'` - AC_MSG_RESULT([memcached version "$ax_memcached_version"]) - AC_DEFINE_UNQUOTED([MEMCACHED_VERSION],"$ax_memcached_version",[Memcached binary version]) - ]) - ]) + [AX_WITH_PROG([MEMCACHED_BINARY],[memcached],[unknown]) + ax_memcached_success= + AS_IF([test x"$MEMCACHED_BINARY" != xunknown], + [AS_IF([test -x "$MEMCACHED_BINARY"], + [ax_memcached_version=`$MEMCACHED_BINARY -h | sed 1q | awk '{print \$ 2 }' | sed 's|[\-a-z0-9]*$||' | awk -F. '{printf "%d.%d.%d", $[]1, $[]2, $[]3}'` + AS_IF([test -n "$ax_memcached_version"], + [ax_memcached_success='ok' + AC_MSG_RESULT([memcached version "$ax_memcached_version"]) + AC_DEFINE_UNQUOTED([MEMCACHED_VERSION],"$ax_memcached_version",[Memcached binary version])]) + ]) + ]) + + AS_IF([test -n "$ax_memcached_success"], + [AC_DEFINE([HAVE_MEMCACHED_BINARY], [1], [If Memcached binary is available]) + AC_DEFINE_UNQUOTED([MEMCACHED_BINARY],"$MEMCACHED_BINARY",[Name of the memcached binary used in make test]) + ], + [AC_DEFINE([HAVE_MEMCACHED_BINARY], [0], [If Memcached binary is available]) + MEMCACHED_BINARY= + ]) + ]) -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org
