- 0.6.9 - bugfix release - STBR, please

[packages/dcd.git] / dcd.spec

diff --git a/dcd.spec b/dcd.spec
index 6f29a3c3b592352a813623a6f7cd7aa1e62c5f60..7f7e1d90fd25a319035eb43ea56631145b6b4b09 100644 (file)
--- a/dcd.spec
+++ b/dcd.spec
@@ -1,21 +1,21 @@
 Summary:       DConnect Daemon - Hub D****ct Connect for Linux
 Summary(pl):   DConnect Daemon - Hub D****ct Connecta dla Linuksa
 Name:          dcd
-Version:       0.5.2
+Version:       0.6.9
 Release:       1
 License:       GPL v2
 Group:         Networking/Daemons
-Vendor:                DConnect Team <dc-hub@ds.pg.gda.pl>
-Source0:       ftp://pollux.ds.pg.gda.pl/pub/Linux/DConnect/sources/devel/%{name}-%{version}.tar.bz2
-# Source0-md5: 9ce8df0a934b3ed72d2b334b08d73d9e
+Source0:       ftp://pollux.ds.pg.gda.pl/pub/Linux/DConnect/sources/stable/%{name}-%{version}.tar.bz2
+# Source0-md5: a66590b85783583ce2e5bdc3477de25f
 URL:           http://www.dc.ds.pg.gda.pl/
 BuildRequires: autoconf >= 2.52
 BuildRequires: automake
 BuildRequires: libtool
 BuildRequires: libwrap-devel
-PreReq:                rc-scripts
-PreReq:                sed >= 4.0
+BuildRequires: rpmbuild(macros) >= 1.268
 Requires(post,preun):  /sbin/chkconfig
+Requires(triggerpostun):       sed >= 4.0
+Requires:      rc-scripts
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
@@ -57,17 +57,11 @@ rm -rf $RPM_BUILD_ROOT
 
 %post
 /sbin/chkconfig --add dcd
-if [ -f /var/lock/subsys/dcd ]; then
-       /etc/rc.d/init.d/dcd restart 1>&2
-else
-       echo "Run \"/etc/rc.d/init.d/dcd start\" to start DConnect Daemon."
-fi
+%service dcd restart "DConnect Daemon"
 
 %preun
 if [ "$1" = "0" ]; then
-       if [ -f /var/lock/subsys/dcd ]; then
-               /etc/rc.d/init.d/dcd stop 1>&2
-       fi
+       %service dcd stop
        /sbin/chkconfig --del dcd
 fi
 
@@ -80,8 +74,7 @@ fi
 umask 002
 echo "Remember to review config - console users has been changed into dcd.users"
 cp /etc/dcd/dcd.conf /etc/dcd/dcd.conf.rpmsave
-sed -e s/console.users/dcd.users/g /etc/dcd/dcd.conf >/etc/dcd/dcd.conf.tmp
-mv -f /etc/dcd/dcd.conf.tmp /etc/dcd/dcd.conf
+sed -i -e 's/console.users/dcd.users/g' /etc/dcd/dcd.conf
 
 %triggerpostun -- dcd < 0.4.6
 echo "Upgrading from version < 0.4.6"
@@ -91,6 +84,10 @@ sed -i -e 's/minimum_sleep_time\b/minimal_sleep_time/' /etc/dcd/dcd.conf
 echo "Upgrading from version < 0.4.9"
 sed -i -e 's/ping_timeout/idle_timeout/' /etc/dcd/dcd.conf
 
+%triggerpostun -- dcd < 0.5.5
+echo "Upgrading from version < 0.5.5"
+sed -i -e 's/listen_interface/bind_address/' /etc/dcd/dcd.conf
+
 %files
 %defattr(644,root,root,755)
 %doc AUTHORS BUGS FAQ NEWS README TODO
@@ -103,9 +100,11 @@ sed -i -e 's/ping_timeout/idle_timeout/' /etc/dcd/dcd.conf
 %attr(664,root,daemon) %config(noreplace) %{_sysconfdir}/dcd/dcd.motd
 %attr(664,root,daemon) %config(noreplace) %{_sysconfdir}/dcd/dcd.welcome
 %attr(664,daemon,daemon) %config(noreplace) %{_sysconfdir}/dcd/nicks.allow
-%config(noreplace) /etc/sysconfig/dcd
+%attr(664,daemon,daemon) %config(noreplace) %{_sysconfdir}/dcd/dcd.rules
+%config(noreplace) %verify(not md5 mtime size) /etc/sysconfig/dcd
 %config(noreplace) /etc/logrotate.d/dcd
 %attr(755,root,root) %{_sbindir}/dcd
+%attr(755,root,root) %{_sbindir}/dcd.adduser
 %attr(754,root,root) /etc/rc.d/init.d/dcd
 %attr(751,daemon,root) %dir /var/log/dcd
 %attr(751,daemon,root) %dir /var/log/archiv/dcd