[packages/setup] move -Os to specflags

glen glen at pld-linux.org
Sat May 2 10:45:29 CEST 2015


commit ba7258390b478ad2bf517eca756bfe575827d79f
Author: Elan Ruusamäe <glen at delfi.ee>
Date:   Sat May 2 11:45:09 2015 +0300

    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'
 
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/setup.git/commitdiff/ba7258390b478ad2bf517eca756bfe575827d79f



More information about the pld-cvs-commit mailing list