From 1e4649a6318a41e11a3f86b9eb10bd92b56e5d93 Mon Sep 17 00:00:00 2001 From: ingvar Date: Mon, 28 May 2007 21:04:17 +0000 Subject: [PATCH] * Mon May 28 2007 Ingvar Hagelund - 1.0.4-3 - Fixed initrc-script bug only visible on el4 (fixes #107) git-svn-id: svn+ssh://projects.linpro.no/svn/varnish/trunk@1476 d4fa192b-c00b-0410-8231-f00ffab90ce4 --- varnish-cache/redhat/varnish.spec | 21 ++++++++++++++++++++- 1 file changed, 20 insertions(+), 1 deletion(-) diff --git a/varnish-cache/redhat/varnish.spec b/varnish-cache/redhat/varnish.spec index ef068c9e..5cb3aef3 100644 --- a/varnish-cache/redhat/varnish.spec +++ b/varnish-cache/redhat/varnish.spec @@ -1,7 +1,7 @@ Summary: Varnish is a high-performance HTTP accelerator Name: varnish Version: 1.0.svn -Release: 20070517%{?dist} +Release: 20070528%{?dist} License: BSD-like Group: System Environment/Daemons URL: http://www.varnish-cache.org/ @@ -28,6 +28,7 @@ Summary: Libraries for %{name} Group: System Environment/Libraries BuildRequires: ncurses-devel #Requires: ncurses +#Obsoletes: libvarnish1 %description libs Libraries for %{name}. @@ -66,6 +67,13 @@ sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool sed -e ' s/8080/80/g ' etc/default.vcl > redhat/default.vcl + +%if "%dist" >= "el4" + sed -i 's,daemon --pidfile \${PIDFILE},daemon,g' redhat/varnish.initrc + sed -i 's,status -p \$PIDFILE,status,g' redhat/varnish.initrc + sed -i 's,killproc -p \$PIDFILE,killproc,g' redhat/varnish.initrc +%endif + %install rm -rf %{buildroot} make install DESTDIR=%{buildroot} INSTALL="install -p" @@ -139,6 +147,17 @@ fi %postun libs -p /sbin/ldconfig %changelog +* Mon May 28 2007 Ingvar Hagelund - 1.0.4-3 +- Fixed initrc-script bug only visible on el4 (fixes #107) + +* Sun May 20 2007 Ingvar Hagelund - 1.0.4-2 +- Repack from unchanged 1.0.4 tarball +- Final review request and CVS request for Fedora Extras +- Repack with extra obsoletes for upgrading from older sf.net package + +* Fri May 18 2007 Dag-Erling Smørgrav - 1.0.4-1 +- Bump Version and Release for 1.0.4 + * Wed May 16 2007 Ingvar Hagelund - 1.0.svn-20070517 - Wrapping up for 1.0.4 - Changes in sysconfig and init scripts. Syncing with files in -- 2.39.5