- converted to UTF-8

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

diff --git a/apache1-mod_mp3.spec b/apache1-mod_mp3.spec
index fc75ca3508041ce8c599c82521c656130a4c4e58..c3c4162775718a880e70a116e4111753e9c52fa9 100644 (file)
--- a/apache1-mod_mp3.spec
+++ b/apache1-mod_mp3.spec
@@ -3,10 +3,10 @@
 %define                mod_name        mp3
 %define        apxs            /usr/sbin/apxs1
 Summary:       MP3 Apache module
 %define                mod_name        mp3
 %define        apxs            /usr/sbin/apxs1
 Summary:       MP3 Apache module

-Summary(pl):   Modu³ MP3 do Apache
+Summary(pl.UTF-8):   Moduł MP3 do Apache

 Name:          apache1-mod_%{mod_name}
 Version:       0.40
 Name:          apache1-mod_%{mod_name}
 Version:       0.40

-Release:       2.2
+Release:       4

 License:       BSD
 Group:         Networking/Daemons
 Source0:       http://www.tangent.org/download/mod_%{mod_name}-%{version}.tar.gz
 License:       BSD
 Group:         Networking/Daemons
 Source0:       http://www.tangent.org/download/mod_%{mod_name}-%{version}.tar.gz


@@ -16,11 +16,12 @@ URL:                http://media.tangent.org/
 BuildRequires: %{apxs}
 BuildRequires: apache1-devel >= 1.3.33-2
 BuildRequires: libghttp-devel
 BuildRequires: %{apxs}
 BuildRequires: apache1-devel >= 1.3.33-2
 BuildRequires: libghttp-devel

-Requires:      apache1 >= 1.3.33-2
+BuildRequires: rpmbuild(macros) >= 1.268

 Requires(triggerpostun):       %{apxs}
 Requires(triggerpostun):       grep
 Requires(triggerpostun):       sed >= 4.0
 Requires(triggerpostun):       %{apxs}
 Requires(triggerpostun):       grep
 Requires(triggerpostun):       sed >= 4.0

-Obsoletes:     apache-mod_%{mod_name} <= %{version}
+Requires:      apache1(EAPI)
+Obsoletes:     apache-mod_mp3 <= 0.40

 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %define                _pkglibdir      %(%{apxs} -q LIBEXECDIR 2>/dev/null)
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %define                _pkglibdir      %(%{apxs} -q LIBEXECDIR 2>/dev/null)


@@ -33,12 +34,12 @@ either straight through or randomly. It can also be used to cache
 MP3's into memory and have the server operate entirely from memory.
 Enjoy, groove, MP3s not included.
 
 MP3's into memory and have the server operate entirely from memory.
 Enjoy, groove, MP3s not included.
 

-%description -l pl
+%description -l pl.UTF-8

 Ten pakiet zamienia Twojego Apache w znienawidzony przez RIAA, ale
 Ten pakiet zamienia Twojego Apache w znienawidzony przez RIAA, ale

-uwielbiany przez studentów serwer strumieni MP3. Mo¿e odtwarzaæ listê
-plików, w kolejno¶ci lub losowo. Mo¿e byæ tak¿e u¿yty do buforowania
-plików MP3 w pamiêci, pozwalaj±c serwerowi operowaæ wy³±cznie na
-pamiêci. Baw siê dobrze; pliki MP3 nie s± za³±czone.
+uwielbiany przez studentów serwer strumieni MP3. Może odtwarzać listę
+plików, w kolejności lub losowo. Może być także użyty do buforowania
+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}
 
 %prep
 %setup -q -n mod_%{mod_name}-%{version}


@@ -50,7 +51,7 @@ pami
 
 %{__make} \
        APXS=%{apxs} \
 
 %{__make} \
        APXS=%{apxs} \

-       ACINCLUDEDIR="-I$(%{apxs} -q INCLUDEDIR) $(%{apxs} -q CFLAGS) %{rpmcflags} -fPIC"
+       AINCLUDEDIR="-I$(%{apxs} -q INCLUDEDIR) $(%{apxs} -q CFLAGS) %{rpmcflags} -fPIC"

 
 %install
 rm -rf $RPM_BUILD_ROOT
 
 %install
 rm -rf $RPM_BUILD_ROOT


@@ -63,19 +64,15 @@ install %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/conf.d/90_mod_%{mod_name}.conf
 rm -rf $RPM_BUILD_ROOT
 
 %post
 rm -rf $RPM_BUILD_ROOT
 
 %post

-if [ -f /var/lock/subsys/apache ]; then
-       /etc/rc.d/init.d/apache restart 1>&2
-fi
+%service -q apache restart

 
 

-%preun
+%postun

 if [ "$1" = "0" ]; then
 if [ "$1" = "0" ]; then

-       if [ -f /var/lock/subsys/apache ]; then
-               /etc/rc.d/init.d/apache restart 1>&2
-       fi
+       %service -q apache restart

 fi
 
 %triggerpostun -- %{name} < 0.40-2.1
 fi
 
 %triggerpostun -- %{name} < 0.40-2.1

-if grep -q '^Include conf\.d' /etc/apache/apache.conf; then
+if grep -q '^Include conf\.d/\*\.conf' /etc/apache/apache.conf; then

        %{apxs} -e -A -n %{mod_name} %{_pkglibdir}/mod_%{mod_name}.so 1>&2
        sed -i -e '
                /^Include.*mod_%{mod_name}\.conf/d
        %{apxs} -e -A -n %{mod_name} %{_pkglibdir}/mod_%{mod_name}.so 1>&2
        sed -i -e '
                /^Include.*mod_%{mod_name}\.conf/d


@@ -86,12 +83,10 @@ else
                s,^Include.*mod_%{mod_name}\.conf,Include %{_sysconfdir}/conf.d/*_mod_%{mod_name}.conf,
        ' /etc/apache/apache.conf
 fi
                s,^Include.*mod_%{mod_name}\.conf,Include %{_sysconfdir}/conf.d/*_mod_%{mod_name}.conf,
        ' /etc/apache/apache.conf
 fi

-if [ -f /var/lock/subsys/apache ]; then
-       /etc/rc.d/init.d/apache restart 1>&2
-fi
+%service -q apache restart

 
 %files
 %defattr(644,root,root,755)
 %doc README ChangeLog LICENSE faq.html support CONTRIBUTORS TODO utils/*
 
 %files
 %defattr(644,root,root,755)
 %doc README ChangeLog LICENSE faq.html support CONTRIBUTORS TODO utils/*

-%attr(640,root,root) %config(noreplace) %verify(not size mtime md5) %{_sysconfdir}/conf.d/*_mod_%{mod_name}.conf
+%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.d/*_mod_%{mod_name}.conf

 %attr(755,root,root) %{_pkglibdir}/mod_mp3.so
 %attr(755,root,root) %{_pkglibdir}/mod_mp3.so