Merge bzr://10.0.3.21/ Build: jenkins-Libmemcached-463

[awesomized/libmemcached] / support / libmemcached.spec.in

diff --git a/support/libmemcached.spec.in b/support/libmemcached.spec.in
index 8dd8ec9d39111ef744837c2a71db9a1975aa3d65..a89e58d89d3ce3f58d03841f115e2d3cc2c83200 100644 (file)
--- a/support/libmemcached.spec.in
+++ b/support/libmemcached.spec.in
@@ -1,7 +1,7 @@
 Name:      libmemcached
 Summary:   memcached C library and command line tools
 Version:   @VERSION@
-Release:   1
+Release:   @RPM_RELEASE@
 License:   BSD
 Group:     System Environment/Libraries
 URL:       http://launchpad.net/libmemcached
@@ -10,7 +10,6 @@ Source0:   http://download.tangent.org/libmemcached-%{version}.tar.gz
 # For test suite
 BuildRequires: bash
 BuildRequires: binutils
-BuildRequires: ccache
 BuildRequires: coreutils
 BuildRequires: cpio
 BuildRequires: cyrus-sasl-devel
@@ -20,25 +19,19 @@ BuildRequires: file
 BuildRequires: findutils
 BuildRequires: gawk
 BuildRequires: gcc
-BuildRequires: gdb
 BuildRequires: glibc
 BuildRequires: glibc-common
 BuildRequires: glibc-devel
 BuildRequires: glibc-headers
 BuildRequires: grep
 BuildRequires: gzip
-BuildRequires: hostname
 BuildRequires: libevent-devel
 BuildRequires: libstdc++-devel
 BuildRequires: libuuid-devel
-BuildRequires: llvm-libs
 BuildRequires: make
 BuildRequires: memcached
-BuildRequires: mysql-libs
 BuildRequires: pkgconfig
-BuildRequires: protobuf-devel
 BuildRequires: python-sphinx
-BuildRequires: qt3
 BuildRequires: sed
 BuildRequires: tar
 
@@ -113,18 +106,14 @@ you will need to install %{name}-devel.
 %exclude %{_libdir}/libmemcached.la
 %exclude %{_libdir}/libhashkit.la
 %exclude %{_libdir}/libmemcachedutil.la
-%exclude %{_libdir}/libmemcachedprotocol.la
 %exclude %{_libdir}/libmemcached.a
 %exclude %{_libdir}/libhashkit.a
 %exclude %{_libdir}/libmemcachedutil.a
-%exclude %{_libdir}/libmemcachedprotocol.a
 %{_libdir}/libhashkit.so.2.0.0
 %{_libdir}/libmemcached.so.11.0.0
 %{_libdir}/libmemcachedutil.so.2.0.0
-%{_libdir}/libmemcachedprotocol.so.0.0.0
 %{_libdir}/libhashkit.so.2
 %{_libdir}/libmemcached.so.11
-%{_libdir}/libmemcachedprotocol.so.0
 %{_libdir}/libmemcachedutil.so.2
 %{_mandir}/man1/memaslap.1.gz
 %{_mandir}/man1/memcapable.1.gz
@@ -145,6 +134,7 @@ you will need to install %{name}-devel.
 %files devel
 %defattr (-,root,root,-) 
 %doc examples
+%{_datadir}/aclocal/ax_libmemcached.m4
 %{_includedir}/libhashkit/hashkit.h
 %{_includedir}/libhashkit-1.0/algorithm.h
 %{_includedir}/libhashkit-1.0/behavior.h
@@ -159,11 +149,6 @@ you will need to install %{name}-devel.
 %{_includedir}/libhashkit-1.0/types.h
 %{_includedir}/libhashkit-1.0/visibility.h
 
-%{_includedir}/libmemcachedprotocol-0.0/binary.h
-%{_includedir}/libmemcachedprotocol-0.0/callback.h
-%{_includedir}/libmemcachedprotocol-0.0/handler.h
-%{_includedir}/libmemcachedprotocol-0.0/vbucket.h
-
 %{_includedir}/libmemcachedutil-1.0/util.h
 %{_includedir}/libmemcachedutil-1.0/flush.h
 %{_includedir}/libmemcachedutil-1.0/pid.h
@@ -238,7 +223,6 @@ you will need to install %{name}-devel.
 
 %{_libdir}/libhashkit.so
 %{_libdir}/libmemcached.so
-%{_libdir}/libmemcachedprotocol.so
 %{_libdir}/libmemcachedutil.so
 %{_libdir}/pkgconfig/libmemcached.pc
 %{_mandir}/man3/hashkit_clone.3.gz