diff --git a/.gitignore b/.gitignore index 39e5046..9e1db75 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1 @@ -/chrony-1.27-pre1.tar.gz -/chrony-1.27-pre1-git1ca844.patch.gz +/chrony-1.27.tar.gz diff --git a/chrony.spec b/chrony.spec index 02fda6c..6d3a5d1 100644 --- a/chrony.spec +++ b/chrony.spec @@ -1,8 +1,6 @@ -%define prerelease -pre1 -%define gitpatch git1ca844 Name: chrony Version: 1.27 -Release: 0.5.pre1%{?gitpatch:.%{gitpatch}}%{?dist} +Release: 1%{?gitpatch:.%{gitpatch}}%{?dist} Summary: An NTP client/server Group: System Environment/Daemons @@ -22,7 +20,7 @@ Source9: chrony-wait.service BuildRequires: libcap-devel libedit-devel nss-devel pps-tools-devel bison texinfo Requires(pre): shadow-utils -Requires(post): systemd-units info chkconfig +Requires(post): systemd-units info Requires(preun): systemd-units info Requires(postun): systemd-units @@ -50,12 +48,12 @@ touch -r %{SOURCE1} chrony.conf %build CFLAGS="$RPM_OPT_FLAGS" %ifarch %{sparc} -CFLAGS="$CFLAGS -pie -fPIE" +CFLAGS="$CFLAGS -fPIE" %else -CFLAGS="$CFLAGS -pie -fpie" +CFLAGS="$CFLAGS -fpie" %endif export CFLAGS -export LDFLAGS="-Wl,-z,relro,-z,now" +export LDFLAGS="-pie -Wl,-z,relro,-z,now" %configure \ --docdir=%{_docdir} \ diff --git a/sources b/sources index 22bdeb2..63902e9 100644 --- a/sources +++ b/sources @@ -1,2 +1 @@ -09185059c85789f7a62076d6e069437f chrony-1.27-pre1.tar.gz -42354d2b033d5c1f3610aab833d2c5c2 chrony-1.27-pre1-git1ca844.patch.gz +0c2ae73f7e8ddfe31eeafc803818b9e4 chrony-1.27.tar.gz