Try requiring libltdl-devel instead. Really should be using the system ltdl
anyway
This commit is contained in:
parent
b1341dcc6b
commit
b00560c1d5
@ -1,16 +0,0 @@
|
|||||||
diff -ru squid-3.1.5/libltdl/ltdl.h squid-3.1.5-libtool-fixed/libltdl/ltdl.h
|
|
||||||
--- squid-3.1.5/libltdl/ltdl.h 2010-07-02 04:47:56.000000000 +0200
|
|
||||||
+++ squid-3.1.5-libtool-fixed/libltdl/ltdl.h 2010-07-15 13:10:27.000000000 +0200
|
|
||||||
@@ -33,9 +33,9 @@
|
|
||||||
#if !defined(LTDL_H)
|
|
||||||
#define LTDL_H 1
|
|
||||||
|
|
||||||
-#include <libltdl/lt_system.h>
|
|
||||||
-#include <libltdl/lt_error.h>
|
|
||||||
-#include <libltdl/lt_dlloader.h>
|
|
||||||
+#include "libltdl/lt_system.h"
|
|
||||||
+#include "libltdl/lt_error.h"
|
|
||||||
+#include "libltdl/lt_dlloader.h"
|
|
||||||
|
|
||||||
LT_BEGIN_C_DECLS
|
|
||||||
|
|
@ -35,10 +35,6 @@ Patch204: squid-3.0.STABLE1-perlpath.patch
|
|||||||
Patch205: squid-3.1.0.15-smb-path.patch
|
Patch205: squid-3.1.0.15-smb-path.patch
|
||||||
Patch208: squid-3.0.STABLE7-from_manpg.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)
|
Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
|
||||||
Requires: bash >= 2.0
|
Requires: bash >= 2.0
|
||||||
Requires(pre): shadow-utils
|
Requires(pre): shadow-utils
|
||||||
@ -59,6 +55,8 @@ BuildRequires: db4-devel
|
|||||||
BuildRequires: expat-devel libxml2-devel
|
BuildRequires: expat-devel libxml2-devel
|
||||||
# TPROXY requires libcap, and also increases security somewhat
|
# TPROXY requires libcap, and also increases security somewhat
|
||||||
BuildRequires: libcap-devel
|
BuildRequires: libcap-devel
|
||||||
|
# eCAP and some other need libltdl
|
||||||
|
BuildRequires: libtool-ltdl-devel
|
||||||
|
|
||||||
%description
|
%description
|
||||||
Squid is a high-performance proxy caching server for Web clients,
|
Squid is a high-performance proxy caching server for Web clients,
|
||||||
@ -87,8 +85,6 @@ lookup program (dnsserver), a program for retrieving FTP data
|
|||||||
%patch205 -p1 -b .smb-path
|
%patch205 -p1 -b .smb-path
|
||||||
%patch208 -p1 -b .from_manpg
|
%patch208 -p1 -b .from_manpg
|
||||||
|
|
||||||
%patch301 -p1 -b .libtoolinclude
|
|
||||||
|
|
||||||
%build
|
%build
|
||||||
|
|
||||||
%configure \
|
%configure \
|
||||||
|
Loading…
Reference in New Issue
Block a user