rpms/squid
7
0
Fork 0
Code Issues Pull Requests Releases Activity

Fixup libtool the same way as done upstream instead

Browse Source
This commit is contained in:
Henrik Nordström 2010-07-15 11:14:26 +00:00
parent 4fc046a2f0
commit b1341dcc6b
2 changed files with 21 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
squid-3.1.5-libtoolinclude.patch Normal file
View File

@ -0,0 +1,16 @@
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

6
squid.spec
View File

@ -35,6 +35,10 @@ Patch204: squid-3.0.STABLE1-perlpath.patch
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
@ -83,7 +87,7 @@ lookup program (dnsserver), a program for retrieving FTP data
%patch205 -p1 -b .smb-path
%patch208 -p1 -b .from_manpg
./bootstrap.sh
%patch301 -p1 -b .libtoolinclude
%build