From 701215a33831d14a5fa40501df35b44e0655a3feb7ff8d586e314039dd0d7ba0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ismail=20D=C3=B6nmez?= Date: Thu, 12 May 2016 10:32:22 +0000 Subject: [PATCH] Accepting request 394908 from home:kstreitova:branches:devel:libraries:c_c++ - use spec-cleaner to clean specfile - remove unnecessary conditionals - update description and summary OBS-URL: https://build.opensuse.org/request/show/394908 OBS-URL: https://build.opensuse.org/package/show/devel:libraries:c_c++/libmemcached?expand=0&rev=50 --- libmemcached.changes | 7 +++++ libmemcached.spec | 69 +++++++++++++++++++------------------------- 2 files changed, 37 insertions(+), 39 deletions(-) diff --git a/libmemcached.changes b/libmemcached.changes index 06791f5..8220923 100644 --- a/libmemcached.changes +++ b/libmemcached.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Wed May 11 14:53:53 UTC 2016 - kstreitova@suse.com + +- use spec-cleaner to clean specfile +- remove unnecessary conditionals +- update description and summary + ------------------------------------------------------------------- Mon Feb 23 16:50:49 UTC 2015 - mrueckert@suse.de diff --git a/libmemcached.spec b/libmemcached.spec index acc339a..f619737 100644 --- a/libmemcached.spec +++ b/libmemcached.spec @@ -1,7 +1,7 @@ # # spec file for package libmemcached # -# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2016 SUSE LINUX 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,15 +16,15 @@ # -Name: libmemcached %define libsoname %{name}11 -Summary: A C and C++ client library to the memcached server -License: BSD-3-Clause -Group: Development/Libraries/C and C++ +Name: libmemcached Version: 1.0.18 Release: 0 +Summary: A C/C++ client library and tools for the memcached server +License: BSD-3-Clause +Group: Development/Libraries/C and C++ Url: http://libmemcached.org -Source0: https://launchpad.net/libmemcached/1.0/%{version}/+download/libmemcached-%{version}.tar.gz +Source0: https://launchpad.net/libmemcached/1.0/%{version}/+download/libmemcached-%{version}.tar.gz Source1: https://launchpad.net/libmemcached/1.0/%{version}/+download/libmemcached-%{version}.tar.gz.asc Source2: %{name}.keyring # PATCH-FIX-UPSTREAM libmemcached-pthread.patch lp#133614 dimstar@opensuse.org -- Fix pthread detection @@ -32,51 +32,48 @@ Patch0: libmemcached-pthread.patch Patch1: libmemcached-automake1_14.diff # PATCH-FIX-UPSTREAM libmemcached-no-docs-available.patch dimstar@opensuse.org -- Do not build docs if not VCS checkout Patch2: libmemcached-no-docs-available.patch -BuildRoot: %{_tmppath}/%{name}-%{version}-build # List of additional build dependencies BuildRequires: automake >= 1.13 BuildRequires: bison BuildRequires: cyrus-sasl-devel +# needed for man pages +BuildRequires: fdupes BuildRequires: gcc-c++ BuildRequires: libevent-devel BuildRequires: libtool BuildRequires: memcached BuildRequires: pkgconfig -# needed for man pages -BuildRequires: fdupes BuildRequires: python-Sphinx +BuildRoot: %{_tmppath}/%{name}-%{version}-build %description -Libmemcached is a C and C++ client library to the memcached server -(http://danga.com/memcached). It has been designed to be light on -memory usage, thread safe, and provide full access to server side -methods. +Libmemcached is a C/C++ client library and tools for the memcached server +(http://memcached.org/). It has been designed to be light on memory +usage, thread safe, and provide full access to server side methods. %package -n %{libsoname} -Summary: Libmemcached is a C and C++ client library to the memcached server +Summary: Libmemcached is a C/C++ client library and tools for the memcached server Group: System/Libraries %description -n %{libsoname} -Libmemcached is a C and C++ client library to the memcached server -(http://danga.com/memcached). It has been designed to be light on -memory usage, thread safe, and provide full access to server side -methods. +Libmemcached is a C/C++ client library and tools for the memcached server +(http://memcached.org/). It has been designed to be light on memory +usage, thread safe, and provide full access to server side methods. %package -n libmemcachedutil2 -Summary: Libmemcached is a C and C++ client library to the memcached server +Summary: Libmemcached is a C/C++ client library and tools for the memcached server Group: System/Libraries %description -n libmemcachedutil2 -Libmemcached is a C and C++ client library to the memcached server -(http://danga.com/memcached). It has been designed to be light on -memory usage, thread safe, and provide full access to server side -methods. +Libmemcached is a C/C++ client library and tools for the memcached server +(http://memcached.org/). It has been designed to be light on memory +usage, thread safe, and provide full access to server side methods. The libmemcachedutil library contains utility functions used by libmemcached. %package devel -Summary: Libmemcached is a C and C++ client library to the memcached server +Summary: Libmemcached is a C/C++ client library and tools for the memcached server Group: Development/Libraries/C and C++ Requires: %{libsoname} = %{version} Requires: %{name} = %{version} @@ -86,10 +83,9 @@ Requires: glibc-devel Requires: libmemcachedutil2 = %{version} %description devel -Libmemcached is a C and C++ client library to the memcached server -(http://danga.com/memcached). It has been designed to be light on -memory usage, thread safe, and provide full access to server side -methods. +Libmemcached is a C/C++ client library and tools for the memcached server +(http://memcached.org/). It has been designed to be light on memory +usage, thread safe, and provide full access to server side methods. %prep %setup -q @@ -102,25 +98,20 @@ autoreconf -fiv --disable-static \ --enable-libmemcachedprotocol \ --with-memcached=%{_sbindir}/memcached -make V=1 CFLAGS="-std=c99 %optflags" CXXFLAGS="%optflags" %{?_smp_mflags} +make V=1 CFLAGS="-std=c99 %{optflags}" CXXFLAGS="%{optflags}" %{?_smp_mflags} %install -%makeinstall V=1 CFLAGS="-std=c99 %optflags" CXXFLAGS="%optflags" -%__rm -f %{buildroot}%{_libdir}/*.la -%if 0%{?suse_version} > 1020 +make %{?_smp_mflags} DESTDIR=%{buildroot} install V=1 CFLAGS="-std=c99 %{optflags}" CXXFLAGS="%{optflags}" +find %{buildroot} -type f -name "*.la" -delete -print # create symlinks for man pages %fdupes -s %{buildroot}%{_mandir} -%endif # remove not needed files -%{__rm} -f %{buildroot}/usr/share/aclocal/ax_libmemcached.m4 +rm -f %{buildroot}%{_datadir}/aclocal/ax_libmemcached.m4 %post -n %{libsoname} -p /sbin/ldconfig - %postun -n %{libsoname} -p /sbin/ldconfig - %post -n libmemcachedutil2 -p /sbin/ldconfig - %postun -n libmemcachedutil2 -p /sbin/ldconfig %files @@ -138,7 +129,7 @@ make V=1 CFLAGS="-std=c99 %optflags" CXXFLAGS="%optflags" %{?_smp_mflags} %{_bindir}/memslap %{_bindir}/memstat %{_bindir}/memtouch -%doc %{_mandir}/man1/mem*.1* +%{_mandir}/man1/mem*.1* %files -n %{libsoname} %defattr(-,root,root) @@ -172,6 +163,6 @@ make V=1 CFLAGS="-std=c99 %optflags" CXXFLAGS="%optflags" %{?_smp_mflags} %{_libdir}/%{name}.so %{_libdir}/libmemcachedutil.so %{_libdir}/libmemcachedprotocol.so -%doc %{_mandir}/man3/*.3* +%{_mandir}/man3/*.3* %changelog