X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=rpm.am;h=82a3ffd389787e7ba77c8cdef2fda09997dfc2f2;hb=81e8f0486563e3bcf9e5bdb634af45c6767009cc;hp=a658132a302f47e9b8e717bded93526541c9e8de;hpb=1d3ffcb8031a12f06404a0700d556901b773c409;p=m6w6%2Flibmemcached

diff --git a/rpm.am b/rpm.am
index a658132a..82a3ffd3 100644
--- a/rpm.am
+++ b/rpm.am
@@ -13,12 +13,10 @@ rpm-build: support/$(PACKAGE).spec
 	@mkdir -p ~/rpmbuild/SPECS/
 	@mkdir -p ~/rpmbuild/SRPMS/
 	@cp $(PACKAGE)-$(VERSION).tar.gz ~/rpmbuild/SOURCES/
-	@cp support/$(PACKAGE).init ~/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/RPMS/x86_64/$(PACKAGE)-server-$(VERSION)*.rpm .
 	@cp ~/rpmbuild/SRPMS/$(PACKAGE)-$(VERSION)*.rpm .
 
 rpm-sign: rpm-build
@@ -34,13 +32,5 @@ rpm: clean-rpm support/$(PACKAGE).spec man distcheck rpm-build
 
 release: rpm rpm-sign
 
-merge-clean:
-	@find ./ | $(GREP) \.moved | xargs rm -r -f
-	@find ./ | $(GREP) \.orig | xargs rm -f
-	@find ./ | $(GREP) \.rej | xargs rm -f
-	@find ./ | $(GREP) \~$$ | xargs rm -f
-	@echo "The follow files need to be removed or checked in:"
-	@bzr unknowns
-
 auto-rpmbuild:
 	@auto-br-rpmbuild -ba support/libmemcached.spec