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

[Henrik Nordström]

Author: hno

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

Modified Files:
	squid.spec 
Added Files:
	squid-3.1.5-libtoolinclude.patch 
Log Message:
Fixup libtool the same way as done upstream instead

squid-3.1.5-libtoolinclude.patch:
 ltdl.h |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

--- NEW FILE squid-3.1.5-libtoolinclude.patch ---
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
 


Index: squid.spec
===================================================================
RCS file: /cvs/pkgs/rpms/squid/devel/squid.spec,v
retrieving revision 1.179
retrieving revision 1.180
diff -u -p -r1.179 -r1.180
--- squid.spec	15 Jul 2010 10:57:39 -0000	1.179
+++ squid.spec	15 Jul 2010 11:14:26 -0000	1.180
@@ -35,6 +35,10 @@ 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
@@ -83,7 +87,7 @@ lookup program (dnsserver), a program fo
 %patch205 -p1 -b .smb-path
 %patch208 -p1 -b .from_manpg
 
-./bootstrap.sh
+%patch301 -p1 -b .libtoolinclude
 
 %build