Hi all,

Attached is a fix for the ImageMagic.spec in rawhide to clear existing perl
env variables and to use the HTTP download link rather than the FTP one
(better supported in restrictive enterprise networks).

Taylor
From 025a0b4030c118d2a52bf724a70cc9d8377e4e1d Mon Sep 17 00:00:00 2001
From: Taylor Braun-Jones <taylor.braun-jo...@ge.com>
Date: Wed, 17 Sep 2014 17:03:07 -0400
Subject: [PATCH] Unset existing perl environment, use HTTP download URL

---
 ImageMagick.spec | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/ImageMagick.spec b/ImageMagick.spec
index 5d7ebce..81196ce 100644
--- a/ImageMagick.spec
+++ b/ImageMagick.spec
@@ -8,7 +8,7 @@ Summary:		An X application for displaying and manipulating images
 Group:		Applications/Multimedia
 License:		ImageMagick
 Url:			http://www.imagemagick.org/
-Source0:		ftp://ftp.ImageMagick.org/pub/%{name}/%{name}-%{VER}-%{Patchlevel}.tar.xz
+Source0:		http://www.imagemagick.org/download/releases/%{name}-%{VER}-%{Patchlevel}.tar.xz
 
 Requires:		%{name}-libs = %{version}-%{release}
 
@@ -142,6 +142,7 @@ cp -p Magick++/demo/*.cpp Magick++/demo/*.miff Magick++/examples
 
 
 %build
+%{?perl_ext_env_unset}
 %configure \
 	--enable-shared \
 	--disable-static \
@@ -172,6 +173,8 @@ make
 %install
 rm -rf %{buildroot}
 
+%{?perl_ext_env_unset}
+
 make %{?_smp_mflags} install DESTDIR=%{buildroot} INSTALL="install -p"
 cp -a www/source %{buildroot}%{_datadir}/doc/%{name}-%{VER}
 # Delete *ONLY* _libdir/*.la files! .la files used internally to handle plugins - BUG#185237!!!
@@ -319,6 +322,10 @@ rm -rf %{buildroot}
 %doc PerlMagick/demo/ PerlMagick/Changelog PerlMagick/README.txt
 
 %changelog
+* Wed Sep 17 2014 Taylor Braun-Jones <taylor.braun-jo...@ge.com>
+- Unset perl environment variables before compiling and installing.
+- Use HTTP dowload URL instead of FTP.
+
 * Tue Aug 26 2014 Jitka Plesnikova <jples...@redhat.com> - 6.8.8.10-6
 - Perl 5.20 rebuild
 
-- 
1.8.3.1

-- 
devel mailing list
devel@lists.fedoraproject.org
https://admin.fedoraproject.org/mailman/listinfo/devel
Fedora Code of Conduct: http://fedoraproject.org/code-of-conduct

Reply via email to