- drop -Os, it's not much gain and causes diet to miscompile on x32

[packages/setup.git] / setup.spec

diff --git a/setup.spec b/setup.spec
index 58edf4a2bb3fd35a4c7334b0caa9b158b859e108..8c227e8f7e96a35aed2d40dc0bd894fc7c3c480c 100644 (file)
--- a/setup.spec
+++ b/setup.spec
@@ -2,9 +2,9 @@
 # TODO:
 # - make some README.PLD with system features description
 #
+%bcond_without diet
+
 %define        iana_etc_ver    2.30
-%undefine      with_ccache
-#
 Summary:       Simple setup files
 Summary(de.UTF-8):     Einfache Setup-Dateien
 Summary(es.UTF-8):     Varios archivos básicos de configuración
@@ -14,12 +14,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
-Version:       2.7.2
-Release:       1
+Version:       2.9.0
+Release:       4
 License:       Public Domain, partially BSD-like
 Group:         Base
 Source0:       %{name}-%{version}.tar.bz2
-# Source0-md5: e82bfb86a430f2f08ecc48971f60dcc5
+# Source0-md5: 2b5c3c03a77f8963ee1c4c269f0edfed
 # http://sethwklein.net/iana-etc
 Source1:       http://sethwklein.net/projects/iana-etc/downloads/iana-etc-%{iana_etc_ver}.tar.bz2
 # Source1-md5: 3ba3afb1d1b261383d247f46cb135ee8
@@ -31,8 +31,14 @@ Patch0:              %{name}-iana-etc.patch
 # This is source of non-iana changes in services file
 Patch1:                %{name}-services.patch
 Patch2:                protocols-fmt.patch
+Patch3:                %{name}-input_group.patch
+%if %{with diet}
 BuildRequires: dietlibc-static
+%else
+BuildRequires: glibc-static
+%endif
 BuildRequires: gawk
+BuildRequires: glibc-misc
 Requires:      FHS >= 2.3-24.1
 Provides:      group(fuse)
 Conflicts:     PowerChutePlus < 4.5.3-2
@@ -40,9 +46,12 @@ Conflicts:   glibc < 6:2.4-4.1
 # tape,dialout and cdrom groups support
 Conflicts:     dev < 3.4-4
 Conflicts:     udev < 1:138-5
+# /etc/mtab being symlink to /proc/self/mounts
+Conflicts:     rc-scripts < 0.4.5.1-3
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %define                _sbindir        /sbin
+%undefine      with_ccache
 
 %description
 This package contains a number of very important configuration and
@@ -83,6 +92,7 @@ dosyalarını içerir.
 %patch0 -p1
 mv iana-etc{-%{iana_etc_ver},}
 %patch2 -p1
+%patch3 -p1
 
 cp -a %{SOURCE2} iana-etc/protocol-numbers.iana
 cp -a %{SOURCE3} iana-etc/port-numbers.iana
@@ -95,25 +105,29 @@ cp -a %{SOURCE3} iana-etc/port-numbers.iana
 %{__sed} -i -e 's,[ \t]\+$,,' iana-etc/{services,protocols}
 
 %{__make} \
-       CC="diet %{__cc}" \
-       OPT_FLAGS="%{rpmcflags} -Os" \
-       LDFLAGS="%{rpmcflags} %{rpmldflags}"
+       CC="%{?with_diet:diet }%{__cc}" \
+       OPT_FLAGS="%{rpmcflags} -D_LARGEFILE_SOURCE=1 -D_FILE_OFFSET_BITS=64" \
+       LDFLAGS="%{rpmcflags} %{rpmldflags} -static"
+
+ldd postshell | grep "not a dynamic executable" || exit 1
 
 %install
 rm -rf $RPM_BUILD_ROOT
 install -d $RPM_BUILD_ROOT%{_sysconfdir}/shrc.d
