X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=rpm.am;h=16a68c1ce8cf53a819115b594187966b53f76c3f;hb=804f22a1c1024cdd27cc477e0a51fc46e7451a9f;hp=a658132a302f47e9b8e717bded93526541c9e8de;hpb=1d3ffcb8031a12f06404a0700d556901b773c409;p=awesomized%2Flibmemcached

diff --git a/rpm.am b/rpm.am
index a658132a..16a68c1c 100644
--- a/rpm.am
+++ b/rpm.am
@@ -1,6 +1,6 @@
 # vim:ft=automake
 
-rpm-build: support/$(PACKAGE).spec
+rpm-build: support/$(PACKAGE).spec distcheck
 	@rm -f *.rpm
 	@rm -f ~/rpmbuild/RPMS/x86_64/$(PACKAGE)-$(VERSION)*.rpm
 	@rm -f ~/rpmbuild/SRPMS/$(PACKAGE)-$(VERSION)*.rpm
@@ -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
@@ -30,17 +28,9 @@ clean-rpm:
 	@rm -f *.src.rpm
 	@rm -f *.rpm
 
-rpm: clean-rpm support/$(PACKAGE).spec man distcheck rpm-build
+rpm: clean-rpm support/$(PACKAGE).spec 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