From 2e6612f513c9c58ad8b551b8426aef1a37de40ca Mon Sep 17 00:00:00 2001 From: Todd Zullinger Date: Sat, 25 Aug 2018 23:52:33 -0400 Subject: [PATCH] Use %autosetup, %make_build, and %make_install macros Using %autosetup removes the need to manually define %patchN macros. Using %make_build and %make_install handles %{?_smp_mflags} and DESTDIR. Also remove cruft related to the znc systemd service file install, left after a53b3b8 ("cleanup conditionals, use upstream unit file", 2016-10-07). --- znc.spec | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/znc.spec b/znc.spec index 55426c0..bd9f22c 100644 --- a/znc.spec +++ b/znc.spec @@ -111,7 +111,7 @@ python3 module for ZNC %prep -%setup -q +%autosetup -p1 %build @@ -129,13 +129,11 @@ python3 module for ZNC --disable-python \ %endif # 0%{?with_modpython} --enable-ipv6 --enable-cyrus --enable-tcl -%__make %{?_smp_mflags} +%make_build %install -%__make install DESTDIR="%{buildroot}" -mkdir -p %buildroot%{_unitdir} -#install -m 0644 %{SOURCE1} %buildroot%{_unitdir}/znc.service +%make_install install -d "%{buildroot}%{_sharedstatedir}/znc" @@ -251,6 +249,7 @@ getent passwd znc >/dev/null || \ * Fri Aug 24 2018 Todd Zullinger - Clean up ancient Fedora and RHEL conditionals - Remove cruft from %%prep +- Use %%autosetup, %%make_build, and %%make_install macros * Mon Jul 23 2018 Nick Bebout - 1.7.1-2 - Add gcc-c++ and redhat-rpm-config to znc-devel's dependencies