X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=setup.spec;h=b4db3dad39e662bb1c73696f8c513e291d355b9a;hb=36832d8557095547eafc672ff3ba7530bdd80165;hp=3530a1609603d17598b8c2d9316681e3bea6b3e3;hpb=883668e56a2dec6c9613ab03597e708a0cbe69a2;p=packages%2Fsetup.git

diff --git a/setup.spec b/setup.spec
index 3530a16..b4db3da 100644
--- a/setup.spec
+++ b/setup.spec
@@ -1,3 +1,12 @@
+#
+# TODO:
+# - make some README.PLD with system features description
+#
+# Conditional build:
+%bcond_with	ssp	# disable stack-smashing protector (vide dietlibc.spec)
+#
+%define	iana_etc_ver	1.03
+#
 Summary:	Simple setup files
 Summary(de):	Einfache Setup-Dateien
 Summary(es):	Varios archivos básicos de configuración
@@ -7,15 +16,23 @@ Summary(pl):	Podstawowe pliki systemu Linux
 Summary(pt_BR):	Vários arquivos básicos de configuração
 Summary(tr):	Basit kurulum dosyalarý
 Name:		setup
-Version:	2.4.3
-Release:	1
-License:	Public Domain
+Version:	2.4.6
+Release:	8.1
+License:	Public Domain, partially BSD-like
 Group:		Base
 Source0:	%{name}-%{version}.tar.bz2
-# Source0-md5: a47f2c6d681b16c7b718d7396e3efbee
-BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
-Buildarch:	noarch
+# Source0-md5:	33afa2766c28f1fb8331bd9209bf6b04
+Source1:	http://www.sethwklein.net/projects/iana-etc/downloads/iana-etc-%{iana_etc_ver}.tar.bz2
+# Source1-md5:	670da9e41179d618498f5d614b7f4636
+Patch0:		%{name}-fstab.patch
+Patch1:		%{name}-special_users.patch
+BuildRequires:	dietlibc-static
+BuildRequires:	gawk
+Conflicts:	FHS < 2.3
 AutoReqProv:	no
+BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
+
+%define		_sbindir	/sbin
 
 %description
 This package contains a number of very important configuration and
@@ -52,44 +69,53 @@ Bu paket, passwd, group, profile gibi 
 dosyalarýný içerir.
 
 %prep
-%setup -q -n %{name}
+%setup -q -a1
+%patch0 -p1
+%patch1 -p1
+
+%build
+%{__make} -C iana-etc-%{iana_etc_ver}
+
+%{__make} \
+	OPT_FLAGS="%{rpmcflags} %{?with_ssp:-fno-stack-protector}" \
+	CC="diet %{__cc}"
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT
 
-cp -fa * $RPM_BUILD_ROOT
+%{__make} install \
+	DESTDIR=$RPM_BUILD_ROOT
+
+install -d $RPM_BUILD_ROOT%{_sysconfdir}/shrc.d
+
+install iana-etc-%{iana_etc_ver}/protocols $RPM_BUILD_ROOT/etc/protocols
+install iana-etc-%{iana_etc_ver}/services $RPM_BUILD_ROOT/etc/services
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-#%triggerin -- %{name} < %{version}-%{release}
-#[ "$1" = "1" ] && exit 0
-#[ ! -e /etc/group.rpmnew ] && exit 0
-#cat /etc/group.rpmnew | while read GROUPLINE ; do
-#	GR="`echo $GROUPLINE | cut -f 1 -d ':'`"
-#	if ! grep -q "^$GR" /etc/group ; then
-#		echo "$GROUPLINE" >> /etc/group
-#	fi
-#done
+%triggerpostun -p %{_sbindir}/joinpasswd -- %{name} < %{version}-%{release}
 
 %files
 %defattr(644,root,root,755)
-
-%dir /etc/profile.d
+%doc ChangeLog
+%attr(755,root,root) %{_sbindir}/joinpasswd
 %attr(755,root,root) /etc/profile.d/*.sh
 %attr(755,root,root) /etc/profile.d/*.csh
-%config(noreplace) %verify(not md5 size mtime) %{_sysconfdir}/passwd
-%config(noreplace) %verify(not md5 size mtime) %{_sysconfdir}/group
-%config(noreplace) %verify(not md5 size mtime) %{_sysconfdir}/services
-%config(noreplace) %verify(not md5 size mtime) %{_sysconfdir}/host.conf
-%config(noreplace) %verify(not md5 size mtime) %{_sysconfdir}/hosts
-%config(noreplace,missingok) %verify(not md5 size mtime) %{_sysconfdir}/motd
-%config(noreplace) %verify(not md5 size mtime) %{_sysconfdir}/profile
-%config(noreplace) %verify(not md5 size mtime) %{_sysconfdir}/protocols
-%config(noreplace) %verify(not md5 size mtime) %{_sysconfdir}/fstab
-%config(noreplace,missingok) %verify(not md5 size mtime) %{_sysconfdir}/filesystems
-%config(noreplace,missingok) %verify(not md5 size mtime) %{_sysconfdir}/resolv.conf
-%ghost %{_sysconfdir}/shells
-
+%dir /etc/profile.d
+%attr(644,root,root) %config(noreplace,missingok) %verify(not md5 size mtime) %{_sysconfdir}/env.d/*
+%dir %{_sysconfdir}/env.d
+%dir %{_sysconfdir}/shrc.d
+%attr(644,root,root) %config(noreplace) %verify(not md5 size mtime) %{_sysconfdir}/fstab
+%attr(644,root,root) %config(noreplace) %verify(not md5 size mtime) %{_sysconfdir}/group
+%attr(644,root,root) %config(noreplace) %verify(not md5 size mtime) %{_sysconfdir}/host.conf
+%attr(644,root,root) %config(noreplace) %verify(not md5 size mtime) %{_sysconfdir}/hosts
+%attr(644,root,root) %config(noreplace) %verify(not md5 size mtime) %{_sysconfdir}/passwd
+%attr(644,root,root) %config(noreplace) %verify(not md5 size mtime) %{_sysconfdir}/profile
+%attr(644,root,root) %config(noreplace) %verify(not md5 size mtime) %{_sysconfdir}/protocols
 %attr(600,root,root) %config(noreplace) %verify(not md5 size mtime) %{_sysconfdir}/secure*
+%attr(644,root,root) %config(noreplace) %verify(not md5 size mtime) %{_sysconfdir}/services
+%attr(644,root,root) %config(noreplace,missingok) %verify(not md5 size mtime) %{_sysconfdir}/filesystems
+%attr(644,root,root) %config(noreplace,missingok) %verify(not md5 size mtime) %{_sysconfdir}/motd
+%attr(644,root,root) %config(noreplace,missingok) %verify(not md5 size mtime) %{_sysconfdir}/resolv.conf
+%ghost %{_sysconfdir}/shells