rpms/squid/devel squid-3.1.0.15-smb-path.patch, NONE, 1.1 squid.spec, 1.151, 1.152 squid-3.1.0.13-smb-path.patch, 1.1, NONE

[Henrik Nordström]

Author: hno

Update of /cvs/pkgs/rpms/squid/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16666

Modified Files:
	squid.spec 
Added Files:
	squid-3.1.0.15-smb-path.patch 
Removed Files:
	squid-3.1.0.13-smb-path.patch 
Log Message:
smb-patch rediffed for 3.1.0.15

squid-3.1.0.15-smb-path.patch:
 Makefile.am |    4 ++--
 Makefile.in |    4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

--- NEW FILE squid-3.1.0.15-smb-path.patch ---
diff -up squid-3.1.0.15/helpers/basic_auth/SMB/Makefile.am.smb-path squid-3.1.0.15/helpers/basic_auth/SMB/Makefile.am
--- squid-3.1.0.15/helpers/basic_auth/SMB/Makefile.am.smb-path	2009-11-23 04:09:56.000000000 +0100
+++ squid-3.1.0.15/helpers/basic_auth/SMB/Makefile.am	2009-11-23 17:53:39.000000000 +0100
@@ -9,14 +9,14 @@
 include $(top_srcdir)/src/Common.am
 
 # SAMBAPREFIX must point to the directory where Samba has been installed.
-# By default, Samba is installed in /usr/local/samba. If you changed this
+# By default, Samba is installed in /usr. If you changed this
 # by using the --prefix option when configuring Samba, you need to change
 # SAMBAPREFIX accordingly.
 
 ## FIXME: autoconf should test for the samba path.
 
 SMB_AUTH_HELPER	= smb_auth.sh
-SAMBAPREFIX=/usr/local/samba
+SAMBAPREFIX=/usr
 SMB_AUTH_HELPER_PATH = $(libexecdir)/$(SMB_AUTH_HELPER)
 
 libexec_SCRIPTS	= $(SMB_AUTH_HELPER)
diff -up squid-3.1.0.15/helpers/basic_auth/SMB/Makefile.in.smb-path squid-3.1.0.15/helpers/basic_auth/SMB/Makefile.in
--- squid-3.1.0.15/helpers/basic_auth/SMB/Makefile.in.smb-path	2009-11-23 04:10:32.000000000 +0100
+++ squid-3.1.0.15/helpers/basic_auth/SMB/Makefile.in	2009-11-23 17:54:47.000000000 +0100
@@ -271,11 +271,11 @@ INCLUDES = -I$(top_srcdir) -I$(top_srcdi
 	-I$(top_builddir)/include $(SQUID_CPPUNIT_INC) -I$(srcdir)
 
 # SAMBAPREFIX must point to the directory where Samba has been installed.
-# By default, Samba is installed in /usr/local/samba. If you changed this
+# By default, Samba is installed in /usr. If you changed this
 # by using the --prefix option when configuring Samba, you need to change
 # SAMBAPREFIX accordingly.
 SMB_AUTH_HELPER = smb_auth.sh
-SAMBAPREFIX = /usr/local/samba
+SAMBAPREFIX = /usr
 SMB_AUTH_HELPER_PATH = $(libexecdir)/$(SMB_AUTH_HELPER)
 libexec_SCRIPTS = $(SMB_AUTH_HELPER)
 smb_auth_CFLAGS = -DSAMBAPREFIX=\"$(SAMBAPREFIX)\" -DHELPERSCRIPT=\"$(SMB_AUTH_HELPER_PATH)\"


Index: squid.spec
===================================================================
RCS file: /cvs/pkgs/rpms/squid/devel/squid.spec,v
retrieving revision 1.151
retrieving revision 1.152
diff -u -p -r1.151 -r1.152
--- squid.spec	23 Nov 2009 16:16:37 -0000	1.151
+++ squid.spec	23 Nov 2009 16:57:17 -0000	1.152
@@ -4,7 +4,7 @@
 
 Name:     squid
 Version:  3.1.0.15
-Release:  1%{?dist}
+Release:  2%{?dist}
 Summary:  The Squid proxy caching server
 Epoch:    7
 License:  GPLv2+
@@ -29,7 +29,7 @@ Source98: perl-requires-squid.sh
 Patch201: squid-3.1.0.9-config.patch
 Patch202: squid-3.1.0.9-location.patch
 Patch204: squid-3.0.STABLE1-perlpath.patch
-Patch205: squid-3.1.0.13-smb-path.patch
+Patch205: squid-3.1.0.15-smb-path.patch
 Patch208: squid-3.0.STABLE7-from_manpg.patch
 
 Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -252,7 +252,7 @@ fi
     chgrp squid /var/cache/samba/winbindd_privileged >/dev/null 2>&1 || :
 
 %changelog
-* Mon Nov 23 2009 Henrik Nordstrom <henrik at henriknordstrom.net> - 7:3.1.0.15-1
+* Mon Nov 23 2009 Henrik Nordstrom <henrik at henriknordstrom.net> - 7:3.1.0.15-2
 - Update to 3.1.0.15 with a number of bugfixes and a workaround for
   ICEcast/SHOUTcast streams.
 


--- squid-3.1.0.13-smb-path.patch DELETED ---