- 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 131148642a0684a3ac770d701399a110812175f4..1b5ca2fc569cf0d6fa1231a94ff97f6188927c1d 100644 (file)
--- a/apache1-mod_mp3.spec
+++ b/apache1-mod_mp3.spec
@@ -1,29 +1,28 @@
-%define                arname          mod_mp3

 %define                mod_name        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
 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
 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
 # Source0-md5: a36b25ee4db268df45a03231993e718d

-Source1:       %{arname}.conf
+Source1:       %{name}.conf

 URL:           http://media.tangent.org/
 BuildRequires: %{apxs}
 URL:           http://media.tangent.org/
 BuildRequires: %{apxs}

-BuildRequires: apache(EAPI)-devel >= 1.3.12
+BuildRequires: apache1-devel >= 1.3.12

 BuildRequires: libghttp-devel
 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
 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)
 
 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
 
 %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
 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
 
 %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
 
 %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
 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
 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
        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
 %attr(755,root,root) %{_pkglibdir}/mod_mp3.so