From: radek <radek@pld-linux.org>
Date: Sat, 4 Sep 2004 12:51:27 +0000 (+0000)
Subject: - mv apache{,1}-*, other (cosmetic) tweaks
X-Git-Tag: auto/ac/apache1-mod_mp3-0_40-1
X-Git-Url: http://git.pld-linux.org/?p=packages%2Fapache1-mod_mp3.git;a=commitdiff_plain;h=2e8b6ebd466173b1b5dea0b1d1474aff6c5c9579

- mv apache{,1}-*, other (cosmetic) tweaks

Changed files:
    apache1-mod_mp3.spec -> 1.27
---

diff --git a/apache1-mod_mp3.spec b/apache1-mod_mp3.spec
index 1311486..1b5ca2f 100644
--- a/apache1-mod_mp3.spec
+++ b/apache1-mod_mp3.spec
@@ -1,29 +1,28 @@
-%define		arname		mod_mp3
 %define		mod_name	mp3
-%define 	apxs		/usr/sbin/apxs
+%define 	apxs		/usr/sbin/apxs1
 Summary:	MP3 Apache module
 Summary(pl):	Modu³ MP3 do Apache
-Name:		apache-mod_mp3
+Name:		apache1-mod_%{mod_name}
 Version:	0.40
 Release:	1
 License:	BSD
 Group:		Networking/Daemons
-Source0:	http://software.tangent.org/download/%{arname}-%{version}.tar.gz
+Source0:	http://www.tangent.org/download/mod_%{mod_name}-%{version}.tar.gz
 # Source0-md5:	a36b25ee4db268df45a03231993e718d
-Source1:	%{arname}.conf
+Source1:	%{name}.conf
 URL:		http://media.tangent.org/
 BuildRequires:	%{apxs}
-BuildRequires:	apache(EAPI)-devel >= 1.3.12
+BuildRequires:	apache1-devel >= 1.3.12
 BuildRequires:	libghttp-devel
-PreReq:		apache(EAPI) >= 1.3.12
+PreReq:		apache1 >= 1.3.12
 Requires(post,preun):	%{apxs}
 Requires(post,preun):	grep
 Requires(preun):	fileutils
-Provides:	%{arname}
+Obsoletes:	apache-mod_%{mod_name} <= %{version}
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
-%define         _pkglibdir      %(%{apxs} -q LIBEXECDIR)
-%define         _sysconfdir     /etc/httpd
+%define	_pkglibdir	%(%{apxs} -q LIBEXECDIR)
+%define	_sysconfdir	/etc/apache
 
 %description
 This turns apache into your basic RIAA hating, but every college
@@ -40,7 +39,7 @@ plik
 pamiêci. Baw siê dobrze; pliki mp3 nie s± za³±czone.
 
 %prep
-%setup -q -n %{arname}-%{version}
+%setup -q -n mod_%{mod_name}-%{version}
 
 %build
 ./configure
@@ -61,28 +60,28 @@ rm -rf $RPM_BUILD_ROOT
 
 %post
 %{apxs} -e -a -n %{mod_name} %{_pkglibdir}/mod_%{mod_name}.so 1>&2
-if [ -f %{_sysconfdir}/httpd.conf ] && \
-	! grep -q "^Include.*/%{arname}.conf" %{_sysconfdir}/httpd.conf; then
-		echo "Include %{_sysconfdir}/%{arname}.conf" >> %{_sysconfdir}/httpd.conf
+if [ -f %{_sysconfdir}/apache.conf ] && \
+	! grep -q "^Include.*/mod_%{mod_name}.conf" %{_sysconfdir}/apache.conf; then
+		echo "Include %{_sysconfdir}/mod_%{mod_name}.conf" >> %{_sysconfdir}/apache.conf
 fi
-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
 	umask 027
-	grep -E -v "^Include.*%{arname}.conf" %{_sysconfdir}/httpd.conf > \
-		%{_sysconfdir}/httpd.conf.tmp
-	mv -f %{_sysconfdir}/httpd.conf.tmp %{_sysconfdir}/httpd.conf
-	if [ -f /var/lock/subsys/httpd ]; then
-		/etc/rc.d/init.d/httpd restart 1>&2
+	grep -E -v "^Include.*mod_%{mod_name}.conf" %{_sysconfdir}/apache.conf > \
+		%{_sysconfdir}/apache.conf.tmp
+	mv -f %{_sysconfdir}/apache.conf.tmp %{_sysconfdir}/apache.conf
+	if [ -f /var/lock/subsys/apache ]; then
+		/etc/rc.d/init.d/apache restart 1>&2
 	fi
 fi
 
 %files
 %defattr(644,root,root,755)
 %doc README ChangeLog LICENSE faq.html support
-%config(noreplace) %verify(not size mtime md5) %{_sysconfdir}/mod_mp3.conf
+%config(noreplace) %verify(not size mtime md5) %{_sysconfdir}/*.conf
 %attr(755,root,root) %{_pkglibdir}/mod_mp3.so