New Spec file.

diff --git a/.hgignore b/.hgignore
index c06ca388d8de0249fd06fa35bc37c49416103dd3..7988d72c8a084a3730ccbf0e1c4e0b343bc79b77 100644 (file)
--- a/.hgignore
+++ b/.hgignore
@@ -23,6 +23,7 @@ autom4te.cache/*$
 .(gz|cmp|tar|rpm|srpm)$
 support/libmemcached.pc$
 support/libmemcached.spec$
+support/libmemcached-fc.spec$
 docs/pod2htmd.tmp
 docs/pod2htmi.tmp
 libmemcached/memcachedplus.loT

diff --git a/ChangeLog b/ChangeLog
index 8386d7b308db950e91e74be984a5c6368f66c9ee..40310924eb59465123b2cab56a715b9b8830ee79 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,6 @@
+0.29
   * MEMCACHED_BEHAVIOR_NO_BLOCK no longer also sets MEMCACHED_BEHAVIOR_BUFFER_REQUESTS
+  * Updated generic rpm
 
 0.28 Tue Apr 14 18:56:28 PDT 2009
   * Fixed bug in init sructure (reapplied)

diff --git a/Makefile.am b/Makefile.am
index 63d02ea3569c8a3a3dc2e671c17e3ed71a947f51..f4a98c4be0ada8207850006869f62cce7d6a328c 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -14,8 +14,16 @@ valgrind:
 test-no-outputdiff:
        @(cd tests; ${MAKE} test-no-outputdiff)
 
-rpm: all dist
+fedora:
        cp libmemcached-$(VERSION).tar.gz /home/brian/rpmbuild/SOURCES/
        rpmbuild -ba support/libmemcached.spec
        cp /home/brian/rpmbuild/RPMS/x86_64/libmemcached-$(VERSION)*.rpm .
        cp /home/brian/rpmbuild/SRPMS/libmemcached-$(VERSION)*.rpm .
+
+generic:
+       cp libmemcached-$(VERSION).tar.gz /home/brian/rpmbuild/SOURCES/
+       rpmbuild -ba support/libmemcached.spec
+       cp /home/brian/rpmbuild/RPMS/x86_64/libmemcached-$(VERSION)*.rpm .
+       cp /home/brian/rpmbuild/SRPMS/libmemcached-$(VERSION)*.rpm .
+
+rpm: all dist generic fedora

diff --git a/configure.ac b/configure.ac
index 52f6f53f778086705db266233a6c5fde851a8d3e..a84ae0718fbed9ad25488a94a64255172c233fd8 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -88,4 +88,4 @@ fi
 
 LDFLAGS="-lm"
 
-AC_OUTPUT(Makefile clients/Makefile tests/Makefile docs/Makefile libmemcached/Makefile support/Makefile support/libmemcached.pc support/libmemcached.spec)
+AC_OUTPUT(Makefile clients/Makefile tests/Makefile docs/Makefile libmemcached/Makefile support/Makefile support/libmemcached.pc support/libmemcached.spec support/libmemcached-fc.spec)

diff --git a/support/Makefile.am b/support/Makefile.am
index 34c4cc985bf0afbe8cb1877412cedbf8060e6dcd..48fab4c4f0710672f04a778380285b74518411ff 100644 (file)
--- a/support/Makefile.am
+++ b/support/Makefile.am
@@ -1,4 +1,4 @@
-EXTRA_DIST = libmemcached.spec set_benchmark.sh
+EXTRA_DIST = libmemcached.spec set_benchmark.sh libmemcached-fc.spec.in
 
 pkgconfigdir = $(libdir)/pkgconfig
 pkgconfig_DATA = libmemcached.pc

diff --git a/support/libmemcached-fc.spec.in b/support/libmemcached-fc.spec.in
new file mode 100644 (file)
index 0000000..24ff9d4
--- /dev/null
+++ b/support/libmemcached-fc.spec.in
@@ -0,0 +1,102 @@
+Name:      libmemcached
+Summary:   memcached C library and command line tools
+Version: @VERSION@
+Release:   1%{?dist}
+License:   BSD
+Group:     System Environment/Libraries
+URL:       http://tangent.org/552/libmemcached.html
+Source0:   http://download.tangent.org/libmemcached-%{version}.tar.gz
+
+# For test suite
+BuildRequires: memcached
+
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+
+
+%description
+libmemcached is a C client library to the memcached server
+(http://danga.com/memcached). It has been designed to be light on memory
+usage, and provide full access to server side methods.
+
+It also implements several command line tools:
+
+memcat - Copy the value of a key to standard output.
+memflush - Flush the contents of your servers.
+memrm - Remove a key(s) from the serrver.
+memstat - Dump the stats of your servers to standard output.
+memslap - Generate testing loads on a memcached cluster.
+memcp - Copy files to memcached servers.
+memerror - Creates human readable messages from libmemecached error codes.
+
+
+%package devel
+Summary: Header files and development libraries for %{name}
+Group: Development/Libraries
+Requires: %{name} = %{version}-%{release}
+
+%description devel
+This package contains the header files and development libraries
+for %{name}. If you like to develop programs using %{name}, 
+you will need to install %{name}-devel.
+
+
+%prep
+%setup -q
+
+%{__mkdir} examples
+%{__cp} tests/*.{c,cpp,h} examples/
+
+
+%build
+%configure
+%{__make} %{_smp_mflags}
+
+
+%install
+%{__rm} -rf %{buildroot}
+%{__make} install  DESTDIR="%{buildroot}" AM_INSTALL_PROGRAM_FLAGS=""
+
+
+%check
+# test suite cannot run in mock (same port use for memcache server on all arch)
+# 1 test seems to fail.. 
+#%{__make} test
+
+
+%clean
+%{__rm} -rf %{buildroot}
+
+
+%post -p /sbin/ldconfig
+
+
+%postun -p /sbin/ldconfig
+ 
+
+%files
+%defattr (-,root,root,-) 
+%doc AUTHORS COPYING NEWS README THANKS TODO
+%{_bindir}/mem*
+%exclude %{_libdir}/libmemcached.a
+%exclude %{_libdir}/libmemcached.la
+%{_libdir}/libmemcached.so.*
+%{_mandir}/man1/mem*
+
+
+%files devel
+%defattr (-,root,root,-) 
+%doc examples
+%{_includedir}/libmemcached
+%{_libdir}/libmemcached.so
+%{_libdir}/pkgconfig/libmemcached.pc
+%{_libdir}/libmemcached.so
+%{_mandir}/man3/libmemcached*.3.gz
+%{_mandir}/man3/memcached_*.3.gz
+
+
+%changelog
+* Sat Apr 25 2009 Remi Collet <rpms@famillecollet.com> - 0.28-1
+- Initial RPM from Brian Aker spec
+- create -devel subpackage
+- add %%post %%postun %%check section
+

diff --git a/support/libmemcached.spec.in b/support/libmemcached.spec.in
index be06ad15d1f97a52a169eb4dc6d09afaebbccf95..310f7ccdbadf4c584113ea8dbd40ce8bd586c25a 100644 (file)
--- a/support/libmemcached.spec.in
+++ b/support/libmemcached.spec.in
@@ -1,16 +1,17 @@
-Summary: memcached C library and command line tools
-Name: @PACKAGE@
+Name:      libmemcached
+Summary:   memcached C library and command line tools
 Version: @VERSION@
-Release: 1
-License: BSD
-Group: System Environment/Libraries
-BuildRequires: gcc-c++
-URL: http://tangent.org/552/libmemcached.html
+Release:   1
+License:   BSD
+Group:     System Environment/Libraries
+URL:       http://tangent.org/552/libmemcached.html
+Source0:   http://download.tangent.org/libmemcached-%{version}.tar.gz
 
-Packager: Jeff Fisher <guppy@techmonkeys.org>
+# For test suite
+BuildRequires: memcached
+
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-Source: http://download.tangent.org/libmemcached-%{version}.tar.gz
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot
 
 %description
 libmemcached is a C client library to the memcached server
@@ -27,115 +28,75 @@ memslap - Generate testing loads on a memcached cluster.
 memcp - Copy files to memcached servers.
 memerror - Creates human readable messages from libmemecached error codes.
 
+
+%package devel
+Summary: Header files and development libraries for %{name}
+Group: Development/Libraries
+Requires: %{name} = %{version}-%{release}
+
+%description devel
+This package contains the header files and development libraries
+for %{name}. If you like to develop programs using %{name}, 
+you will need to install %{name}-devel.
+
+
 %prep
 %setup -q
 
-%configure
+%{__mkdir} examples
+%{__cp} tests/*.{c,cpp,h} examples/
+
 
 %build
+%configure
 %{__make} %{_smp_mflags}
 
+
 %install
 %{__rm} -rf %{buildroot}
 %{__make} install  DESTDIR="%{buildroot}" AM_INSTALL_PROGRAM_FLAGS=""
 
+
+%check
+# test suite cannot run in mock (same port use for memcache server on all arch)
+# 1 test seems to fail.. 
+#%{__make} test
+
+
 %clean
 %{__rm} -rf %{buildroot}
 
+
+%post -p /sbin/ldconfig
+
+
+%postun -p /sbin/ldconfig
+ 
+
 %files
-%{_bindir}/memcat
-%{_bindir}/memcp
-%{_bindir}/memerror
-%{_bindir}/memflush
-%{_bindir}/memrm
-%{_bindir}/memstat
-%{_bindir}/memslap
-%{_includedir}/libmemcached/memcached.h
-%{_includedir}/libmemcached/memcached.hh
-%{_includedir}/libmemcached/libmemcached_config.h
-%{_includedir}/libmemcached/memcached_constants.h
-%{_includedir}/libmemcached/memcached_get.h
-%{_includedir}/libmemcached/memcached_result.h
-%{_includedir}/libmemcached/memcached_server.h
-%{_includedir}/libmemcached/memcached_storage.h
-%{_includedir}/libmemcached/memcached_string.h
-%{_includedir}/libmemcached/memcached_types.h
-%{_includedir}/libmemcached/memcached_watchpoint.h
-%{_libdir}/libmemcached.a
-%{_libdir}/libmemcached.la
+%defattr (-,root,root,-) 
+%doc AUTHORS COPYING NEWS README THANKS TODO
+%{_bindir}/mem*
+%exclude %{_libdir}/libmemcached.a
+%exclude %{_libdir}/libmemcached.la
+%{_libdir}/libmemcached.so.*
+%{_mandir}/man1/mem*
+
+
+%files devel
+%defattr (-,root,root,-) 
+%doc examples
+%{_includedir}/libmemcached
 %{_libdir}/libmemcached.so
-%{_libdir}/libmemcached.so.2
-%{_libdir}/libmemcached.so.2.0.0
 %{_libdir}/pkgconfig/libmemcached.pc
-%{_mandir}/man1/memcat.1.gz
-%{_mandir}/man1/memcp.1.gz
-%{_mandir}/man1/memerror.1.gz
-%{_mandir}/man1/memflush.1.gz
-%{_mandir}/man1/memrm.1.gz
-%{_mandir}/man1/memslap.1.gz
-%{_mandir}/man1/memstat.1.gz
-%{_mandir}/man3/libmemcached.3.gz
-%{_mandir}/man3/libmemcached_examples.3.gz
-%{_mandir}/man3/memcached_add.3.gz
-%{_mandir}/man3/memcached_add_by_key.3.gz
-%{_mandir}/man3/memcached_analyze.3.gz
-%{_mandir}/man3/memcached_append.3.gz
-%{_mandir}/man3/memcached_append_by_key.3.gz
-%{_mandir}/man3/memcached_behavior_get.3.gz
-%{_mandir}/man3/memcached_behavior_set.3.gz
-%{_mandir}/man3/memcached_cas.3.gz
-%{_mandir}/man3/memcached_cas_by_key.3.gz
-%{_mandir}/man3/memcached_callback_get.3.gz
-%{_mandir}/man3/memcached_callback_set.3.gz
-%{_mandir}/man3/memcached_clone.3.gz
-%{_mandir}/man3/memcached_create.3.gz
-%{_mandir}/man3/memcached_decrement.3.gz
-%{_mandir}/man3/memcached_delete.3.gz
-%{_mandir}/man3/memcached_delete_by_key.3.gz
-%{_mandir}/man3/memcached_fetch.3.gz
-%{_mandir}/man3/memcached_fetch_result.3.gz
-%{_mandir}/man3/memcached_fetch_execute.3.gz
-%{_mandir}/man3/memcached_flush_buffers.3.gz
-%{_mandir}/man3/memcached_free.3.gz
-%{_mandir}/man3/memcached_generate_hash_value.3.gz
-%{_mandir}/man3/memcached_get.3.gz
-%{_mandir}/man3/memcached_get_by_key.3.gz
-%{_mandir}/man3/memcached_increment.3.gz
-%{_mandir}/man3/memcached_mget.3.gz
-%{_mandir}/man3/memcached_mget_by_key.3.gz
-%{_mandir}/man3/memcached_prepend.3.gz
-%{_mandir}/man3/memcached_prepend_by_key.3.gz
-%{_mandir}/man3/memcached_quit.3.gz
-%{_mandir}/man3/memcached_replace.3.gz
-%{_mandir}/man3/memcached_replace_by_key.3.gz
-%{_mandir}/man3/memcached_server_add.3.gz
-%{_mandir}/man3/memcached_server_count.3.gz
-%{_mandir}/man3/memcached_server_list.3.gz
-%{_mandir}/man3/memcached_server_list_append.3.gz
-%{_mandir}/man3/memcached_server_list_count.3.gz
-%{_mandir}/man3/memcached_server_list_free.3.gz
-%{_mandir}/man3/memcached_server_push.3.gz
-%{_mandir}/man3/memcached_servers_parse.3.gz
-%{_mandir}/man3/memcached_set.3.gz
-%{_mandir}/man3/memcached_set_by_key.3.gz
-%{_mandir}/man3/memcached_stat.3.gz
-%{_mandir}/man3/memcached_stat_get_keys.3.gz
-%{_mandir}/man3/memcached_stat_get_value.3.gz
-%{_mandir}/man3/memcached_stat_servername.3.gz
-%{_mandir}/man3/memcached_strerror.3.gz
-%{_mandir}/man3/memcached_verbosity.3.gz
-%{_mandir}/man3/memcached_lib_version.3.gz
-%{_mandir}/man3/memcached_version.3.gz
-
-%changelog
-* Mon Nov  5 2007 Brian Aker <brian@tangent.org> - 0.8-1
-- Automated version number
+%{_libdir}/libmemcached.so
+%{_mandir}/man3/libmemcached*.3.gz
+%{_mandir}/man3/memcached_*.3.gz
 
-* Wed Oct  3 2007 Brian Aker <brian@tangent.org> - 0.4-1
-- See Changelog
 
-* Mon Oct  1 2007 Brian Aker <brian@tangent.org> - 0.3-1
-- Added memslap
+%changelog
+* Sat Apr 25 2009 Remi Collet <rpms@famillecollet.com> - 0.28-1
+- Initial RPM from Brian Aker spec
+- create -devel subpackage
+- add %%post %%postun %%check section
 
-* Fri Sep 28 2007 Jeff Fisher <guppy@techmonkeys.org> - 0.2-1
-- Initial package