- use PIC

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

diff --git a/apache1-mod_mp3.spec b/apache1-mod_mp3.spec
index 76866ea9bfbb2474537ed1de71834e9ec4c7412f..803d9d02c253a441a09e46c6e23828ea26fa2ee6 100644 (file)
--- a/apache1-mod_mp3.spec
+++ b/apache1-mod_mp3.spec
@@ -1,45 +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
-Version:       0.31
-Release:       2
-License:       distributable
+Name:          apache1-mod_%{mod_name}
+Version:       0.40
+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
-Source1:       %{arname}.conf
+Source0:       http://www.tangent.org/download/mod_%{mod_name}-%{version}.tar.gz
+# Source0-md5: a36b25ee4db268df45a03231993e718d
+Source1:       %{name}.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
+BuildRequires: apache1-devel >= 1.3.12
+BuildRequires: libghttp-devel
+PreReq:                apache1 >= 1.3.12
+Requires(post,preun):  %{apxs}
+Requires(post,preun):  grep
+Requires(preun):       fileutils
+Obsoletes:     apache-mod_%{mod_name} <= %{version}
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
-%define         _pkglibdir      %(%{apxs} -q LIBEXECDIR)
-%define         _sysconfdir     /etc/httpd
-
-%prep
-%setup -q -n %{arname}-%{version}
+%define        _pkglibdir      %(%{apxs} -q LIBEXECDIR)
+%define        _sysconfdir     /etc/apache
 
 %description
 This turns apache into your basic RIAA hating, but every college
@@ -55,45 +38,50 @@ plik
 plików mp3 w pamiêci, pozwalaj±c serwerowi operowaæ wy³±cznie na
 pamiêci. Baw siê dobrze; pliki mp3 nie s± za³±czone.
 
+%prep
+%setup -q -n mod_%{mod_name}-%{version}
+
 %build
 ./configure
-%{__make} APXS=%{apxs}
+
+%{__make} \
+       APXS=%{apxs} \
+       ACINCLUDEDIR="-I`%{apxs} -q INCLUDEDIR` `%{apxs} -q CFLAGS` %{rpmcflags} -fPIC"
 
 %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
-if [ -f %{_sysconfdir}/httpd.conf ] && \
-       ! grep -q "^Include.*/%{arname}.conf" %{_sysconfdir}/httpd.conf; then
-               echo "Include %{_sysconfdir}/%{arname}.conf" >> %{_sysconfdir}/httpd.conf
+%{apxs} -e -a -n %{mod_name} %{_pkglibdir}/mod_%{mod_name}.so 1>&2
+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
-       %{_sbindir}/apxs -e -A -n %{mod_name} %{_pkglibdir}/mod_%{mod_name}.so 1>&2
-       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
+       %{apxs} -e -A -n %{mod_name} %{_pkglibdir}/mod_%{mod_name}.so 1>&2
+       umask 027
+       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 *.gz faq.html support
-%config(noreplace) %verify(not size mtime md5) %{_sysconfdir}/mod_mp3.conf
+%doc README ChangeLog LICENSE faq.html support
+%config(noreplace) %verify(not size mtime md5) %{_sysconfdir}/*.conf
 %attr(755,root,root) %{_pkglibdir}/mod_mp3.so