From 11120f3e8e42e5cd34e14ab7e59eea5ae93706b8 Mon Sep 17 00:00:00 2001
From: radek <radek@pld-linux.org>
Date: Sun, 29 Aug 2004 19:34:15 +0000
Subject: [PATCH] - mv apache{,1}-*; release 1

Changed files:
    apache1-mod_auth_yp.spec -> 1.4
---
 apache1-mod_auth_yp.spec | 22 ++++++++++++----------
 1 file changed, 12 insertions(+), 10 deletions(-)

diff --git a/apache1-mod_auth_yp.spec b/apache1-mod_auth_yp.spec
index a0022f7..30d6d19 100644
--- a/apache1-mod_auth_yp.spec
+++ b/apache1-mod_auth_yp.spec
@@ -1,19 +1,21 @@
 %define		mod_name	auth_yp
-%define 	apxs		/usr/sbin/apxs
+%define 	apxs		/usr/sbin/apxs1
 Summary:	NIS/YP domain authentication module for Apache
 Summary(pl):	Modu³ Apache'a uwierzytelniaj±cy u¿ytkownika w domenie NIS/YP
-Name:		apache-mod_%{mod_name}
+Name:		apache1-mod_%{mod_name}
 Version:	1.0
-Release:	2
+Release:	1
 License:	GPL
 Group:		Networking/Daemons
 Source0:	http://nte.univ-lyon2.fr/~brogniar/articles/mod_%{mod_name}.c
 Source1:	%{name}-htaccess
 Patch0:		%{name}-authfile.patch
 Patch1:		%{name}-shadow.patch
-BuildRequires:	apache(EAPI)-devel
-Prereq:		%{_sbindir}/apxs
-Requires:	apache(EAPI)
+BuildRequires:	%{apxs}
+BuildRequires:	apache1-devel
+Requires(post,preun):	%{apxs}
+Requires:	apache1
+Obsoletes:	apache-mod_%{mod_name} <= %{version}
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %define		_pkglibdir	%(%{apxs} -q LIBEXECDIR)
@@ -45,15 +47,15 @@ install %{SOURCE1} ./sample-htaccess
 
 %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
 
-- 
2.44.0