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

index 461dc658e0b907cab3d0a74235a196d9415a4d8a..553b112923270355338c55c83c16f3a617605b9b 100644 (file)
@@ -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 ==============================================================
index dde56428abc06a33084f823128fb1c7a990eb0fe..c0beb7d1a2e901fbe7a00f40056763709b3ae3bf 100644 (file)
@@ -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 ==============================================================
index a22445979877d4060567cb4aa37f0347f716f0ab..456df8e82e30088c9260693fd884f53032914f63 100755 (executable)
--- 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