From: Cristy <urban-warrior@imagemagick.org>
Date: Fri, 23 Feb 2018 23:04:05 +0000 (-0500)
Subject: ...
X-Git-Tag: 7.0.7-24~18
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=c6936c7af88abb00aa78f8c7622be1b476afa205;p=imagemagick

...
---

diff --git a/Makefile.am b/Makefile.am
index 461dc658e..553b11292 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -374,7 +374,6 @@ rpm:	dist
 	$(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 rpmbuild
 	@echo ==============================================================
 	@echo $(DIST_ARCHIVE_RPM) is ready for distribution.
 	@echo ==============================================================
diff --git a/Makefile.in b/Makefile.in
index dde56428a..c0beb7d1a 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -11841,7 +11841,6 @@ $(DIST_WINDOWS_SRC_ZIP) $(DIST_WINDOWS_SRC_7ZIP) windows-dist:
 @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 rpmbuild
 @RPM_DELEGATE_TRUE@	@echo ==============================================================
 @RPM_DELEGATE_TRUE@	@echo $(DIST_ARCHIVE_RPM) is ready for distribution.
 @RPM_DELEGATE_TRUE@	@echo ==============================================================
diff --git a/configure b/configure
index a22445979..456df8e82 100755
--- a/configure
+++ b/configure
@@ -4550,7 +4550,7 @@ MAGICK_PATCHLEVEL_VERSION=24
 
 MAGICK_VERSION=7.0.7-24
 
-MAGICK_GIT_REVISION=23034:c3df32ec5:20180223
+MAGICK_GIT_REVISION=23035:2dad3d6dc:20180223
 
 
 # Substitute library versioning