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).
This commit is contained in:
Todd Zullinger 2018-08-25 23:52:33 -04:00
parent 21befc622d
commit 2e6612f513
1 changed files with 4 additions and 5 deletions

View File

@ -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 <tmz@pobox.com>
- 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 <nb@fedoraproject.org> - 1.7.1-2
- Add gcc-c++ and redhat-rpm-config to znc-devel's dependencies