| |
@@ -177,13 +177,13 @@
|
| |
rm -f rexec/rexec
|
| |
|
| |
%build
|
| |
- sh configure --with-c-compiler=gcc
|
| |
+ sh configure --with-c-compiler=%{__cc}
|
| |
export RPM_OPT_FLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing"
|
| |
%ifarch s390 s390x
|
| |
%{__perl} -pi -e '
|
| |
s,^CC=.*$,CC=cc,;
|
| |
s,-O2,\$(RPM_OPT_FLAGS) -fPIC -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -D_GNU_SOURCE,;
|
| |
- s,^LDFLAGS=,LDFLAGS=-z now -pie,;
|
| |
+ s,^LDFLAGS=,LDFLAGS=\$(RPM_LD_FLAGS),;
|
| |
s,^BINDIR=.*$,BINDIR=%{_bindir},;
|
| |
s,^MANDIR=.*$,MANDIR=%{_mandir},;
|
| |
s,^SBINDIR=.*$,SBINDIR=%{_sbindir},;
|
| |
@@ -192,13 +192,13 @@
|
| |
%{__perl} -pi -e '
|
| |
s,^CC=.*$,CC=cc,;
|
| |
s,-O2,\$(RPM_OPT_FLAGS) -fpic -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -D_GNU_SOURCE,;
|
| |
- s,^LDFLAGS=,LDFLAGS=-z now -pie,;
|
| |
+ s,^LDFLAGS=,LDFLAGS=\$(RPM_LD_FLAGS),;
|
| |
s,^BINDIR=.*$,BINDIR=%{_bindir},;
|
| |
s,^MANDIR=.*$,MANDIR=%{_mandir},;
|
| |
s,^SBINDIR=.*$,SBINDIR=%{_sbindir},;
|
| |
' MCONFIG
|
| |
%endif
|
| |
- make %{?_smp_mflags}
|
| |
+ %{make_build}
|
| |
|
| |
%install
|
| |
mkdir -p %{buildroot}%{_bindir}
|
| |
@@ -206,7 +206,7 @@
|
| |
mkdir -p %{buildroot}%{_mandir}/man{1,5,8}
|
| |
mkdir -p %{buildroot}%{_sysconfdir}/pam.d
|
| |
|
| |
- make INSTALLROOT=%{buildroot} BINDIR=%{_bindir} MANDIR=%{_mandir} install
|
| |
+ %{make_install} INSTALLROOT=%{buildroot} BINDIR=%{_bindir} MANDIR=%{_mandir}
|
| |
|
| |
install -m 644 %SOURCE1 %{buildroot}%{_sysconfdir}/pam.d/rexec
|
| |
install -m 644 %SOURCE2 %{buildroot}%{_sysconfdir}/pam.d/rlogin
|
| |
This makes building with other compilers possible and generally cleans up the spec file a bit.