X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=rpm.am;h=9d7c5494f60acc1dda8158aab0970a9ddee23215;hb=0d34e2e86b16fcd4d459e684f56cb88296cea2a1;hp=a658132a302f47e9b8e717bded93526541c9e8de;hpb=299c04f7d92895d0ec5e1cce437d19b3334b75ac;p=m6w6%2Flibmemcached

diff --git a/rpm.am b/rpm.am
index a658132a..9d7c5494 100644
--- a/rpm.am
+++ b/rpm.am
@@ -34,13 +34,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