[GraphicsMagick/el5: 7/9] Revert "workaround el5 libltdl borkage"
Rex Dieter
rdieter at fedoraproject.org
Tue Oct 22 23:03:10 UTC 2013
commit 9452b1de7d8d786c55cad43abd23d5a3eeb75449
Author: Rex Dieter <rdieter at math.unl.edu>
Date: Tue Oct 22 18:02:09 2013 -0500
Revert "workaround el5 libltdl borkage"
This reverts commit 3ba621897cfd6214b52f8d4eb7e3a8824949d651.
GraphicsMagick-1.3.17-ltdl_convenience.patch | 110 --------------------------
GraphicsMagick.spec | 5 +-
2 files changed, 1 insertions(+), 114 deletions(-)
---
diff --git a/GraphicsMagick.spec b/GraphicsMagick.spec
index b6722c6..a2537c8 100644
--- a/GraphicsMagick.spec
+++ b/GraphicsMagick.spec
@@ -32,7 +32,6 @@ Patch1: GraphicsMagick-1.3.16-multilib.patch
Patch50: GraphicsMagick-1.3.14-perl_linkage.patch
## upstream patches
-Patch100: GraphicsMagick-1.3.17-ltdl_convenience.patch
BuildRequires: bzip2-devel
BuildRequires: freetype-devel
@@ -124,9 +123,6 @@ however.
%patch1 -p1 -b .multilib
%patch50 -p1 -b .perl_linkage
-%if 0%{?el5}
-%patch100 -p1 -R -b .ltdl_convenience
-%endif
iconv -f iso-8859-2 -t utf8 < ChangeLog > ChangeLog.utf8
mv -f ChangeLog.utf8 ChangeLog
@@ -138,6 +134,7 @@ sed -i.rpath -e 's|"/lib /usr/lib|"/%{_lib} %{_libdir}|' configure
sed -i -e "s|BrowseDelegateDefault=.*|BrowseDelegateDefault=\'xdg-open\'|" configure
+
%build
%configure --enable-shared --disable-static \
--without-included-ltdl \
More information about the scm-commits
mailing list