- converted to UTF-8

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

diff --git a/apache1-mod_cvs.spec b/apache1-mod_cvs.spec
index b26f9a253109bd0c6cdf8652c2882f27062fa28e..4f6f7a5e4e745b34fd139ba22c25aa7f059ae711 100644 (file)
--- a/apache1-mod_cvs.spec
+++ b/apache1-mod_cvs.spec
@@ -1,10 +1,10 @@
 %define                mod_name        cvs
 %define        apxs            /usr/sbin/apxs1
 Summary:       Apache module: Automatically updates files in a CVS-based webtree
-Summary(pl):   Modu³ do apache: Automatyczne uaktualnianie plików z drzewa CVS
+Summary(pl.UTF-8):   Moduł do apache: Automatyczne uaktualnianie plików z drzewa CVS
 Name:          apache1-mod_%{mod_name}
 Version:       0.5
-Release:       2
+Release:       3
 License:       GPL
 Group:         Networking/Daemons
 # working URL: http://www.sub.nu/mod_cvs/src/
@@ -14,10 +14,11 @@ Source0:    ftp://ftp.sub.nu/pub/mod_cvs/mod_%{mod_name}-%{version}.tar.gz
 URL:           http://www.sub.nu/mod_cvs/
 BuildRequires: %{apxs}
 BuildRequires: apache1-devel >= 1.3.33-2
+BuildRequires: rpmbuild(macros) >= 1.268
 BuildRequires: zlib-devel
 Requires(triggerpostun):       %{apxs}
-Requires:      apache1 >= 1.3.33-2
-Obsoletes:     apache-mod_%{mod_name} <= %{version}
+Requires:      apache1(EAPI)
+Obsoletes:     apache-mod_cvs <= 0.5
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %define                _pkglibdir      %(%{apxs} -q LIBEXECDIR 2>/dev/null)
@@ -26,8 +27,8 @@ BuildRoot:    %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 %description
 Apache module: Automatically updates files in a CVS-based webtree.
 
-%description -l pl
-Modu³ do apache: Automatyczne uaktualnianie plików z drzewa CVS.
+%description -l pl.UTF-8
+Moduł do apache: Automatyczne uaktualnianie plików z drzewa CVS.
 
 %prep
 %setup -q -n mod_%{mod_name}-%{version}
@@ -48,15 +49,11 @@ echo 'LoadModule %{mod_name}_module modules/mod_%{mod_name}.so' > \
 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 [ -f /var/lock/subsys/apache ]; then
-               /etc/rc.d/init.d/apache restart 1>&2
-       fi
+       %service -q apache restart
 fi
 
 %triggerpostun -- apache1-mod_%{mod_name} < 0.5-1.1
@@ -68,5 +65,5 @@ fi
 %files
 %defattr(644,root,root,755)
 %doc README
-%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}/*