--- rpms/smeserver-sane/contribs7/smeserver-sane-0.1.spec	2008/04/18 01:38:09	1.2
+++ rpms/smeserver-sane/contribs7/smeserver-sane-0.1.spec	2008/04/18 14:15:48	1.3
@@ -1,10 +1,10 @@
-# $Id: smeserver-sane-0.1.spec,v 1.1 2008/04/15 15:08:35 slords Exp $
+# $Id: smeserver-sane-0.1.spec,v 1.2 2008/04/18 01:38:09 dungog Exp $
 # Authority: dungog
 # Name: Stephen Noble
 
 %define name smeserver-sane
 %define version 0.1
-%define release 6
+%define release 7
 Summary: Set up sane for scanner.
 Name: %{name}
 Version: %{version}
@@ -14,26 +14,35 @@ URL: http://www.sane-project.org
 Group: SMEserver/addon
 Source: %{name}-%{version}.tar.gz
 Patch0: smeserver-sane-0.1-six.patch
+Patch1: smeserver-sane-0.1-saned.patch
 BuildRoot: /var/tmp/%{name}-%{version}
 BuildArchitectures: noarch
 BuildRequires: e-smith-devtools >= 1.13.1-03
-Requires:  e-smith-release >= 7.1
-Requires:  sane-backends >= 1.0.17
-Requires:  xinetd >= 2.3.13
+Requires: e-smith-release >= 7.1
+Requires: sane-backends >= 1.0.17
+Requires: smeserver-xinetd
 AutoReqProv: no
 
 %description
 SANE is a universal scanner interface.
 
 %changelog
+* Fri Apr 18 2008 Shad L. Lords <slords@mail.com> 0.1-7
+- Move xinetd stuff to new package
+- Clean up service names
+
 * Fri Apr 18 2008 Stephen Noble 0.1-6
 - fixes for smecontribs
+
 * Fri Apr 11 2008 Anne Aublanc 0.1-5
 - minor fixes
+
 * Fri Apr 11 2008 Stephen Noble 0.1-4
 - more fixes
+
 * Thu Apr 10 2008 Stephen Noble 0.1-3
 - more fixes
+
 * Wed Apr 09 2008 Stephen Noble 0.1-2
 - minor fixes
 
@@ -43,6 +52,7 @@ SANE is a universal scanner interface.
 %prep
 %setup
 %patch0 -p1
+%patch1 -p1
 
 %build
 perl createlinks
@@ -54,6 +64,10 @@ rm -f %{name}-%{version}-filelist
 /sbin/e-smith/genfilelist $RPM_BUILD_ROOT > %{name}-%{version}-filelist
 echo "%doc COPYING"    >> %{name}-%{version}-filelist
 
+%pre
+/usr/sbin/groupadd \
+  -g 510 saned 2>/dev/null || :
+
 %clean
 rm -rf $RPM_BUILD_ROOT