[libmemcached/f18] revert unwanted update

Remi Collet remi at fedoraproject.org
Mon Feb 4 16:45:14 UTC 2013 

commit e5978a5718f9c5fb2240117f96d38555e1d7a2d7
Author: Remi Collet <remi at fedoraproject.org>
Date:   Mon Feb 4 17:45:01 2013 +0100

    revert unwanted update

 .gitignore        |    9 +---
 libmemcached.spec |  125 +++++++++++-----------------------------------------
 sources           |    2 +-
 3 files changed, 29 insertions(+), 107 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index c0d8d5a..9a130a2 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,5 +1,4 @@
-clog
-*spec~
+*~
 /libmemcached-0.49-exhsieh.tar.gz
 /libmemcached-0.51-exhsieh.tar.gz
 /libmemcached-0.52-exhsieh.tar.gz
@@ -9,9 +8,3 @@ clog
 /libmemcached-1.0.6-exhsieh.tar.gz
 /libmemcached-1.0.7-exhsieh.tar.gz
 /libmemcached-1.0.8-exhsieh.tar.gz
-/libmemcached-1.0.11-exhsieh.tar.gz
-/libmemcached-1.0.12-exhsieh.tar.gz
-/libmemcached-1.0.13-exhsieh.tar.gz
-/libmemcached-1.0.14-exhsieh.tar.gz
-/libmemcached-1.0.15-exhsieh.tar.gz
-/libmemcached-1.0.16-exhsieh.tar.gz
diff --git a/libmemcached.spec b/libmemcached.spec
index b81ce74..5767ebb 100644
--- a/libmemcached.spec
+++ b/libmemcached.spec
@@ -1,11 +1,9 @@
-# Regression tests take a long time, you can skip 'em with this
-%{!?runselftest: %{expand: %%global runselftest 1}}
-%global with_sasl        1
+%global with_tests       %{?_with_tests:1}%{!?_with_tests:0}
 
 Name:      libmemcached
 Summary:   Client library and command line tools for memcached server
-Version:   1.0.16
-Release:   1%{?dist}
+Version:   1.0.8
+Release:   2%{?dist}
 License:   BSD
 Group:     System Environment/Libraries
 URL:       http://libmemcached.org/
@@ -18,17 +16,17 @@ URL:       http://libmemcached.org/
 Source0:   libmemcached-%{version}-exhsieh.tar.gz
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-%if %{with_sasl}
 BuildRequires: cyrus-sasl-devel
-%endif
-BuildRequires: flex
-BuildRequires: bison
-BuildRequires: python-sphinx
+BuildRequires: flex bison
+%if %{with_tests}
 BuildRequires: memcached
+%endif
 %if 0%{?fedora} >= 12 || 0%{?rhel} >= 6
 BuildRequires: systemtap-sdt-devel
 %endif
+%if 0%{?fedora} >= 11 || 0%{?rhel} >= 5
 BuildRequires: libevent-devel
+%endif
 
 
 %description
@@ -38,7 +36,6 @@ usage, and provide full access to server side methods.
 
 It also implements several command line tools:
 
-memaslap    Load testing and benchmarking a server
 memcapable  Checking a Memcached server capibilities and compatibility
 memcat      Copy the value of a key to standard output
 memcp       Copy data to a server
@@ -59,9 +56,7 @@ Summary: Header files and development libraries for %{name}
 Group: Development/Libraries
 Requires: %{name}%{?_isa} = %{version}-%{release}
 Requires: pkgconfig
-%if %{with_sasl}
 Requires: cyrus-sasl-devel%{?_isa}
-%endif
 
 %description devel
 This package contains the header files and development libraries
