From: radek <radek@pld-linux.org>
Date: Mon, 30 Aug 2004 15:12:50 +0000 (+0000)
Subject: - mv apache{,1}-*; note: Source0 URL points to 404
X-Git-Tag: auto/ac/apache1-mod_dynvhost-1-2
X-Git-Url: http://git.pld-linux.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=refs%2Ftags%2Fauto%2Fac%2Fapache1-mod_dynvhost-1-2;p=packages%2Fapache1-mod_dynvhost.git

- mv apache{,1}-*; note: Source0 URL points to 404

Changed files:
    apache1-mod_dynvhost.spec -> 1.16
---

diff --git a/apache1-mod_dynvhost.spec b/apache1-mod_dynvhost.spec
index 6e4566b..06a1fcc 100644
--- a/apache1-mod_dynvhost.spec
+++ b/apache1-mod_dynvhost.spec
@@ -1,8 +1,8 @@
 %define		mod_name	dynvhost
-%define 	apxs		/usr/sbin/apxs
+%define 	apxs		/usr/sbin/apxs1
 Summary:	Dynamic Virtual Hosting
 Summary(pl):	Dynamiczne Serwery Wirtualne
-Name:		apache-mod_%{mod_name}
+Name:		apache1-mod_%{mod_name}
 Version:	1
 Release:	2
 License:	GPL
@@ -11,10 +11,11 @@ Source0:	http://funkcity.com/0101/projects/dynvhost/mod_%{mod_name}.tar.gz
 # Source0-md5:	7608ca6ce5c906bfe960cd0f92bdb6d8
 URL:		http://funkcity.com/0101/
 BuildRequires:	%{apxs}
-BuildRequires:	apache(EAPI)-devel
+BuildRequires:	apache1-devel
 BuildRequires:	zlib-devel
 Requires(post,preun):	%{apxs}
-Requires:	apache(EAPI)
+Requires:	apache1
+Obsoletes:	apache-mod_%{mod_name} <= %{version}
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %define		_pkglibdir	%(%{apxs} -q LIBEXECDIR)
@@ -47,15 +48,15 @@ rm -rf $RPM_BUILD_ROOT
 
 %post
 %{apxs} -e -a -n %{mod_name} %{_pkglibdir}/mod_%{mod_name}.so 1>&2
-if [ -f /var/lock/subsys/httpd ]; then
-	/etc/rc.d/init.d/httpd restart 1>&2
+if [ -f /var/lock/subsys/apache ]; then
+	/etc/rc.d/init.d/apache restart 1>&2
 fi
 
 %preun
 if [ "$1" = "0" ]; then
 	%{apxs} -e -A -n %{mod_name} %{_pkglibdir}/mod_%{mod_name}.so 1>&2
-	if [ -f /var/lock/subsys/httpd ]; then
-		/etc/rc.d/init.d/httpd restart 1>&2
+	if [ -f /var/lock/subsys/apache ]; then
+		/etc/rc.d/init.d/apache restart 1>&2
 	fi
 fi