Update RPM.

diff --cc Makefile.am
index a64dc9c36912b3eb3101704921ea00671216e3bc,d001031047c8c09b3b6963d943f8094b6e4c9539..895debbc01a83515345979683eec4401ec62dccd
--- 1/Makefile.am
--- 2/Makefile.am
+++ b/Makefile.am
@@@ -74,7 -74,7 +74,7 @@@ endi
  
  include libmemcachedinternal/include.am
  include libmemcachedinternal/util/include.am
--include rpm/include.am
++include rpm/include.mk
  include support/include.am
  include tests/include.am
  include util/include.am
@@@ -96,7 -96,7 +96,6 @@@ merge-clean
        @find ./ | $(GREP) \.moved | xargs rm -r -f
        @find ./ | $(GREP) \\.orig | xargs rm -f
        @find ./ | $(GREP) \.rej | xargs rm -f
--      @rm -f *\.rpm
        @find ./ | $(GREP) \.THIS | xargs rm -f
        @find ./ | $(GREP) \.OTHER | xargs rm -f
        @find ./ | $(GREP) \.BASE | xargs rm -f

diff --cc rpm/include.am
index 2d60a1c4cbca898a8f8af63d0d7753aee4fbb1c4,313a67c79eb3887acf02ab1ef67545ccc3edbd41..0000000000000000000000000000000000000000
deleted file mode 100644,100644
--- 1/rpm/include.am
--- 2/rpm/include.am
+++ /dev/null
@@@ -1,42 -1,53 +1,0 @@@
--# vim:ft=automake
 -#
--
- $(PACKAGE)-$(VERSION).tar.gz: Makefile
 -RPM_BUILDDIR= ~/rpmbuild
 -
 -RPM_BUILD_TARGET= @PACKAGE@-@VERSION@-@RPM_RELEASE@.@build_cpu@.rpm
 -RPM_SOURCE= $(RPM_BUILDDIR)/SOURCES/$(DIST_ARCHIVES)
 -
 -RPMS=
 -RPMS+= $(RPM_BUILD_TARGET)
 -RPMS+= @PACKAGE@-devel-@VERSION@-@RPM_RELEASE@.@build_cpu@.rpm
 -RPMS+= @PACKAGE@-debuginfo-@VERSION@-@RPM_RELEASE@.@build_cpu@.rpm
 -
 -SRPMS= @PACKAGE@-@VERSION@-@RPM_RELEASE@.src.rpm
 -
 -RPM_DIST= $(RPMS) $(SRPMS)
 -
 -BUILD_RPMS= $(foreach rpm_iterator,$(RPMS),$(addprefix $(RPM_BUILDDIR)/RPMS/@build_cpu@/, $(rpm_iterator)))
 -BUILD_SRPMS= $(foreach srpm_iterator,$(SRPMS),$(addprefix $(RPM_BUILDDIR)/SRPMS/, $(srpm_iterator)))
 -BUILD_RPM_DIR= $(RPM_BUILDDIR)/BUILD/@PACKAGE@-@VERSION@
 -
 -$(RPM_BUILDDIR):
 -      @@RPMDEV_SETUPTREE@
 -
 -$(DIST_ARCHIVES): $(DISTFILES)
--      $(MAKE) $(AM_MAKEFLAGS) dist-gzip
--
- $(PACKAGE)-$(VERSION)-1.x86_64.rpm: support/$(PACKAGE).spec $(DIST_ARCHIVES)
-       @rm -f *.rpm
-       @rm -f ~/rpmbuild/RPMS/x86_64/$(PACKAGE)-$(VERSION)*.rpm
-       @rm -f ~/rpmbuild/SRPMS/$(PACKAGE)-$(VERSION)*.rpm
-       @mkdir -p ~/rpmbuild/BUILD/
-       @mkdir -p ~/rpmbuild/RPMS/i386/
-       @mkdir -p ~/rpmbuild/RPMS/i686/
-       @mkdir -p ~/rpmbuild/RPMS/noarch/
-       @mkdir -p ~/rpmbuild/RPMS/x86_64/
-       @mkdir -p ~/rpmbuild/SOURCES/
-       @mkdir -p ~/rpmbuild/SPECS/
-       @mkdir -p ~/rpmbuild/SRPMS/
-       @cp $(PACKAGE)-$(VERSION).tar.gz ~/rpmbuild/SOURCES/
-       @rpmbuild -ba support/$(PACKAGE).spec
-       @cp ~/rpmbuild/RPMS/x86_64/$(PACKAGE)-$(VERSION)*.rpm .
-       @cp ~/rpmbuild/RPMS/x86_64/$(PACKAGE)-devel-$(VERSION)*.rpm .
-       -cp ~/rpmbuild/RPMS/x86_64/$(PACKAGE)-debuginfo-$(VERSION)*.rpm .
-       @cp ~/rpmbuild/SRPMS/$(PACKAGE)-$(VERSION)*.rpm .
 -$(RPM_SOURCE): | $(RPM_BUILDDIR) $(DIST_ARCHIVES)
 -      @rm -f $(BUILD_RPMS) $(BUILD_SRPMS) $(BUILD_RPM_DIR)
 -      @cp $(DIST_ARCHIVES) $(RPM_SOURCE)
 -
 -$(RPM_BUILD_TARGET): $(RPM_SOURCE) support/@PACKAGE@.spec
 -      @@RPMBUILD@ -ba $(top_srcdir)/support/@PACKAGE@.spec
 -      @cp $(BUILD_RPMS) $(BUILD_SRPMS) .
