- umask in scripts, other fixes/cosmetics where needed

[packages/apache1-mod_mp3.git] / apache1-mod_mp3.spec

diff --git a/apache1-mod_mp3.spec b/apache1-mod_mp3.spec
index 76866ea9bfbb2474537ed1de71834e9ec4c7412f..d7f6d1187a3b0453af54479baa2d4536999e3461 100644 (file)
--- a/apache1-mod_mp3.spec
+++ b/apache1-mod_mp3.spec
@@ -4,35 +4,21 @@
 Summary:       MP3 Apache module
 Summary(pl):   Modu³ MP3 do Apache
 Name:          apache-mod_mp3
-Version:       0.31
-Release:       2
-License:       distributable
+Version:       0.39
+Release:       1
+License:       BSD
 Group:         Networking/Daemons
-Group(cs):     Sí»ové/Démoni
-Group(da):     Netværks/Dæmoner
-Group(de):     Netzwerkwesen/Server
-Group(es):     Red/Servidores
-Group(fr):     Réseau/Serveurs
-Group(is):     Net/Púkar
-Group(it):     Rete/Demoni
-Group(no):     Nettverks/Daemoner
-Group(pl):     Sieciowe/Serwery
-Group(pt):     Rede/Servidores
-Group(ru):     óÅÔØ/äÅÍÏÎÙ
-Group(sl):     Omre¾ni/Stre¾niki
-Group(sv):     Nätverk/Demoner
-Group(uk):     íÅÒÅÖÁ/äÅÍÏÎÉ
-Source0:       ftp://ftp.tangent.org/pub/apache/%{arname}-%{version}.tar.gz
+Source0:       http://software.tangent.org/download/%{arname}-%{version}.tar.gz
 Source1:       %{arname}.conf
 URL:           http://media.tangent.org/
-Requires:      apache >= 1.3.12
-Prereq:                grep
-Prereq:                apache(EAPI) >= 1.3.12
-Prereq:                %{_sbindir}/apxs
-Provides:      %{arname}
 BuildRequires: %{apxs}
 BuildRequires: apache(EAPI)-devel >= 1.3.12
 BuildRequires: expat-devel
+PreReq:                apache(EAPI) >= 1.3.12
+Requires(post,preun):  %{apxs}
+Requires(post,preun):  grep
+Requires(preun):       fileutils
+Provides:      %{arname}
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %define         _pkglibdir      %(%{apxs} -q LIBEXECDIR)
@@ -57,22 +43,21 @@ pami
 
 %build
 ./configure
+
 %{__make} APXS=%{apxs}
 
 %install
 rm -rf $RPM_BUILD_ROOT
 install -d $RPM_BUILD_ROOT{%{_pkglibdir},%{_sysconfdir}}
 
-install mod_%{mod_name}.so $RPM_BUILD_ROOT%{_pkglibdir}
+install src/mod_%{mod_name}.so $RPM_BUILD_ROOT%{_pkglibdir}
 install %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}
 
-gzip -9nf README ChangeLog LICENSE
-
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %post
-%{_sbindir}/apxs -e -a -n %{mod_name} %{_pkglibdir}/mod_%{mod_name}.so 1>&2
+%{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
@@ -80,12 +65,13 @@ fi
 if [ -f /var/lock/subsys/httpd ]; then
        /etc/rc.d/init.d/httpd restart 1>&2
 fi
-       
+
 %preun
 if [ "$1" = "0" ]; then
-       %{_sbindir}/apxs -e -A -n %{mod_name} %{_pkglibdir}/mod_%{mod_name}.so 1>&2
+       %{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
+               %{_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
@@ -94,6 +80,6 @@ fi
 
 %files
 %defattr(644,root,root,755)
-%doc *.gz faq.html support
+%doc README ChangeLog LICENSE faq.html support
 %config(noreplace) %verify(not size mtime md5) %{_sysconfdir}/mod_mp3.conf
 %attr(755,root,root) %{_pkglibdir}/mod_mp3.so