- up to 2.8.5; link with glibc (only 3k bigger in > 700k package) to be more reliable

diff --git a/setup.spec b/setup.spec
index 84d7b638c53b51877d4bfc181fb9225ff6d79e7b..6926abb71b7819e4d3ff745a185ed45a86879e34 100644 (file)
--- a/setup.spec
+++ b/setup.spec
@@ -2,6 +2,8 @@
 # TODO:
 # - make some README.PLD with system features description
 #
 # TODO:
 # - make some README.PLD with system features description
 #

+%bcond_with    diet
+#

 %define        iana_etc_ver    2.30
 
 Summary:       Simple setup files
 %define        iana_etc_ver    2.30
 
 Summary:       Simple setup files


@@ -13,12 +15,12 @@ Summary(pl.UTF-8):  Podstawowe pliki systemu Linux
 Summary(pt_BR.UTF-8):  Vários arquivos básicos de configuração
 Summary(tr.UTF-8):     Basit kurulum dosyaları
 Name:          setup
 Summary(pt_BR.UTF-8):  Vários arquivos básicos de configuração
 Summary(tr.UTF-8):     Basit kurulum dosyaları
 Name:          setup

-Version:       2.8.4
-Release:       2
+Version:       2.8.5
+Release:       1

 License:       Public Domain, partially BSD-like
 Group:         Base
 Source0:       %{name}-%{version}.tar.bz2
 License:       Public Domain, partially BSD-like
 Group:         Base
 Source0:       %{name}-%{version}.tar.bz2

-# Source0-md5: 62f0ab5eaba651c291e1d76919530673
+# Source0-md5: 4f995facd983c8e887ff3b8c68a73b19

 # http://sethwklein.net/iana-etc
 Source1:       http://sethwklein.net/projects/iana-etc/downloads/iana-etc-%{iana_etc_ver}.tar.bz2
 # Source1-md5: 3ba3afb1d1b261383d247f46cb135ee8
 # http://sethwklein.net/iana-etc
 Source1:       http://sethwklein.net/projects/iana-etc/downloads/iana-etc-%{iana_etc_ver}.tar.bz2
 # Source1-md5: 3ba3afb1d1b261383d247f46cb135ee8


@@ -30,7 +32,11 @@ Patch0:              %{name}-iana-etc.patch
 # This is source of non-iana changes in services file
 Patch1:                %{name}-services.patch
 Patch2:                protocols-fmt.patch
 # This is source of non-iana changes in services file
 Patch1:                %{name}-services.patch
 Patch2:                protocols-fmt.patch

+%if %{with diet}

 BuildRequires: dietlibc-static
 BuildRequires: dietlibc-static

+%else
+BuildRequires: glibc-static
+%endif

 BuildRequires: gawk
 Requires:      FHS >= 2.3-24.1
 Provides:      group(fuse)
 BuildRequires: gawk
 Requires:      FHS >= 2.3-24.1
 Provides:      group(fuse)


@@ -97,7 +103,7 @@ cp -a %{SOURCE3} iana-etc/port-numbers.iana
 %{__sed} -i -e 's,[ \t]\+$,,' iana-etc/{services,protocols}
 
 %{__make} \
 %{__sed} -i -e 's,[ \t]\+$,,' iana-etc/{services,protocols}
 
 %{__make} \

-       CC="diet %{__cc}" \
+       CC="%{?with_diet:diet }%{__cc}" \

        OPT_FLAGS="%{rpmcflags} -Os" \
        LDFLAGS="%{rpmcflags} %{rpmldflags}"
 
        OPT_FLAGS="%{rpmcflags} -Os" \
        LDFLAGS="%{rpmcflags} %{rpmldflags}"