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

[packages/bircd.git] / bircd.spec

diff --git a/bircd.spec b/bircd.spec
index fcd804794ece211290b330d9caed34e16b53185f..89d4b5dde70028f00439549516c81648ff75c016 100644 (file)
--- a/bircd.spec
+++ b/bircd.spec
@@ -6,12 +6,12 @@
 Summary:       Internet Relay Chat Server
 Summary(pl):   Serwer IRC (Internet Relay Chat)
 Name:          bircd
-Version:       2.0.3rc8
-Release:       1
+Version:       2.1.0rc1
+Release:       3
 License:       GPL
 Group:         Daemons
-Source0:       ftp://ftp.benet.uu3.net/pub/ircd/%{name}%{version}.tgz
-# Source0-md5: f19c80955b230a8a592b0ba4be25b269
+Source0:       ftp://ftp.benet.uu3.net/pub/irc/%{name}-%{version}.tgz
+# Source0-md5: 5e7b6b4ff8f3ed541d032c96eeee8de1
 Source1:       %{name}.init
 Source2:       %{name}.sysconfig
 Source3:       %{name}.logrotate
@@ -20,23 +20,24 @@ Patch0:             %{name}-makefile.patch
 Patch1:                %{name}-config.patch
 Patch2:                %{name}-smode.patch
 Patch3:                %{name}-crypt.patch
+Patch4:                %{name}-%{version}-p1.patch
 URL:           http://www.benet.uu3.net/~borg/
-BuildRequires: rpmbuild(macros) >= 1.159
-PreReq:                rc-scripts
-Requires(pre): /usr/bin/getgid
-Requires(pre): /bin/id
-Requires(pre): /usr/sbin/groupadd
-Requires(pre): /usr/sbin/useradd
+BuildRequires: rpmbuild(macros) >= 1.268
 Requires(post):        fileutils
 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:      rc-scripts
 Provides:      group(ircd)
 Provides:      user(ircd)
 Obsoletes:     ircd
-Obsoletes:     ircd6
 Obsoletes:     ircd-hybrid
 Obsoletes:     ircd-ptlink
+Obsoletes:     ircd6
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %define                _sysconfdir     /etc/ircd
@@ -57,6 +58,7 @@ IPv6.
 %patch1 -p1
 %{?with_smode:%patch2 -p1}
 %{?with_crypt:%patch3 -p1}
+%patch4 -p1
 
 %build
 ./Config
@@ -83,40 +85,19 @@ touch $RPM_BUILD_ROOT%{_localstatedir}/ircd.pid
 rm -rf $RPM_BUILD_ROOT
 
 %pre
-if [ -n "`getgid ircd`" ]; then
-       if [ "`getgid ircd`" != "75" ]; then
-               echo "Error: group ircd doesn't have gid=75. Correct this before installing ircd." 1>&2
-               exit 1
-       fi
-else
-       /usr/sbin/groupadd -f -g 75 ircd 2> /dev/null
-fi
-if [ -n "`id -u ircd 2>/dev/null`" ]; then
-       if [ "`id -u ircd`" != "75" ]; then
-               echo "Error: user ircd doesn't have uid=75. Correct this before installing ircd." 1>&2
-               exit 1
-       fi
-else
-       /usr/sbin/useradd -g ircd -d /etc/ircd -u 75 -s /bin/true -c "IRC Service account" ircd 2> /dev/null
-fi
+%groupadd -f -g 75 ircd
+%useradd -g ircd -d /etc/ircd -u 75 -s /bin/true -c "IRC Service account" ircd
 
 %post
 /sbin/chkconfig --add ircd
-if [ -f /var/lock/subsys/ircd ]; then
-       /etc/rc.d/init.d/ircd restart 1>&2
-else
-       echo "Run \"/etc/rc.d/init.d/ircd start\" to start IRC daemon."
-fi
+%service ircd restart "IRC daemon"
 touch /var/log/ircd/{opers.log,rejects.log,users.log}
 chmod 640 /var/log/ircd/*
 chown ircd:ircd /var/log/ircd/*
 
 %preun
-# If package is being erased for the last time.
 if [ "$1" = "0" ]; then
-       if [ -f /var/lock/subsys/ircd ]; then
-               /etc/rc.d/init.d/ircd stop 1>&2
-       fi
+       %service ircd stop
        /sbin/chkconfig --del ircd
 fi