SPECS: setup.spec - adapter

Tue May 27 13:09:01 CEST 2008

Author: glen                         Date: Tue May 27 11:09:01 2008 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- adapter

---- Files affected:
SPECS:
   setup.spec (1.137 -> 1.138) 

---- Diffs:

================================================================
Index: SPECS/setup.spec
diff -u SPECS/setup.spec:1.137 SPECS/setup.spec:1.138

--- SPECS/setup.spec:1.137	Fri Apr 18 09:41:59 2008
+++ SPECS/setup.spec	Tue May 27 13:08:55 2008
@@ -15,29 +15,23 @@
 Summary(pt_BR.UTF-8):	Vários arquivos básicos de configuração
 Summary(tr.UTF-8):	Basit kurulum dosyaları
 Name:		setup
-Version:	2.4.12
-Release:	2
+Version:	2.5.7
+Release:	0.1
 License:	Public Domain, partially BSD-like
 Group:		Base
 Source0:	ftp://distfiles.pld-linux.org/src/%{name}-%{version}.tar.bz2
-# Source0-md5:	b082df276e6ed931e8f31c3e265713c2
+# Source0-md5:	b7c60de0bd7cf4df6c491758a6c00219
 Source1:	http://sethwklein.net/projects/iana-etc/downloads/iana-etc-%{iana_etc_ver}.tar.bz2
 # Source1-md5:	51d584b7b6115528c21e8ea32250f2b1
-Source2:	%{name}-update-fstab.c
-Source3:	postshell.c
-Patch0:		%{name}-securetty.patch
-Patch1:		%{name}-profile.env.patch
-Patch2:		%{name}-iana-etc.patch
+Patch0:		%{name}-iana-etc.patch
 # This is source of non-iana changes in services file
-Patch3:		%{name}-services.patch
-Patch4:		%{name}-dquo.patch
-Patch5:		%{name}-fuse.patch
+Patch1:		%{name}-services.patch
+AutoReqProv:	no
 BuildRequires:	dietlibc-static
 BuildRequires:	gawk
+Provides:	group(fuse)
 Conflicts:	FHS < 2.3
 Conflicts:	glibc < 6:2.4-4.1
-Provides:	group(fuse)
-AutoReqProv:	no
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %define		_sbindir	/sbin
@@ -79,25 +73,15 @@
 %prep
 %setup -q -a1
 %patch0 -p1
-%patch1 -p1
-%patch2 -p1
-install %{SOURCE2} update-fstab.c
-install %{SOURCE3} postshell.c
-%patch4 -p1
-%patch5 -p1
 
 %build
 %{__make} -C iana-etc-%{iana_etc_ver}
-%{__patch} iana-etc-%{iana_etc_ver}/services %{PATCH3}
+%{__patch} iana-etc-%{iana_etc_ver}/services %{PATCH1}
 
 %{__make} \
 	OPT_FLAGS="%{rpmcflags}" \
 	LDFLAGS="%{rpmcflags} %{rpmldflags}" \
 	CC="diet %{__cc}"
-%{__make} postshell update-fstab \
-	OPT_FLAGS="%{rpmcflags} -Os" \
-	LDFLAGS="%{rpmcflags} %{rpmldflags}" \
-	CC="diet %{__cc}"
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -106,15 +90,7 @@
 %{__make} install \
 	DESTDIR=$RPM_BUILD_ROOT
 
-install postshell $RPM_BUILD_ROOT%{_sbindir}
-install update-fstab $RPM_BUILD_ROOT%{_sbindir}
-
 install iana-etc-%{iana_etc_ver}/protocols $RPM_BUILD_ROOT%{_sysconfdir}/protocols
-# don't overwrite files from setup tarball, apply changes to setup module instead
-%if "%{version}" == "2.4.11"
-# 2.4.12 will contain iana-etc update
-install iana-etc-%{iana_etc_ver}/services $RPM_BUILD_ROOT%{_sysconfdir}/services
-%endif
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -161,6 +137,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.138  2008-05-27 11:08:55  glen
+- adapter
+
 Revision 1.137  2008-04-18 07:41:59  blues
 - added provides fuse group
 
@@ -584,64 +563,3 @@
 
 Revision 1.15  1999/07/12 23:06:14  kloczek
 - added using CVS keywords in %changelog (for automating them).
-
-* Fri May 28 1999 Wojtek Ślusarczyk <wojtek at shadow.eu.org>
-- ttyS0 >> /etc/securetty
-- added group console gid=20 (removed from dev-*)
-- group games changed gid -- now gid=21
-
-* Wed May 19 1999 Wojtek Ślusarczyk <wojtek at shadow.eu.org>
-- removed qmail, zmailer, goopher & other users from group & /etc/passwd
-- removed icmp group & gid=80
-  (wywalić ten wpis przed finałowym budowaniem!)
-- /lib/security >/dev/null
-- /var/log >/dev/null
-- standard Unix users like ftp/http/uucp/news/lp was save !
-
-  it must be present on PLD Linux <amen> (no comments, no discuss allowed ;)
-
-- home dir for adm was changed to /var/account,
-- /etc/profile.d >/dev/null,
-- group floppy again in /etc/group,
-- ttyS1 >> /etc/securetty.
-
-* Thu Apr 22 1999 Artur Frysiak <wiget at pld.org.pl>
-  [1.9.5-2]
-- removed /etc/security and /etc/profile.d (now in filesystem)
-- compiled on rpm 3
-
-* Thu Feb 18 1999 Wojtek Ślusarczyk <wojtek at shadow.eu.org>
-  [1.9.6-1d]
-- /etc/shell -- back again ;)
-- %dir /etc/security,
-- %ghost /var/log/lastlog,
-- %dir /lib/security.
-
-* Fri Jan 22 1999 Wojtek Ślusarczyk <wojtek at shadow.eu.org>
-  [1.9.5-1d]
-- added new services,
-- added Group(pl).
-
-* Wed Jan 06 1999 Arkadiusz Miśkiewicz <misiek at misiek.eu.org>
-  [1.9.4-1d]
-- added new services: fsp, ssh, ipx, https, cvspserver, mrt
-- fixed petidomo uid & gid -- conflicts with qmail.
-
-* Wed Dec 23 1998 Arkadiusz Miśkiewicz <misiek at misiek.eu.org>
-  [1.9.3-1d]
-- added http and nofiles group
-- added mailq, radius and radacct to services
-
-* Sat Nov 07 1998 Wojtek Ślusarczyk <wojtek at shadow.eu.org>
-  [1.9.2-2d]
-- removed hosts.{allow,deny},
-- minor changes.
-
-* Mon Jun 29 1998 Wojtek Ślusarczyk <wojtek at shadow.eu.org>
-  [1.9.2-1d]
-- build against PLD,
-- translation modified for pl,
-- added some new IPv6 protocols,
-- added /bin/false as a shell,
-- added new group icmp (gid=55),
-- start at RH spec file ..
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/setup.spec?r1=1.137&r2=1.138&f=u

