X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=dcd.spec;h=6d93ddb93d0bfe5a10668cd30ea0ecb81f357a4f;hb=07adc2be95992d65a5899e336cc7c4da8cba1722;hp=be0254b1fd9a47d0e514284610d0dd19631b7494;hpb=50c74fe1d017187d8a8b4bfa34ce180aa8155448;p=packages%2Fdcd.git

diff --git a/dcd.spec b/dcd.spec
index be0254b..6d93ddb 100644
--- a/dcd.spec
+++ b/dcd.spec
@@ -1,29 +1,30 @@
 Summary:	DConnect Daemon - Hub D****ct Connect for Linux
-Summary(pl):	DConnect Daemon - Hub D****ct Connecta dla Linuksa
+Summary(pl.UTF-8):	DConnect Daemon - Hub D****ct Connecta dla Linuksa
 Name:		dcd
-Version:	0.3.1
+Version:	1.1.1
 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:	50c3266ba39c2772c1cd8dd27b81a586
+# Source0-md5:	99c7ffca321b33fb78b5433570c57120
 URL:		http://www.dc.ds.pg.gda.pl/
 BuildRequires:	autoconf >= 2.52
 BuildRequires:	automake
 BuildRequires:	libtool
 BuildRequires:	libwrap-devel
-PreReq:		rc-scripts
+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
 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
-pracuje jako demon i u¿ywa w±tków.
+%description -l pl.UTF-8
+Pakiet zawiera linuksową implementację huba D*** Connecta, który
+pracuje jako demon i używa wątków.
 
 %prep
 %setup -q
@@ -42,57 +43,72 @@ pracuje jako demon i u
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT{%{_sysconfdir}/{sysconfig,rc.d/init.d,logrotate.d},/var/log/archiv/dcd}
+install -d $RPM_BUILD_ROOT{/etc/{sysconfig,rc.d/init.d,logrotate.d},/var/log/{archive/,}dcd}
 
 %{__make} install \
 	DESTDIR=$RPM_BUILD_ROOT
 
-install contrib/PLD/dcd.init $RPM_BUILD_ROOT%{_sysconfdir}/rc.d/init.d/dcd
-install contrib/dcd.sysconfig $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/dcd
-install contrib/logrotate.dcd $RPM_BUILD_ROOT%{_sysconfdir}/logrotate.d/dcd
+install contrib/PLD/dcd.init $RPM_BUILD_ROOT/etc/rc.d/init.d/dcd
+install contrib/dcd.sysconfig $RPM_BUILD_ROOT/etc/sysconfig/dcd
+install contrib/logrotate.dcd $RPM_BUILD_ROOT/etc/logrotate.d/dcd
 
 %clean
 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
 
-#%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 -i -e 's/console.users/dcd.users/g' /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
+
+%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 doc/*.html
+%doc AUTHORS BUGS FAQ NEWS README TODO USERCOMMANDS
 %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,daemon,daemon) %config(noreplace) %{_sysconfdir}/dcd/dcd.banned
+%attr(660,root,daemon) %config(noreplace) %{_sysconfdir}/dcd/dcd.users
+%attr(660,root,daemon) %config(noreplace) %{_sysconfdir}/dcd/dcd.banned
+%attr(660,root,daemon) %config(noreplace) %{_sysconfdir}/dcd/dcd.hublinks
+%attr(660,root,daemon) %config(noreplace) %{_sysconfdir}/dcd/dcd.usercommands
+%attr(664,root,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
-%attr(664,daemon,daemon) %config(noreplace) %{_sysconfdir}/dcd/nicks.allow
-%config(noreplace) %{_sysconfdir}/sysconfig/dcd
-%config(noreplace) %{_sysconfdir}/logrotate.d/dcd
+%attr(664,root,daemon) %config(noreplace) %{_sysconfdir}/dcd/nicks.allow
+%attr(664,root,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(754,root,root) %{_sysconfdir}/rc.d/init.d/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
+%attr(751,daemon,root) %dir /var/log/archive/dcd
 %{_mandir}/man1/*.1*
 %{_mandir}/man2/*.2*