X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=dcd.spec;h=0b31ff8cafab153e91b5f54cd98e003f169b5e38;hb=2c74db53a332c95f94c82e4ecc011c08ff934f4c;hp=d77472643bed30e930abce9a13d1d08ae30f0005;hpb=247e0fe6a59856af3581c0ce5dd5e4799aa673f9;p=packages%2Fdcd.git

diff --git a/dcd.spec b/dcd.spec
index d774726..0b31ff8 100644
--- a/dcd.spec
+++ b/dcd.spec
@@ -1,13 +1,13 @@
 Summary:	DConnect Daemon - Hub D****ct Connect for Linux
 Summary(pl):	DConnect Daemon - Hub D****ct Connecta dla Linuksa
 Name:		dcd
-Version:	0.2.13
+Version:	0.4.4
 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:	964680efa4af70671a4d3b43c39194a3
+Source0:	ftp://pollux.ds.pg.gda.pl/pub/Linux/DConnect/sources/stable/%{name}-%{version}.tar.bz2
+# Source0-md5:	f9c7ccc1ed4faa5a4d32bb8c88313583
 URL:		http://www.dc.ds.pg.gda.pl/
 BuildRequires:	autoconf >= 2.52
 BuildRequires:	automake
@@ -34,7 +34,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 +70,25 @@ 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
+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
 
 %files
 %defattr(644,root,root,755)
 %doc AUTHORS BUGS FAQ NEWS README TODO doc/*.html
 %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