- released 2.4.7 - what needs to be done to finish that?

[packages/setup.git] / setup.spec

diff --git a/setup.spec b/setup.spec
index 98b028a279279c989eed867db72b14912fdda87d..42fc72b285e9ee31100938375ec0525cc60ab354 100644 (file)
--- a/setup.spec
+++ b/setup.spec
@@ -3,7 +3,9 @@
 # - make some README.PLD with system features description
 #
 # Conditional build:
-%bcond_with    ssp     # disable stack-smashing protector (vide dietlibc.spec)
+%bcond_with    ssp     # enable stack-smashing protector (vide dietlibc.spec)
+#
+%define        iana_etc_ver    1.03
 #
 Summary:       Simple setup files
 Summary(de):   Einfache Setup-Dateien
@@ -14,20 +16,24 @@ 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.6
-Release:       6
+Version:       2.4.7
+Release:       0.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:                %{name}-fstab.patch
-Patch1:                %{name}-special_users.patch
+Source0:       http://piorun.ds.pg.gda.pl/~blues/SOURCES/%{name}-%{version}.tar.bz2
+# Source0-md5: 68f4a07ee8c3cbf410704630b59c795a
+Source1:       http://www.sethwklein.net/projects/iana-etc/downloads/iana-etc-%{iana_etc_ver}.tar.bz2
+# Source1-md5: 670da9e41179d618498f5d614b7f4636
 BuildRequires: dietlibc-static
+BuildRequires: gawk
 Conflicts:     FHS < 2.3
 AutoReqProv:   no
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
+%ifarch alpha
+Obsoletes:     gfax
+%endif
+
 %define                _sbindir        /sbin
 
 %description
@@ -65,20 +71,24 @@ Bu paket, passwd, group, profile gibi 
 dosyalarýný içerir.
 
 %prep
-%setup -q
-%patch0 -p1
-%patch1 -p1
+%setup -q -a1
 
 %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%{_sysconfdir}/shrc.d
+
 %{__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