SPECS: squid.spec - fix perl paths in %prep rather in %build

[glen]

Author: glen                         Date: Mon Oct 31 15:07:27 2005 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- fix perl paths in %prep rather in %build

---- Files affected:
SPECS:
   squid.spec (1.225 -> 1.226) 

---- Diffs:

================================================================
Index: SPECS/squid.spec
diff -u SPECS/squid.spec:1.225 SPECS/squid.spec:1.226
--- SPECS/squid.spec:1.225	Fri Oct 28 08:18:26 2005
+++ SPECS/squid.spec	Mon Oct 31 16:07:22 2005
@@ -56,6 +56,7 @@
 BuildRequires:	pam-devel
 BuildRequires:	perl-base
 BuildRequires:	rpmbuild(macros) >= 1.202
+BuildRequires:	sed >= 4.0
 BuildRequires:	unzip
 PreReq:		rc-scripts >= 0.2.0
 PreReq:		setup >= 2.4.6
@@ -441,6 +442,8 @@
 %patch111 -p1
 %{?with_combined_log:%patch112 -p1}
 
+%{__sed} -i -e '1s#!.*bin/perl#!%{__perl}#' {contrib,scripts,helpers/*/*}/*.pl
+
 %build
 %{__aclocal}
 %{__autoconf}
@@ -476,10 +479,6 @@
 
 %{__make}
 
-perl -pi -e 's#%{_prefix}/.*bin/perl#%{_bindir}/perl#g' contrib/*
-perl -pi -e 's#%{_prefix}/.*bin/perl#%{_bindir}/perl#g' scripts/*
-find helpers/ -type f | xargs perl -pi -e 's#%{_prefix}/.*bin/perl#%{_bindir}/perl#g'
-
 %install
 rm -rf $RPM_BUILD_ROOT
 install -d $RPM_BUILD_ROOT%{_cgidir} \
@@ -542,7 +541,7 @@
 %useradd -o -u 91 -s /bin/false -g squid -c "SQUID http caching daemon" -d /var/cache/squid squid
 %addusertogroup stats squid
 
-[ -L %{_datadir}/squid/errors ] && rm -rf %{_datadir}/squid/errors || :
+[ -L %{_datadir}/squid/errors ] && rm -f %{_datadir}/squid/errors || :
 
 %post
 if ! grep -q "^visible_hostname" /etc/squid/squid.conf; then
@@ -742,6 +741,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.226  2005/10/31 15:07:22  glen
+- fix perl paths in %prep rather in %build
+
 Revision 1.225  2005/10/28 06:18:26  hawk
 - updated to 2.5.STABLE12
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/squid.spec?r1=1.225&r2=1.226&f=u