rpms/squid/devel squid.spec, 1.139, 1.140 squid-3.1.0.13-build.patch, 1.3, NONE

[Henrik Nordström]

Author: hno

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

Modified Files:
	squid.spec 
Removed Files:
	squid-3.1.0.13-build.patch 
Log Message:
Use proper configure options instead of patching in pkgdata etc.. 



Index: squid.spec
===================================================================
RCS file: /cvs/pkgs/rpms/squid/devel/squid.spec,v
retrieving revision 1.139
retrieving revision 1.140
diff -u -p -r1.139 -r1.140
--- squid.spec	4 Sep 2009 04:14:36 -0000	1.139
+++ squid.spec	7 Sep 2009 07:42:04 -0000	1.140
@@ -4,7 +4,7 @@
 
 Name:     squid
 Version:  3.1.0.13
-Release:  1%{?dist}
+Release:  2%{?dist}
 Summary:  The Squid proxy caching server
 Epoch:    7
 License:  GPLv2+
@@ -36,7 +36,6 @@ Patch005: squid-3.1.0.13-alias-link.patc
 # will break upstream ones.
 Patch201: squid-3.1.0.9-config.patch
 Patch202: squid-3.1.0.9-location.patch
-Patch203: squid-3.1.0.13-build.patch
 Patch204: squid-3.0.STABLE1-perlpath.patch
 Patch205: squid-3.1.0.13-smb-path.patch
 Patch208: squid-3.0.STABLE7-from_manpg.patch
@@ -72,7 +71,6 @@ lookup program (dnsserver), a program fo
 %patch005 -p0 -b .alias-link
 %patch201 -p1 -b .config
 %patch202 -p1 -b .location
-%patch203 -p1 -b .build
 %patch204 -p1 -b .perlpath
 %patch205 -p1 -b .smb-path
 %patch208 -p1 -b .from_manpg
@@ -83,7 +81,7 @@ export CXXFLAGS="-fPIE %{optflags}" ; ex
    --exec_prefix=/usr \
    --libexecdir=%{_libdir}/squid \
    --localstatedir=/var \
-   --datadir=%{_datadir} \
+   --datadir=%{_datadir}/squid \
    --sysconfdir=/etc/squid \
    --with-logdir='$(localstatedir)/log/squid' \
    --with-pidfile='$(localstatedir)/run/squid.pid' \
@@ -116,21 +114,22 @@ export CXXFLAGS="-fPIE %{optflags}" ; ex
    --with-default-user="squid" \
    --with-filedescriptors=16384 \
    --with-dl \
-   --with-openssl=/usr/kerberos \
+   --with-openssl \
    --with-pthreads
 
-# following options should be enabled but fails building
+# following options should be enabled but fails Fedora QA chechs
 #   --enable-negotiate-auth-helpers="squid_kerb_auth"
 
 export CXXFLAGS="-fPIE" ; export CFLAGS="-fPIE -Os -g -pipe -fsigned-char" ; export LDFLAGS="-pie" ;
-make %{?_smp_mflags}
+make \
+	DEFAULT_SWAP_DIR='$(localstatedir)/spool/squid' \
+	%{?_smp_mflags}
 
 %install
 rm -rf $RPM_BUILD_ROOT
-%makeinstall  \
-        sysconfdir=$RPM_BUILD_ROOT/etc/squid \
-        localstatedir=$RPM_BUILD_ROOT/var \
-        libexecdir=$RPM_BUILD_ROOT/%{_libdir}/squid
+make \
+	DESTDIR=$RPM_BUILD_ROOT \
+	install
 echo "
 #
 # This is /etc/httpd/conf.d/squid.conf


--- squid-3.1.0.13-build.patch DELETED ---