From 76845d2a5fa5426da933fc47530312acf6c7c19b Mon Sep 17 00:00:00 2001
From: Jiri Skala <jskala@fedoraproject.org>
Date: Jan 26 2009 16:57:16 +0000
Subject: - fix #473186 conflict timeout with coreutils


---

diff --git a/netatalk.spec b/netatalk.spec
index 028ae3d..2d6d81c 100644
--- a/netatalk.spec
+++ b/netatalk.spec
@@ -1,7 +1,7 @@
 Summary: AppleTalk networking programs
 Name:    netatalk
 Version: 2.0.3
-Release: 23%{?dist}
+Release: 24%{?dist}
 Epoch:   4
 License: GPLv2+
 Group:   System Environment/Daemons
@@ -31,6 +31,16 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 This package enables Linux to talk to Macintosh computers via the
 AppleTalk networking protocol. It includes a daemon to allow Linux
 to act as a file server over EtherTalk or IP for Mac's.
+The systems without coreutils 7.0 and later require netatalk-timeout package.
+
+%package timeout
+Summary: Timeout utility for the systems without coreutils
+Group:   System Environment/Daemons
+Requires: netatalk = %{version}-%{release}
+Conflicts: coreutils >= 7.0
+
+%description timeout
+The package contains the timeout utility that was a part of netatalk earlier. The coreutils 7.0 and later contains this utility too therefore the timeout is separated to sub-package for usage on the systems without coreutils.
 
 %package devel
 Summary: Headers for Appletalk development
@@ -174,13 +184,19 @@ fi
 %{_sbindir}/*
 %{_bindir}/*
 %exclude %{_bindir}/netatalk-config
+%exclude %{_bindir}/timeout
 %{_mandir}/man*/*
 %exclude %{_mandir}/man*/netatalk-config*
+%exclude %{_mandir}/man1/timeout.1.gz
 %{_datadir}/netatalk
 %dir %{_libdir}/atalk
 %{_libdir}/atalk/*.so
 %{_libexecdir}/*
 
+%files timeout
+%{_bindir}/timeout
+%{_mandir}/man1/timeout.1.gz
+
 %files devel
 %defattr(-,root,root)
 %dir %{_includedir}/atalk
@@ -192,6 +208,9 @@ fi
 %{_mandir}/man*/netatalk-config.1*
 
 %changelog
+* Fri Jan 23 2009 Jiri Skala <jskala@redhat.com> -4:3.0.3-24
+- fix #473186 conflict timeout with coreutils
+
 * Sat Jan 17 2009 Tomas Mraz <tmraz@redhat.com> - 4:2.0.3-23
 - rebuild with new openssl