Use %configure so the hardened cflags get applied correctly
This commit is contained in:
parent
c490d06c70
commit
714819e917
@ -4,7 +4,7 @@
|
|||||||
Summary: System and process monitoring utilities
|
Summary: System and process monitoring utilities
|
||||||
Name: procps-ng
|
Name: procps-ng
|
||||||
Version: 3.3.10
|
Version: 3.3.10
|
||||||
Release: 8%{?dist}
|
Release: 9%{?dist}
|
||||||
License: GPL+ and GPLv2 and GPLv2+ and GPLv3+ and LGPLv2+
|
License: GPL+ and GPLv2 and GPLv2+ and GPLv3+ and LGPLv2+
|
||||||
Group: Applications/System
|
Group: Applications/System
|
||||||
URL: https://sourceforge.net/projects/procps-ng/
|
URL: https://sourceforge.net/projects/procps-ng/
|
||||||
@ -95,24 +95,18 @@ Internationalization pack for procps-ng
|
|||||||
|
|
||||||
autoreconf --verbose --force --install
|
autoreconf --verbose --force --install
|
||||||
|
|
||||||
./configure --prefix=/ \
|
%configure \
|
||||||
--bindir=%{_bindir} \
|
--exec-prefix=/ \
|
||||||
--sbindir=%{_sbindir} \
|
--docdir=/unwanted \
|
||||||
--libdir=%{_libdir} \
|
--disable-static \
|
||||||
--mandir=%{_mandir} \
|
--disable-w-from \
|
||||||
--includedir=%{_includedir} \
|
--disable-kill \
|
||||||
--sysconfdir=%{_sysconfdir} \
|
--enable-watch8bit \
|
||||||
--localedir=%{_datadir}/locale \
|
--enable-skill \
|
||||||
--docdir=/unwanted \
|
--enable-sigwinch \
|
||||||
--disable-static \
|
--enable-libselinux \
|
||||||
--disable-w-from \
|
--with-systemd \
|
||||||
--disable-kill \
|
--disable-modern-top
|
||||||
--enable-watch8bit \
|
|
||||||
--enable-skill \
|
|
||||||
--enable-sigwinch \
|
|
||||||
--enable-libselinux \
|
|
||||||
--with-systemd \
|
|
||||||
--disable-modern-top
|
|
||||||
|
|
||||||
make CFLAGS="%{optflags}"
|
make CFLAGS="%{optflags}"
|
||||||
|
|
||||||
@ -126,10 +120,6 @@ make check
|
|||||||
%install
|
%install
|
||||||
make DESTDIR=%{buildroot} install
|
make DESTDIR=%{buildroot} install
|
||||||
|
|
||||||
# --localedir doesn't work correctly
|
|
||||||
mv %{buildroot}/share/locale %{buildroot}%{_datadir}
|
|
||||||
rmdir %{buildroot}/share
|
|
||||||
|
|
||||||
# translated man pages
|
# translated man pages
|
||||||
find man-po/ -type d -maxdepth 1 -mindepth 1 | while read dirname; do cp -a $dirname %{buildroot}%{_mandir}/ ; done
|
find man-po/ -type d -maxdepth 1 -mindepth 1 | while read dirname; do cp -a $dirname %{buildroot}%{_mandir}/ ; done
|
||||||
rm -f %{buildroot}%{_mandir}/{de,fr,uk}/man1/kill.1
|
rm -f %{buildroot}%{_mandir}/{de,fr,uk}/man1/kill.1
|
||||||
@ -170,6 +160,9 @@ ln -s %{_bindir}/pidof %{buildroot}%{_sbindir}/pidof
|
|||||||
%files i18n -f %{name}.lang
|
%files i18n -f %{name}.lang
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Fri Aug 14 2015 Adam Jackson <ajax@redhat.com> 3.3.10-9
|
||||||
|
- Use %%configure so the hardened cflags get applied correctly
|
||||||
|
|
||||||
* Mon Aug 10 2015 Jaromir Capik <jcapik@redhat.com> - 3.3.10-8
|
* Mon Aug 10 2015 Jaromir Capik <jcapik@redhat.com> - 3.3.10-8
|
||||||
- Fixing crashes in 'top' when a deep forking appears (#1153642)
|
- Fixing crashes in 'top' when a deep forking appears (#1153642)
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user