-
 %{__make} install \
        DESTDIR=$RPM_BUILD_ROOT
 
 cp -a iana-etc/{services,protocols} $RPM_BUILD_ROOT%{_sysconfdir}
 
 # not packaged
-rm $RPM_BUILD_ROOT%{_sysconfdir}/{mtab,netgroup,suid_profile}
+%{__rm} $RPM_BUILD_ROOT%{_sysconfdir}/{netgroup,suid_profile}
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
+%triggerprein -p /sbin/postshell -- %{name} < %{version}-%{release}
+-/bin/sh -c '/usr/bin/test -L /etc/mtab || /bin/mv -v /etc/mtab /etc/mtab.rpmsave'
+
 %triggerpostun -p /sbin/postshell -- %{name} < %{version}-%{release}
 %{_sbindir}/joinpasswd
 %{_sbindir}/delpasswd -g ttyS cdwrite
@@ -133,12 +147,22 @@ rm -rf $RPM_BUILD_ROOT
 %attr(755,root,root) %{_sbindir}/joinpasswd
 %attr(755,root,root) %{_sbindir}/postshell
 %attr(755,root,root) %{_sbindir}/update-fstab
-%config(noreplace,missingok) %verify(not md5 mtime size) %attr(755,root,root) /etc/profile.d/*.sh
-%config(noreplace,missingok) %verify(not md5 mtime size) %attr(755,root,root) /etc/profile.d/*.csh
 %dir /etc/profile.d
-%config(noreplace,missingok) %verify(not md5 mtime size) %{_sysconfdir}/env.d/*
+%config(noreplace,missingok) %verify(not md5 mtime size) %attr(755,root,root) /etc/profile.d/tmp-dir.sh
+%config(noreplace,missingok) %verify(not md5 mtime size) %attr(755,root,root) /etc/profile.d/tmp-dir.csh
 %dir %{_sysconfdir}/env.d
+%config(noreplace,missingok) %verify(not md5 mtime size) %{_sysconfdir}/env.d/EDITOR
+%config(noreplace,missingok) %verify(not md5 mtime size) %{_sysconfdir}/env.d/HISTFILESIZE
+%config(noreplace,missingok) %verify(not md5 mtime size) %{_sysconfdir}/env.d/HOME_ETC
+%config(noreplace,missingok) %verify(not md5 mtime size) %{_sysconfdir}/env.d/MAILCHECK
+%config(noreplace,missingok) %verify(not md5 mtime size) %{_sysconfdir}/env.d/MAILPATH
+%config(noreplace,missingok) %verify(not md5 mtime size) %{_sysconfdir}/env.d/NNTPSERVER
+%config(noreplace,missingok) %verify(not md5 mtime size) %{_sysconfdir}/env.d/ORGANIZATION
+%config(noreplace,missingok) %verify(not md5 mtime size) %{_sysconfdir}/env.d/TMOUT
+%config(noreplace,missingok) %verify(not md5 mtime size) %{_sysconfdir}/env.d/VISUAL
 %dir %{_sysconfdir}/shrc.d
+%config(noreplace) %verify(not md5 mtime size) /etc/shrc.d/256term.sh
+%config(noreplace) %verify(not md5 mtime size) /etc/shrc.d/256term.csh
 %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/fstab
 %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/group
 %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/host.conf
@@ -146,9 +170,11 @@ rm -rf $RPM_BUILD_ROOT
 %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/passwd
 %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/profile
 %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/protocols
-%attr(600,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/secure*
+%attr(600,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/securetty
 %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/services
 %config(noreplace,missingok) %verify(not md5 mtime size) %{_sysconfdir}/filesystems
 %config(noreplace,missingok) %verify(not md5 mtime size) %{_sysconfdir}/motd
 %config(noreplace,missingok) %verify(not md5 mtime size) %{_sysconfdir}/resolv.conf
 %ghost %{_sysconfdir}/shells
+# symlink to /proc/self/mounts
+%{_sysconfdir}/mtab