OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Ralf S. Engelschall
Root: /e/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src Date: 27-Nov-2002 14:29:03
Branch: HEAD Handle: 2002112713290200
Modified files:
openpkg-src/squid squid.spec
Log:
fix paths in config by switching to DESTDIR approach; remove non-English texts
Summary:
Revision Changes Path
1.28 +5 -11 openpkg-src/squid/squid.spec
____________________________________________________________________________
Index: openpkg-src/squid/squid.spec
============================================================
$ cvs diff -u -r1.27 -r1.28 squid.spec
--- openpkg-src/squid/squid.spec 27 Nov 2002 10:28:31 -0000 1.27
+++ openpkg-src/squid/squid.spec 27 Nov 2002 13:29:02 -0000 1.28
@@ -85,25 +85,19 @@
%{l_shtool} mkdir -f -p -m 755 $RPM_BUILD_ROOT%{l_prefix}
%{l_shtool} mkdir -f -p -m 755 $RPM_BUILD_ROOT%{l_prefix}/etc/squid
- %{l_shtool} subst \
- -e "s;^\\(prefix[^=]*=\\).*\$;\\1 $RPM_BUILD_ROOT%{l_prefix};" \
- -e "s;^\\(exec_prefix[^=]*=\\).*\$;\\1 $RPM_BUILD_ROOT%{l_prefix};" \
- -e "s;^\\(sysconfdir[^=]*=\\).*\$;\\1
$RPM_BUILD_ROOT%{l_prefix}/etc/squid;" \
- -e "s;^\\(localstatedir[^=]*=\\).*\$;\\1
$RPM_BUILD_ROOT%{l_prefix}/var/squid;" \
- -e "s;^\\(datadir[^=]*=\\).*\$;\\1 $RPM_BUILD_ROOT%{l_prefix}/share/squid;"
\
- `find . -name Makefile -print`
- %{l_shtool} subst \
- -e 's;install: all install-mkdirs;install: install-mkdirs;' \
- src/Makefile
- %{l_make} %{l_mflags} install
+ %{l_make} %{l_mflags} install AM_MAKEFLAGS="DESTDIR=$RPM_BUILD_ROOT"
rm -f $RPM_BUILD_ROOT%{l_prefix}/bin/Run*
rm -f $RPM_BUILD_ROOT%{l_prefix}/bin/RunCache
rm -f $RPM_BUILD_ROOT%{l_prefix}/etc/squid/*.default
rm -f $RPM_BUILD_ROOT%{l_prefix}/etc/squid/*.orig
+ rm -rf $RPM_BUILD_ROOT%{l_prefix}/share/squid/errors/[A-D]*
+ rm -rf $RPM_BUILD_ROOT%{l_prefix}/share/squid/errors/Es*
+ rm -rf $RPM_BUILD_ROOT%{l_prefix}/share/squid/errors/[F-Z]*
%{l_shtool} mkdir -f -p -m 755 $RPM_BUILD_ROOT%{l_prefix}/var/squid/logs
%{l_shtool} mkdir -f -p -m 755 $RPM_BUILD_ROOT%{l_prefix}/var/squid/cache
+
%{l_shtool} subst \
-e 's;^# \(cache_mgr\).*;\1 %{l_musr};' \
-e 's;^# \(cache_effective_user\).*;\1 %{l_musr};' \
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