--
--.PHONY: rpm-sign
- rpm-sign: rpm-build
-       @rpm --addsign *.rpm
-       @rpm --checksig *.rpm
 -rpm-sign: $(RPM_BUILD_TARGET)
 -      @@RPM@ --addsign $(RPM_DIST)
 -      @@RPM@ --checksig $(RPM_DIST)
--
--.PHONY: clean-rpm
--clean-rpm:
-       @rm -f libmemcached*.rpm
 -      @rm -f $(BUILD_RPMS) $(BUILD_SRPMS) $(BUILD_RPM_SOURCE) $(BUILD_RPM_DIR) $(RPM_DIST)
--
- .PHONY: rpm
- rpm: $(PACKAGE)-$(VERSION)-1.x86_64.rpm
 -rpm: $(RPM_BUILD_TARGET)
 -dist-rpm: $(RPM_BUILD_TARGET)
--
--.PHONY: release
--release: rpm rpm-sign
--
--.PHONY: auto-rpmbuild
- auto-rpmbuild:
-       @auto-br-rpmbuild -ba support/libmemcached.spec
 -auto-rpmbuild: support/@PACKAGE@.spec
 -      @auto-br-rpmbuild -ba $(top_srcdir)/support/@PACKAGE@.spec

diff --cc rpm/include.mk
index 0000000000000000000000000000000000000000,0000000000000000000000000000000000000000..27b6bd0e89811a3aedac938d7940edfa8e290203
new file mode 100644 (file)
--- /dev/null
--- /dev/null
+++ b/rpm/include.mk
@@@ -1,0 -1,0 +1,52 @@@
++# vim:ft=automake
++
++RPM_BUILDDIR= ~/rpmbuild
++
++RPM_BUILD_TARGET= @PACKAGE@-@VERSION@-@RPM_RELEASE@.@build_cpu@.rpm
++RPM_SOURCE= $(RPM_BUILDDIR)/SOURCES/$(DIST_ARCHIVES)
++
++RPMS=
++RPMS+= $(RPM_BUILD_TARGET)
++RPMS+= @PACKAGE@-devel-@VERSION@-@RPM_RELEASE@.@build_cpu@.rpm
++RPMS+= @PACKAGE@-debuginfo-@VERSION@-@RPM_RELEASE@.@build_cpu@.rpm
++
++SRPMS= @PACKAGE@-@VERSION@-@RPM_RELEASE@.src.rpm
++
++RPM_DIST= $(RPMS) $(SRPMS)
++
++BUILD_RPMS= $(foreach rpm_iterator,$(RPMS),$(addprefix $(RPM_BUILDDIR)/RPMS/@build_cpu@/, $(rpm_iterator)))
++BUILD_SRPMS= $(foreach srpm_iterator,$(SRPMS),$(addprefix $(RPM_BUILDDIR)/SRPMS/, $(srpm_iterator)))
++BUILD_RPM_DIR= $(RPM_BUILDDIR)/BUILD/@PACKAGE@-@VERSION@
++
++$(RPM_BUILDDIR):
++      @@RPMDEV_SETUPTREE@
++
++$(DIST_ARCHIVES): $(DISTFILES)
++      $(MAKE) $(AM_MAKEFLAGS) dist-gzip
++
++$(RPM_SOURCE): | $(RPM_BUILDDIR) $(DIST_ARCHIVES)
++      @rm -f $(BUILD_RPMS) $(BUILD_SRPMS) $(BUILD_RPM_DIR)
++      @cp $(DIST_ARCHIVES) $(RPM_SOURCE)
++
++$(RPM_BUILD_TARGET): $(RPM_SOURCE) support/@PACKAGE@.spec
++      @@RPMBUILD@ -ba $(top_srcdir)/support/@PACKAGE@.spec
++      @cp $(BUILD_RPMS) $(BUILD_SRPMS) .
++
++.PHONY: rpm-sign
++rpm-sign: $(RPM_BUILD_TARGET)
++      @@RPM@ --addsign $(RPM_DIST)
++      @@RPM@ --checksig $(RPM_DIST)
++
++.PHONY: clean-rpm
++clean-rpm:
++      -@rm -f $(BUILD_RPMS) $(BUILD_SRPMS) $(BUILD_RPM_SOURCE) $(BUILD_RPM_DIR) $(RPM_DIST)
++
++rpm: $(RPM_BUILD_TARGET)
++dist-rpm: $(RPM_BUILD_TARGET)
++
++.PHONY: release
++release: rpm rpm-sign
++
++.PHONY: auto-rpmbuild
++auto-rpmbuild: support/@PACKAGE@.spec
++      @auto-br-rpmbuild -ba $(top_srcdir)/support/@PACKAGE@.spec