]> granicus.if.org Git - imagemagick/commitdiff
...
authorCristy <urban-warrior@imagemagick.org>
Fri, 23 Feb 2018 22:44:49 +0000 (17:44 -0500)
committerCristy <urban-warrior@imagemagick.org>
Fri, 23 Feb 2018 22:44:49 +0000 (17:44 -0500)
Makefile.am
Makefile.in
configure

index 553b112923270355338c55c83c16f3a617605b9b..a19a2ffb52ba56a8be89d339fb8ca1c786593cdb 100644 (file)
@@ -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 ==============================================================
index c0beb7d1a2e901fbe7a00f40056763709b3ae3bf..c42cb5cbaf351e53041e8b089b3910434d05403d 100644 (file)
@@ -11836,11 +11836,11 @@ $(DIST_WINDOWS_SRC_ZIP) $(DIST_WINDOWS_SRC_7ZIP) windows-dist:
 
 @RPM_DELEGATE_TRUE@.PHONY: rpm
 @RPM_DELEGATE_TRUE@rpm:        dist
-@RPM_DELEGATE_TRUE@    rm -rf $(RPMDIR)
 @RPM_DELEGATE_TRUE@    $(MKDIR_P) $(RPMDIR)
 @RPM_DELEGATE_TRUE@    $(MKDIR_P) $(RPMDIR)/BUILD
 @RPM_DELEGATE_TRUE@    $(MKDIR_P) $(RPMDIR)/RPMS
 @RPM_DELEGATE_TRUE@    $(RPM) --define="_sourcedir `pwd`" --define="_rpmdir `pwd`/$(RPMDIR)/RPMS" --define="_builddir `pwd`/$(RPMDIR)/BUILD" --nodeps -bb ImageMagick.spec
+@RPM_DELEGATE_TRUE@    rm -rf $(RPMDIR)
 @RPM_DELEGATE_TRUE@    @echo ==============================================================
 @RPM_DELEGATE_TRUE@    @echo $(DIST_ARCHIVE_RPM) is ready for distribution.
 @RPM_DELEGATE_TRUE@    @echo ==============================================================
index 2cd8676c5d69e3d4a3e7a4a72c161c071e3c76db..72d1aa86e8c755831e2c512c20e9ec1f3a668e3b 100755 (executable)
--- a/configure
+++ b/configure
@@ -4550,7 +4550,7 @@ MAGICK_PATCHLEVEL_VERSION=24
 
 MAGICK_VERSION=7.0.7-24
 
-MAGICK_GIT_REVISION=22973:fe6c919ff:20180218
+MAGICK_GIT_REVISION=23033:57c3b50bd:20180223
 
 
 # Substitute library versioning