- rel 2

[packages/conserver.git] / conserver.spec

diff --git a/conserver.spec b/conserver.spec
index 039bbfe3ed34f1d7cd4227cab4149b53a30bceb9..86a3e571f6a2eb3dbcdf465ea33fee6b8b07f88d 100644 (file)
--- a/conserver.spec
+++ b/conserver.spec
@@ -4,7 +4,7 @@ Summary:        Console server
 Summary(pl):   Serwer konsoli
 Name:          conserver
 Version:       8.1.12
-Release:       1
+Release:       2
 License:       BSD-like
 Group:         Daemons
 Source0:       http://www.conserver.com/%{name}-%{version}.tar.gz
@@ -16,21 +16,21 @@ Patch0:             %{name}-locks.patch
 URL:           http://www.conserver.com/
 BuildRequires: autoconf
 BuildRequires: automake
-BuildRequires: openssl-devel
 BuildRequires: libwrap-devel
+BuildRequires: openssl-devel
 BuildRequires: pam-devel
-PreReq:                rc-scripts
+BuildRequires: rpmbuild(macros) >= 1.268
 Requires(post,preun):  /sbin/chkconfig
+Requires:      rc-scripts
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %define                _sysconfdir     /etc/conserver
 
 %description
 Conserver is an application that allows multiple users to watch a
-serial console at the same time. It can log the data, allows users
-to take write-access of a console (one at a time), and has a
-variety of bells and whistles to accentuate that basic
-functionality.
+serial console at the same time. It can log the data, allows users to
+take write-access of a console (one at a time), and has a variety of
+bells and whistles to accentuate that basic functionality.
 
 %description -l pl
 Conserver jest aplikacj±, która umo¿liwia kilku u¿ytkownikom naraz
@@ -81,17 +81,11 @@ rm -rf $RPM_BUILD_ROOT
 
 %post
 /sbin/chkconfig --add conserver
-if [ -f /var/lock/subsys/conserver ]; then
-       /etc/rc.d/init.d/conserver restart 1>&2
-else
-       echo "Run \"/etc/rc.d/init.d/conserver start\" to start conserver daemon."
-fi
+%service conserver restart "conserver daemon"
 
 %preun
 if [ "$1" = "0" ]; then
-       if [ -f /var/lock/subsys/conserver ]; then
-               /etc/rc.d/init.d/conserver stop 1>&2
-       fi
+       %service conserver stop
        /sbin/chkconfig --del conserver
 fi
 
@@ -101,10 +95,10 @@ fi
 %attr(755,root,root) %{_bindir}/*
 %attr(755,root,root) %{_sbindir}/*
 %attr(754,root,root) /etc/rc.d/init.d/conserver
-%attr(640,root,root) %config(noreplace) %verify(not size mtime md5) /etc/sysconfig/*
-%attr(640,root,root) %config(noreplace) %verify(not size mtime md5) /etc/logrotate.d/*
+%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) /etc/sysconfig/*
+%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) /etc/logrotate.d/*
 %attr(750,root,root) %dir /var/log/conserver.d
 %attr(750,root,root) %dir /var/log/archiv/conserver.d
-%dir /etc/conserver
-%attr(640,root,root) %config(noreplace) %verify(not size mtime md5) %{_sysconfdir}/*
+%dir %{_sysconfdir}
+%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/*
 %{_mandir}/man*/*