...

[imagemagick] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index a19a2ffb52ba56a8be89d339fb8ca1c786593cdb..dfc817d6c3288c98d011f5d8ca7cfb861be3f45b 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -348,7 +348,7 @@ endif # P7ZIP_DELEGATE
 #
 if RPM_DELEGATE
 
-DIST_ARCHIVE_SRPM=$(distdir)-1.src.rpm
+DIST_ARCHIVE_SRPM=$(distdir).src.rpm
 .PHONY: srpm
 $(DIST_ARCHIVE_SRPM) srpm: dist-bzip2
        rm -f $(DIST_ARCHIVE_SRPM)
@@ -369,11 +369,11 @@ DIST_ARCHIVE_RPM= \
 
 .PHONY: rpm
 rpm:   dist
+       rm -rf $(RPMDIR)
        $(MKDIR_P) $(RPMDIR)
        $(MKDIR_P) $(RPMDIR)/BUILD
        $(MKDIR_P) $(RPMDIR)/RPMS
        $(RPM) --define="_sourcedir `pwd`" --define="_rpmdir `pwd`/$(RPMDIR)/RPMS" --define="_builddir `pwd`/$(RPMDIR)/BUILD" --nodeps -bb ImageMagick.spec
-       rm -rf $(RPMDIR)
        @echo ==============================================================
        @echo $(DIST_ARCHIVE_RPM) is ready for distribution.
        @echo ==============================================================