packages: setup/setup.spec - setup requires FHS, not vice versa - versiopn 2.7

[glen]

Author: glen                         Date: Thu Jun  4 21:33:59 2009 GMT
Module: packages                      Tag: HEAD
---- Log message:
- setup requires FHS, not vice versa
- versiopn 2.7

---- Files affected:
packages/setup:
   setup.spec (1.152 -> 1.153) 

---- Diffs:

================================================================
Index: packages/setup/setup.spec
diff -u packages/setup/setup.spec:1.152 packages/setup/setup.spec:1.153
--- packages/setup/setup.spec:1.152	Mon Mar 23 15:10:51 2009
+++ packages/setup/setup.spec	Thu Jun  4 23:33:54 2009
@@ -15,8 +15,8 @@
 Summary(pt_BR.UTF-8):	Vários arquivos básicos de configuração
 Summary(tr.UTF-8):	Basit kurulum dosyaları
 Name:		setup
-Version:	2.6.2
-Release:	2
+Version:	2.7
+Release:	1
 License:	Public Domain, partially BSD-like
 Group:		Base
 Source0:	ftp://distfiles.pld-linux.org/src/%{name}-%{version}.tar.bz2
@@ -26,11 +26,10 @@
 Patch0:		%{name}-iana-etc.patch
 # This is source of non-iana changes in services file
 Patch1:		%{name}-services.patch
-AutoReqProv:	no
 BuildRequires:	dietlibc-static
 BuildRequires:	gawk
+Requires:	FHS >= 2.3-24.1
 Provides:	group(fuse)
-Conflicts:	FHS < 2.3
 Conflicts:	PowerChutePlus < 4.5.3-2
 Conflicts:	glibc < 6:2.4-4.1
 # tape,dialout and cdrom groups support
@@ -100,6 +99,9 @@
 
 cp -a iana-etc/protocols $RPM_BUILD_ROOT%{_sysconfdir}/protocols
 
+# not packaged
+rm $RPM_BUILD_ROOT%{_sysconfdir}/{mtab,netgroup,suid_profile}
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -148,6 +150,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.153  2009/06/04 21:33:54  glen
+- setup requires FHS, not vice versa
+- versiopn 2.7
+
 Revision 1.152  2009/03/23 14:10:51  baggins
 - unify dietlibc compile options and calls
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/setup/setup.spec?r1=1.152&r2=1.153&f=u