- rel 3 (rebuild with fixed %useradd/%groupadd macros)

[packages/bnc.git] / bnc.spec

diff --git a/bnc.spec b/bnc.spec
index 1fe84a6c1ed69b6e43e6a374c43b0e60602e091f..4de6ecbddd21e0465f6467992eb8fc0d0c0ffdfb 100644 (file)
--- a/bnc.spec
+++ b/bnc.spec
@@ -4,7 +4,7 @@ Summary:        Simple IRC bouncer
 Summary(pl):   Proste narzêdzie do tunelowania IRC
 Name:          bnc
 Version:       2.9.4
-Release:       1
+Release:       3
 License:       GPL
 Group:         Networking/Utilities
 Source0:       http://www.gotbnc.com/files/%{name}%{version}.tar.gz
@@ -18,10 +18,10 @@ URL:                http://www.gotbnc.com/
 BuildRequires: autoconf
 BuildRequires: automake
 BuildRequires: openssl-devel
-BuildRequires: rpmbuild(macros) >= 1.202
+BuildRequires: rpmbuild(macros) >= 1.268
+Requires:      dialog >= 1:0.69
 Provides:      group(bnc)
 Provides:      user(bnc)
-Requires:      dialog >= 1:0.69
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %define                _sysconfdir     /etc/%{name}
@@ -43,16 +43,16 @@ od u
 Summary:       Simple IRC bouncer daemon
 Summary(pl):   Prosty demon do tunelowania IRC
 Group:         Networking/Utilities
-Requires:      %{name} = %{epoch}:%{version}-%{release}
-Requires:      /sbin/start-stop-daemon
 Requires(post):        grep
+Requires(post,preun):  /sbin/chkconfig
+Requires(postun):      /usr/sbin/groupdel
+Requires(postun):      /usr/sbin/userdel
 Requires(pre): /bin/id
 Requires(pre): /usr/bin/getgid
 Requires(pre): /usr/sbin/groupadd
 Requires(pre): /usr/sbin/useradd
-Requires(postun):      /usr/sbin/groupdel
-Requires(postun):      /usr/sbin/userdel
-Requires(post,preun):  /sbin/chkconfig
+Requires:      %{name} = %{version}-%{release}
+Requires:      /sbin/start-stop-daemon
 
 %description init
 This package contains the initscript to start bnc as system service.
@@ -105,20 +105,12 @@ EOF
 # ' vim
 
 fi
-
 /sbin/chkconfig --add %{name}
-
-if [ -f /var/lock/subsys/%{name} ]; then
-       /etc/rc.d/init.d/%{name} restart 1>&2
-else
-       echo "Run \"/etc/rc.d/init.d/%{name} start\" to start %{name} daemon."
-fi
+%service %{name} restart "%{name} daemon"
 
 %preun init
 if [ "$1" = "0" ]; then
-       if [ -f /var/lock/subsys/%{name} ]; then
-               /etc/rc.d/init.d/%{name} stop 1>&2
-       fi
+       %service %{name} stop
        /sbin/chkconfig --del %{name}
 fi