- converted to UTF-8

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

diff --git a/apache1-mod_witch.spec b/apache1-mod_witch.spec
index 992a8d1ae6e3ac178f84835163cd74654b30af73..875d37aa66b3e8c29993eba33e4f71c4ce6798d3 100644 (file)
--- a/apache1-mod_witch.spec
+++ b/apache1-mod_witch.spec
@@ -1,10 +1,10 @@
 %define                mod_name        witch
 %define        apxs            /usr/sbin/apxs1
 Summary:       Apache module: log the access_log and error_log log into the syslogd
-Summary(pl):   Modu³ do apache przekazuj±cy access_log i error_log do demona syslogd
+Summary(pl.UTF-8):   Moduł do apache przekazujący access_log i error_log do demona syslogd
 Name:          apache1-mod_%{mod_name}
 Version:       0.0.5
-Release:       3
+Release:       4
 License:       GPL v2
 Group:         Networking/Daemons
 Source0:       http://savannah.nongnu.org/download/mod-witch/mod-witch.pkg/%{version}/mod-witch-%{version}.tar.gz
@@ -13,11 +13,12 @@ Source1:    %{name}.conf
 URL:           http://savannah.nongnu.org/projects/mod-witch/
 BuildRequires: %{apxs}
 BuildRequires: apache1-devel >= 1.3.33-2
+BuildRequires: rpmbuild(macros) >= 1.268
 Requires(triggerpostun):       %{apxs}
 Requires(triggerpostun):       grep
 Requires(triggerpostun):       sed >= 4.0
-Requires:      apache1 >= 1.3.33-2
-Obsoletes:     apache-mod_%{mod_name} <= 0.0.5
+Requires:      apache1(EAPI)
+Obsoletes:     apache-mod_witch <= 0.0.5
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %define                _pkglibdir      %(%{apxs} -q LIBEXECDIR 2>/dev/null)
@@ -29,10 +30,10 @@ server to log the access_log and error_log log into the syslogd, this
 way apache will be able to log onto a remote logger machine with the
 syslogd.
 
-%description -l pl
-Modu³ apache'a mod_witch ma pomóc serwerowi WWW apache przekazywaæ
-logi access_log i error_log do syslogd, umo¿liwiaj±c w ten sposób
-logowanie na inn± maszynê.
+%description -l pl.UTF-8
+Moduł apache'a mod_witch ma pomóc serwerowi WWW apache przekazywać
+logi access_log i error_log do syslogd, umożliwiając w ten sposób
+logowanie na inną maszynę.
 
 %prep
 %setup -q -n mod-%{mod_name}-%{version}
@@ -51,15 +52,11 @@ install %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/conf.d/90_mod_%{mod_name}.conf
 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
 
 %postun
 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.0.5-2.1