@@ -75,28 +70,20 @@ you will need to install %{name}-devel.
 mkdir examples
 cp -p tests/*.{cc,h} examples/
 
+# Will be regenerated during build
+%if 0%{?fedora} > 9 || 0%{?rhel} > 5
+rm -f libmemcached/csl/{parser,scanner}.cc
+%endif
+
+# Temporary fix for SASL detection
+sed -i -e s/ax_cv_sasl/ac_enable_sasl/ configure
+
 
 %build
 # option --with-memcached=false to disable server binary check (as we don't run test)
-%configure \
-%if %{runselftest}
-   --with-memcached=%{_bindir}/memcached \
-%else
-   --with-memcached=false \
-%endif
-%if %{with_sasl}
-   --enable-sasl \
-%else
-   --disable-sasl \
-%endif
-   --enable-libmemcachedprotocol \
-   --enable-memaslap \
-   --enable-dtrace \
-   --disable-static
-
-%if 0%{?fedora} < 14 && 0%{?rhel} < 7
-# for warning: unknown option after '#pragma GCC diagnostic' kind
-sed -e 's/-Werror//' -i Makefile
+%configure --disable-static \
+%if ! %{with_tests}
+   --with-memcached=false
 %endif
 
 make %{_smp_mflags}
@@ -106,27 +93,15 @@ make %{_smp_mflags}
 rm -rf %{buildroot}
 make install  DESTDIR="%{buildroot}" AM_INSTALL_PROGRAM_FLAGS=""
 
-# Hack: when sphinx-build too old (fedora < 14 and rhel < 7)
-# install upstream provided man pages
-if [ ! -d %{buildroot}%{_mandir}/man1 ]; then
-   install -d %{buildroot}%{_mandir}/man1
-   install -p -m 644 man/*1 %{buildroot}%{_mandir}/man1
-   install -d %{buildroot}%{_mandir}/man3
-   install -p -m 644 man/*3 %{buildroot}%{_mandir}/man3
-fi
-
 
 %check
-%if %{runselftest}
-make test 2>&1 | tee rpmtests.log
-# Ignore test result for memaslap (XFAIL but PASS)
-# https://bugs.launchpad.net/libmemcached/+bug/1115357
-if grep "XPASS: clients/memaslap" rpmtests.log && grep "1 of 21" rpmtests.log
-then
-  exit 0
-else
-  exit 1
-fi
+%if %{with_tests}
+# test suite cannot run in mock (same port use for memcache servers on all arch)
+# All tests completed successfully
+# diff output.res output.cmp fails but result depend on server version
+make test
+%else
+echo 'Test suite disabled (missing "--with tests" option)'
 %endif
 
 
@@ -146,7 +121,7 @@ rm -rf %{buildroot}
 %{_bindir}/mem*
 %exclude %{_libdir}/lib*.la
 %{_libdir}/libhashkit.so.2*
-%{_libdir}/libmemcached.so.11*
+%{_libdir}/libmemcached.so.10*
 %{_libdir}/libmemcachedprotocol.so.0*
 %{_libdir}/libmemcachedutil.so.2*
 %{_mandir}/man1/mem*
@@ -166,7 +141,6 @@ rm -rf %{buildroot}
 %{_libdir}/libmemcachedprotocol.so
 %{_libdir}/libmemcachedutil.so
 %{_libdir}/pkgconfig/libmemcached.pc
-%{_datadir}/aclocal/ax_libmemcached.m4
 %{_mandir}/man3/libmemcached*
 %{_mandir}/man3/libhashkit*
 %{_mandir}/man3/memcached*
@@ -174,51 +148,6 @@ rm -rf %{buildroot}
 
 
 %changelog
-* Mon Feb  4 2013 Remi Collet <remi at fedoraproject.org> - 1.0.16-1
-- update to 1.0.16
-- ignore test result for memaslap (XFAIL but PASS)
-  https://bugs.launchpad.net/libmemcached/+bug/1115357
-
-* Sat Dec 29 2012 Remi Collet <remi at fedoraproject.org> - 1.0.15-1
-- update to 1.0.15
-- libmemcachedprotocol is back
-- add memaslap command line tool
-- report various issues to upstream
-  https://bugs.launchpad.net/libmemcached/+bug/1094413 (libevent)
-  https://bugs.launchpad.net/libmemcached/+bug/1094414 (c99 MODE)
-
-* Sat Nov 17 2012 Remi Collet <remi at fedoraproject.org> - 1.0.14-1
-- update to 1.0.14
-- libmemcachedprotocol removed
-- sasl support is back
-- run test during build
-- report various issues to upstream
-  https://bugs.launchpad.net/libmemcached/+bug/1079994 (bigendian)
-  https://bugs.launchpad.net/libmemcached/+bug/1079995 (config.h)
-  https://bugs.launchpad.net/libmemcached/+bug/1079996 (dtrace)
-  https://bugs.launchpad.net/libmemcached/+bug/1079997 (-ldl)
-  https://bugs.launchpad.net/libmemcached/+bug/1080000 (touch)
-
-* Sat Oct 20 2012 Remi Collet <remi at fedoraproject.org> - 1.0.13-1
-- update to 1.0.13
-
-* Fri Oct 19 2012 Remi Collet <remi at fedoraproject.org> - 1.0.12-2
-- temporary hack: fix LIBMEMCACHED_VERSION_HEX value
-
-* Thu Oct 11 2012 Remi Collet <remi at fedoraproject.org> - 1.0.12-1
-- update to 1.0.12
-- add aclocal/ax_lib_libmemcached.m4
-- abi-compliance-checker verdict : Compatible
-- uggly hack for man pages
-
-* Tue Sep 25 2012 Karsten Hopp <karsten at redhat.com> 1.0.11-2
-- fix defined but not used variable error on bigendian machines
-
-* Sat Sep 22 2012 Remi Collet <remi at fedoraproject.org> - 1.0.11-1
-- update to 1.0.11, soname bump to libmemcached.so.11
-- drop broken SASL support
-- don't generate parser (bison 2.6 not supported)
-
 * Thu Jul 19 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.0.8-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
 
diff --git a/sources b/sources
index 203f265..f1fb63f 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-3cc0390d7e73386f24fae23046cad3fc  libmemcached-1.0.16-exhsieh.tar.gz
+77b498b794396ef6c19d1141516353f0  libmemcached-1.0.8-exhsieh.tar.gz

More information about the scm-commits mailing list