X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=dcd.spec;h=b8aa6c22649d7cc37f801dded3d69969c81af894;hb=97fa61ac715d2579519d5d2d04085b50ae233116;hp=39d72f476848f75f912f7569942bb84c9a0bac0d;hpb=c48916bb2b720377822ce410f147b8a1ecb0b4a0;p=packages%2Fdcd.git

diff --git a/dcd.spec b/dcd.spec
index 39d72f4..b8aa6c2 100644
--- a/dcd.spec
+++ b/dcd.spec
@@ -1,19 +1,20 @@
 Summary:	DConnect Daemon - Hub D****ct Connect for Linux
 Summary(pl):	DConnect Daemon - Hub D****ct Connecta dla Linuksa
 Name:		dcd
-Version:	0.3.0
+Version:	0.5.2
 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/stable/%{name}-%{version}.tar.bz2
-# Source0-md5:	4d796a52d3641d7c1972929072be6ff3
+Source0:	ftp://pollux.ds.pg.gda.pl/pub/Linux/DConnect/sources/devel/%{name}-%{version}.tar.bz2
+# Source0-md5:	9ce8df0a934b3ed72d2b334b08d73d9e
 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
 Requires(post,preun):	/sbin/chkconfig
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -22,7 +23,7 @@ This is Linux D*** Connect Hub implementation for Linux. It works in
 daemon mode and utilizes threads.
 
 %description -l pl
-Pakiet zawiera Linuksow± implementacjê huba D*** Connecta, który
+Pakiet zawiera linuksow± implementacjê huba D*** Connecta, który
 pracuje jako demon i u¿ywa w±tków.
 
 %prep
@@ -34,7 +35,7 @@ pracuje jako demon i u
 %{__autoconf}
 %{__automake}
 %configure \
-	--sysconfdir=%{_sysconfdir}/dcd \
+	--with-config-dir=%{_sysconfdir}/dcd \
 	--with-user=daemon \
 	--with-group=daemon
 
@@ -70,20 +71,34 @@ if [ "$1" = "0" ]; then
 	/sbin/chkconfig --del dcd
 fi
 
-#%triggerpostun -- dcd < 0.1.1
-#echo "Upgrading from version < 0.1.1"
-#echo "Remember to review config - the options were changed!!!"
-#if [ -e /etc/dcd/dchub.conf.rpmsave ]; then
-#	cp /etc/dcd/dchub.conf.rpmsave /etc/dcd/dcd.conf
-#fi
+%triggerpostun -- dcd < 0.3.5
+echo "Upgrading from version < 0.3.5"
+if [ -e /etc/dcd/console.users.rpmsave ]; then
+	cp /etc/dcd/dcd.users /etc/dcd/dcd.users.rpmnew
+	cp /etc/dcd/console.users.rpmsave /etc/dcd/dcd.users
+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
+
+%triggerpostun -- dcd < 0.4.6
+echo "Upgrading from version < 0.4.6"
+sed -i -e 's/minimum_sleep_time\b/minimal_sleep_time/' /etc/dcd/dcd.conf
+
+%triggerpostun -- dcd < 0.4.9
+echo "Upgrading from version < 0.4.9"
+sed -i -e 's/ping_timeout/idle_timeout/' /etc/dcd/dcd.conf
 
 %files
 %defattr(644,root,root,755)
-%doc AUTHORS BUGS FAQ NEWS README TODO doc/*.html
+%doc AUTHORS BUGS FAQ NEWS README TODO
 %attr(755,daemon,root) %dir %{_sysconfdir}/dcd
 %attr(660,root,daemon) %config(noreplace) %{_sysconfdir}/dcd/console.allow
-%attr(660,root,daemon) %config(noreplace) %{_sysconfdir}/dcd/console.users
+%attr(660,root,daemon) %config(noreplace) %{_sysconfdir}/dcd/dcd.users
 %attr(660,daemon,daemon) %config(noreplace) %{_sysconfdir}/dcd/dcd.banned
+%attr(664,daemon,daemon) %config(noreplace) %{_sysconfdir}/dcd/dcd.penalties
 %attr(664,root,daemon) %config(noreplace) %{_sysconfdir}/dcd/dcd.conf
 %attr(664,root,daemon) %config(noreplace) %{_sysconfdir}/dcd/dcd.motd
 %attr(664,root,daemon) %config(noreplace) %{_sysconfdir}/dcd/dcd.welcome