OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Ralf S. Engelschall
Root: /e/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-re, openpkg-web, openpkg-src Date: 16-Oct-2002 13:33:26
Branch: HEAD Handle: 2002101612332402
Modified files:
openpkg-re/vcheck vc.squid
openpkg-src/squid squid.spec
openpkg-web news.txt
Log:
upgrade to 2.5 branch
Summary:
Revision Changes Path
1.4 +3 -3 openpkg-re/vcheck/vc.squid
1.26 +10 -9 openpkg-src/squid/squid.spec
1.1801 +1 -0 openpkg-web/news.txt
____________________________________________________________________________
Index: openpkg-re/vcheck/vc.squid
============================================================
$ cvs diff -u -r1.3 -r1.4 vc.squid
--- openpkg-re/vcheck/vc.squid 3 Jul 2002 05:24:42 -0000 1.3
+++ openpkg-re/vcheck/vc.squid 16 Oct 2002 11:33:24 -0000 1.4
@@ -2,8 +2,8 @@
}
prog squid = {
- version = 2.4.STABLE7
- url = http://www.squid-cache.org/Versions/v2/2.4/
- regex = squid-(2\.4\.STABLE\d+)-src\.tar\.gz
+ version = 2.5.STABLE1
+ url = http://www.squid-cache.org/Versions/v2/2.5/
+ regex = squid-(2\.\d+\.STABLE\d+)\.tar\.gz
}
Index: openpkg-src/squid/squid.spec
============================================================
$ cvs diff -u -r1.25 -r1.26 squid.spec
--- openpkg-src/squid/squid.spec 13 Aug 2002 12:50:03 -0000 1.25
+++ openpkg-src/squid/squid.spec 16 Oct 2002 11:33:26 -0000 1.26
@@ -23,8 +23,10 @@
## SUCH DAMAGE.
##
-%define V_long 2.4.STABLE7
-%define V_short 2.4.7
+# package version
+%define V_maj 2
+%define V_min 5
+%define V_rev 1
# package information
Name: squid
@@ -35,13 +37,12 @@
Distribution: OpenPKG [BASE]
Group: Web
License: GPL
-Version: %{V_short}
-Release: 20020703
+Version: %{V_maj}.%{V_min}.%{V_rev}
+Release: 20021016
# list of sources
-Source0: http://www.squid-cache.org/Versions/v2/2.4/squid-%{V_long}-src.tar.gz
+Source0:
http://www.squid-cache.org/Versions/v%{V_maj}/%{V_maj}.%{V_min}/squid-%{V_maj}.%{V_min}.STABLE%{V_rev}.tar.gz
Source1: rc.squid
-Patch0: squid.patch
# build information
Prefix: %{l_prefix}
@@ -58,8 +59,7 @@
transparent caching, etc.
%prep
- %setup -q -n squid-%{V_long}
- %patch -p0
+ %setup -q -n squid-%{V_maj}.%{V_min}.STABLE%{V_rev}
%build
CC="%{l_cc}" \
@@ -68,6 +68,7 @@
--prefix=%{l_prefix} \
--sysconfdir=%{l_prefix}/etc/squid \
--localstatedir=%{l_prefix}/var/squid \
+ --datadir=%{l_prefix}/share/squid \
--disable-ident-lookups \
--enable-err-language=English \
--enable-storeio="ufs diskd null" \
@@ -89,6 +90,7 @@
-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;' \
@@ -99,7 +101,6 @@
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
- mv $RPM_BUILD_ROOT%{l_prefix}/bin/client
$RPM_BUILD_ROOT%{l_prefix}/libexec/client
%{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
Index: openpkg-web/news.txt
============================================================
$ cvs diff -u -r1.1800 -r1.1801 news.txt
--- openpkg-web/news.txt 16 Oct 2002 08:39:45 -0000 1.1800
+++ openpkg-web/news.txt 16 Oct 2002 11:33:25 -0000 1.1801
@@ -1,3 +1,4 @@
+16-Oct-2002: Upgraded package: P<squid-2.5.1-20021016>
16-Oct-2002: Upgraded package: P<perl-xml-20021016-20021016>
16-Oct-2002: Upgraded package: P<vim-6.1.229-20021016>
16-Oct-2002: Upgraded package: P<perl-parse-20021016-20021016>
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
