[libmemcached/el5/master] import libmemcached 0.31 in EL-5 and keep EVR < version in RHEL-6
Remi Collet
remi at fedoraproject.org
Sat Jan 29 06:56:22 UTC 2011
commit 3c2584569b0ebd994f88c6651fd6c57224677524
Author: remi <fedora at famillecollet.com>
Date: Sat Jan 29 07:56:00 2011 +0100
import libmemcached 0.31 in EL-5 and keep EVR < version in RHEL-6
.gitignore | 5 +--
libmemcached-sasl.patch | 22 -------------
libmemcached.spec | 78 ++++++++++------------------------------------
sources | 2 +-
strip-hsieh.sh | 12 ++-----
5 files changed, 22 insertions(+), 97 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index b4ecd53..7786814 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,4 +1 @@
-libmemcached-0.42.tar.gz
-libmemcached-0.43.tar.gz
-/libmemcached-0.44.tar.gz
-/libmemcached-0.44-exhsieh.tar.gz
+/libmemcached-0.31-exhsieh.tar.gz
diff --git a/libmemcached.spec b/libmemcached.spec
index fd5c101..1f46a0f 100644
--- a/libmemcached.spec
+++ b/libmemcached.spec
@@ -1,28 +1,20 @@
Name: libmemcached
Summary: Client library and command line tools for memcached server
-Version: 0.44
-Release: 4%{?dist}
+Version: 0.31
+Release: 1.1%{?dist}
License: BSD
Group: System Environment/Libraries
-URL: http://libmemcached.org/
-# Original sources:
-# http://launchpad.net/libmemcached/1.0/%{version}/+download/libmemcached-%{version}.tar.gz
-# The source tarball must be repackaged to remove the Hsieh hash
-# code, since the license is non-free. When upgrading, download the new
-# source tarball, and run "./strip-hsieh.sh <version>" to produce the
-# "-exhsieh" tarball.
-Source0: libmemcached-%{version}-exhsieh.tar.gz
-
-# Add -lsasl2 to libmemcached.pc
-# See http://lists.libmemcached.org/pipermail/libmemcached-discuss/2010-October/002207.html
-Patch0: libmemcached-sasl.patch
+URL: http://tangent.org/552/libmemcached.html
+
+# Original source: http://download.tangent.org/libmemcached-%{version}.tar.gz
+# Repackaged without Hsieh-licensed code using strip-hsieh.sh
+Source0: libmemcached-%{version}-exhsieh.tar.gz
+Source1: strip-hsieh.sh
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires: cyrus-sasl-devel
# checked during configure (for test suite)
BuildRequires: memcached
-# We patch .m4 files
-BuildRequires: libtool autoconf automake
+
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
%description
@@ -46,7 +38,6 @@ Summary: Header files and development libraries for %{name}
Group: Development/Libraries
Requires: %{name} = %{version}-%{release}
Requires: pkgconfig
-Requires: cyrus-sasl-devel
%description devel
This package contains the header files and development libraries
@@ -57,14 +48,11 @@ you will need to install %{name}-devel.
%prep
%setup -q
-%patch0 -p1 -b .sasl
-
%{__mkdir} examples
%{__cp} -p tests/*.{c,cpp,h} examples/
%build
-config/autorun.sh
%configure
%{__make} %{_smp_mflags}
@@ -96,14 +84,12 @@ config/autorun.sh
%defattr (-,root,root,-)
%doc AUTHORS COPYING README THANKS TODO ChangeLog
%{_bindir}/mem*
+%exclude %{_libdir}/libmemcached.a
%exclude %{_libdir}/libmemcached.la
-%exclude %{_libdir}/libmemcachedprotocol.la
+%exclude %{_libdir}/libmemcachedutil.a
%exclude %{_libdir}/libmemcachedutil.la
-%exclude %{_libdir}/libhashkit.la
-%{_libdir}/libhashkit.so.0*
-%{_libdir}/libmemcached.so.6*
-%{_libdir}/libmemcachedprotocol.so.0*
-%{_libdir}/libmemcachedutil.so.1*
+%{_libdir}/libmemcached.so.*
+%{_libdir}/libmemcachedutil.so.*
%{_mandir}/man1/mem*
@@ -111,47 +97,17 @@ config/autorun.sh
%defattr (-,root,root,-)
%doc examples
%{_includedir}/libmemcached
-%{_includedir}/libhashkit
-%{_libdir}/libhashkit.so
%{_libdir}/libmemcached.so
-%{_libdir}/libmemcachedprotocol.so
%{_libdir}/libmemcachedutil.so
%{_libdir}/pkgconfig/libmemcached.pc
+%{_libdir}/libmemcached.so
%{_mandir}/man3/libmemcached*.3.gz
%{_mandir}/man3/memcached_*.3.gz
-%{_mandir}/man3/hashkit*
%changelog
-* Wed Nov 24 2010 Joe Orton <jorton at redhat.com> - 0.44-4
-- repackage source tarball to remove non-free Hsieh hash code
-
-* Sat Oct 02 2010 Remi Collet <Fedora at famillecollet.com> - 0.44-3
-- improves SASL patch
-
-* Sat Oct 02 2010 Remi Collet <Fedora at famillecollet.com> - 0.44-2
-- enable SASL support
-
-* Fri Oct 01 2010 Remi Collet <Fedora at famillecollet.com> - 0.44-1
-- update to 0.44
-- add soname version in %%file to detect change
-
-* Fri Jul 30 2010 Remi Collet <Fedora at famillecollet.com> - 0.43-1
-- update to 0.43
-
-* Wed Jul 07 2010 Remi Collet <Fedora at famillecollet.com> - 0.42-1
-- update to 0.42
-
-* Tue May 04 2010 Remi Collet <Fedora at famillecollet.com> - 0.40-1
-- update to 0.40 (new soname for libmemcached.so.5)
-- new URI (site + source)
-
-* Sat Mar 13 2010 Remi Collet <Fedora at famillecollet.com> - 0.38-1
-- update to 0.38
-
-* Sat Feb 06 2010 Remi Collet <Fedora at famillecollet.com> - 0.37-1
-- update to 0.37 (soname bump)
-- new libhashkit (should be a separated project in the futur)
+* Thu Jun 24 2010 Joe Orton <jorton at redhat.com> - 0.31-1.1
+- use repackaged tarball, without hsieh_hash.c (#607590)
* Sun Sep 13 2009 Remi Collet <Fedora at famillecollet.com> - 0.31-1
- update to 0.31
diff --git a/sources b/sources
index ed3cead..d22fa31 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-7c7feb35b31e5d2e44165c1e9284267e libmemcached-0.44-exhsieh.tar.gz
+c89ee6ae6e69b397e4b9424b1cf4e003 libmemcached-0.31-exhsieh.tar.gz
diff --git a/strip-hsieh.sh b/strip-hsieh.sh
index 25a1511..a916b2a 100755
--- a/strip-hsieh.sh
+++ b/strip-hsieh.sh
@@ -8,17 +8,11 @@ pushd $tdir
tar -xzf ../libmemcached-$ver.tar.gz
pushd libmemcached-$ver
- rm libhashkit/hsieh.c
- grep -r 'azillionmonkeys' . && exit 1
+ rm libmemcached/hsieh_hash.c
popd
rm -f ../libmemcached-$ver-exhsieh.tar.gz
-tar --no-xattrs -czf ../libmemcached-$ver-exhsieh.tar.gz libmemcached-$ver
-
-tar -tzf ../libmemcached-$ver.tar.gz | sort > manifest-before
-tar -tzf ../libmemcached-$ver-exhsieh.tar.gz | sort > manifest-after
-
-diff -u manifest-before manifest-after || true
+tar -czf ../libmemcached-$ver-exhsieh.tar.gz libmemcached-$ver
popd
-rm -rf $tdir
+rm -rf $tdir
\ No newline at end of file
More information about the scm-commits
mailing list