From ba7258390b478ad2bf517eca756bfe575827d79f Mon Sep 17 00:00:00 2001 From: =?utf8?q?Elan=20Ruusam=C3=A4e?= Date: Sat, 2 May 2015 11:45:09 +0300 Subject: [PATCH] move -Os to specflags --- setup.spec | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/setup.spec b/setup.spec index 8c227e8..1c98950 100644 --- a/setup.spec +++ b/setup.spec @@ -1,8 +1,7 @@ -# # TODO: # - make some README.PLD with system features description # -%bcond_without diet +%bcond_without diet # compile binaries with diet cc %define iana_etc_ver 2.30 Summary: Simple setup files @@ -53,6 +52,11 @@ BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) %define _sbindir /sbin %undefine with_ccache +%ifnarch x32 +# not on x32, see 02e9d04 +%define specflags -Os +%endif + %description This package contains a number of very important configuration and setup files, including the passwd, group, profile files, etc. @@ -117,7 +121,7 @@ install -d $RPM_BUILD_ROOT%{_sysconfdir}/shrc.d %{__make} install \ DESTDIR=$RPM_BUILD_ROOT -cp -a iana-etc/{services,protocols} $RPM_BUILD_ROOT%{_sysconfdir} +cp -p iana-etc/{services,protocols} $RPM_BUILD_ROOT%{_sysconfdir} # not packaged %{__rm} $RPM_BUILD_ROOT%{_sysconfdir}/{netgroup,suid_profile} @@ -125,6 +129,7 @@ cp -a iana-etc/{services,protocols} $RPM_BUILD_ROOT%{_sysconfdir} %clean rm -rf $RPM_BUILD_ROOT +# trigger to ensure /etc/mtab is symlink %triggerprein -p /sbin/postshell -- %{name} < %{version}-%{release} -/bin/sh -c '/usr/bin/test -L /etc/mtab || /bin/mv -v /etc/mtab /etc/mtab.rpmsave' -- 2.44.0