- it must be gawk

[packages/setup.git] / setup.spec

diff --git a/setup.spec b/setup.spec
index 398b4ecc6c1fbd33d7dfb0ad79fb82b7edd53c26..b4db3dad39e662bb1c73696f8c513e291d355b9a 100644 (file)
--- a/setup.spec
+++ b/setup.spec
@@ -5,6 +5,8 @@
 # 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
@@ -15,13 +17,17 @@ Summary(pt_BR):     V
 Summary(tr):   Basit kurulum dosyalarý
 Name:          setup
 Version:       2.4.6
-Release:       2
+Release:       8.1
 License:       Public Domain, partially BSD-like
 Group:         Base
-Source0:       http://piorun.ds.pg.gda.pl/~blues/SOURCES/%{name}-%{version}.tar.bz2
+Source0:       %{name}-%{version}.tar.bz2
 # Source0-md5: 33afa2766c28f1fb8331bd9209bf6b04
-Patch0:                setup-fstab.patch
+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)
@@ -63,19 +69,27 @@ Bu paket, passwd, group, profile gibi 
 dosyalarýný içerir.
 
 %prep
-%setup -q
+%setup -q -a1
 %patch0 -p1
+%patch1 -p1
 
 %build
+%{__make} -C iana-etc-%{iana_etc_ver}
+
 %{__make} \
-       OPT_FLAGS="%{rpmcflags} %{?with_pp:-fno-stack-protector}" \
+       OPT_FLAGS="%{rpmcflags} %{?with_ssp:-fno-stack-protector}" \
        CC="diet %{__cc}"
 
 %install
 rm -rf $RPM_BUILD_ROOT
+
 %{__make} install \
        DESTDIR=$RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT/etc/shrc.d
+
+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
@@ -89,9 +103,9 @@ rm -rf $RPM_BUILD_ROOT
 %attr(755,root,root) /etc/profile.d/*.sh
 %attr(755,root,root) /etc/profile.d/*.csh
 %dir /etc/profile.d
-%attr(644,root,root) %config(noreplace,missingok) %verify(not md5 size mtime) /etc/env.d/*
-%dir /etc/env.d
-%dir /etc/shrc.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