rpms/squid/devel squid.spec, 1.180, 1.181 squid-3.1.5-libtoolinclude.patch, 1.1, NONE

[Henrik Nordström]

Author: hno

Update of /cvs/pkgs/rpms/squid/devel
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv22154

Modified Files:
	squid.spec 
Removed Files:
	squid-3.1.5-libtoolinclude.patch 
Log Message:
Try requiring libltdl-devel instead. Really should be using the system ltdl anyway


Index: squid.spec
===================================================================
RCS file: /cvs/pkgs/rpms/squid/devel/squid.spec,v
retrieving revision 1.180
retrieving revision 1.181
diff -u -p -r1.180 -r1.181
--- squid.spec	15 Jul 2010 11:14:26 -0000	1.180
+++ squid.spec	15 Jul 2010 11:35:09 -0000	1.181
@@ -35,10 +35,6 @@ Patch204: squid-3.0.STABLE1-perlpath.pat
 Patch205: squid-3.1.0.15-smb-path.patch
 Patch208: squid-3.0.STABLE7-from_manpg.patch
 
-# Temporary patches
-# 3.1.5 bundles a slightly broken libtool. Fixed upstream.
-Patch301: squid-3.1.5-libtoolinclude.patch
-
 Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Requires: bash >= 2.0
 Requires(pre): shadow-utils
@@ -59,6 +55,8 @@ BuildRequires: db4-devel
 BuildRequires: expat-devel libxml2-devel
 # TPROXY requires libcap, and also increases security somewhat
 BuildRequires: libcap-devel
+# eCAP and some other need libltdl
+BuildRequires: libtool-ltdl-devel
 
 %description
 Squid is a high-performance proxy caching server for Web clients,
@@ -87,8 +85,6 @@ lookup program (dnsserver), a program fo
 %patch205 -p1 -b .smb-path
 %patch208 -p1 -b .from_manpg
 
-%patch301 -p1 -b .libtoolinclude
-
 %build
 
 %configure \


--- squid-3.1.5-libtoolinclude.patch DELETED ---