diff --git a/iputils.spec b/iputils.spec index b19d2d6..0fb4d93 100644 --- a/iputils.spec +++ b/iputils.spec @@ -3,7 +3,7 @@ Summary: Network monitoring tools including ping Name: iputils Version: 20211215 -Release: 3%{?dist} +Release: 4%{?dist} # some parts are under the original BSD (ping.c) # some are under GPLv2+ (tracepath.c) License: BSD and GPLv2+ @@ -59,16 +59,9 @@ cp %{SOURCE4} %{SOURCE5} . %patch101 -p1 %build -%ifarch s390 s390x - export CFLAGS="-fPIE" -%else - export CFLAGS="-fpie" -%endif -export LDFLAGS="-pie -Wl,-z,relro,-z,now" - %meson %meson_build -gcc -Wall $RPM_OPT_FLAGS $CFLAGS $RPM_LD_FLAGS $LDFLAGS ifenslave.c -o ifenslave +gcc $RPM_OPT_FLAGS $CFLAGS $RPM_LD_FLAGS $LDFLAGS ifenslave.c -o ifenslave %install %meson_install @@ -133,6 +126,9 @@ install -cp ifenslave.8 ${RPM_BUILD_ROOT}%{_mandir}/man8/ %attr(644,root,root) %{_mandir}/man8/ninfod.8.gz %changelog +* Fri Nov 25 2022 Jan Macku - 20211215-4 +- Build iputils and ifenslave with correct flags provided by Fedora + * Thu Jul 21 2022 Fedora Release Engineering - 20211215-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild