From: Brian Aker Date: Wed, 20 Jun 2012 05:35:52 +0000 (-0400) Subject: Update RPM X-Git-Tag: 1.0.9~13 X-Git-Url: https://git.m6w6.name/?a=commitdiff_plain;h=1d3ffcb8031a12f06404a0700d556901b773c409;p=m6w6%2Flibmemcached Update RPM --- diff --git a/Makefile.am b/Makefile.am index b4338106..a977a2c5 100644 --- a/Makefile.am +++ b/Makefile.am @@ -48,6 +48,7 @@ include libmemcachedprotocol/include.am include libmemcachedinternal/include.am include libmemcachedinternal/util/include.am include poll/include.am +include rpm.am include support/include.am include tests/include.am include util/include.am diff --git a/rpm.am b/rpm.am index 72763f8d..a658132a 100644 --- a/rpm.am +++ b/rpm.am @@ -25,7 +25,12 @@ rpm-sign: rpm-build @rpm --addsign *.rpm @rpm --checksig *.rpm -rpm: support/$(PACKAGE).spec man distcheck rpm-build +clean-rpm: + @rm -f *.tar.gz + @rm -f *.src.rpm + @rm -f *.rpm + +rpm: clean-rpm support/$(PACKAGE).spec man distcheck rpm-build release: rpm rpm-sign @@ -37,3 +42,5 @@ merge-clean: @echo "The follow files need to be removed or checked in:" @bzr unknowns +auto-rpmbuild: + @auto-br-rpmbuild -ba support/libmemcached.spec diff --git a/support/libmemcached.spec.in b/support/libmemcached.spec.in index b422ba67..1a1bd356 100644 --- a/support/libmemcached.spec.in +++ b/support/libmemcached.spec.in @@ -8,7 +8,39 @@ URL: http://launchpad.net/libmemcached 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 +BuildRequires: diffutils +BuildRequires: elfutils +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 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) diff --git a/support/memcached.init b/support/memcached.init new file mode 100644 index 00000000..e69de29b