Fix FTBFS, modernise spec

This commit is contained in:
Peter Robinson 2013-08-04 11:10:19 +01:00
parent fbbda56f07
commit a94bba02be

View File

@ -1,6 +1,6 @@
Name: isns-utils Name: isns-utils
Version: 0.93 Version: 0.93
Release: 3%{?dist} Release: 4%{?dist}
Summary: The iSNS daemon and utility programs Summary: The iSNS daemon and utility programs
Group: System Environment/Daemons Group: System Environment/Daemons
@ -9,7 +9,7 @@ URL: http://www.kernel.org/pub/linux/kernel/people/mnc/open-isns
Source0: http://www.kernel.org/pub/linux/kernel/people/mnc/open-isns/releases/open-isns-%{version}.tar.bz2 Source0: http://www.kernel.org/pub/linux/kernel/people/mnc/open-isns/releases/open-isns-%{version}.tar.bz2
Source1: isnsd.service Source1: isnsd.service
BuildRequires: openssl-devel automake pkgconfig BuildRequires: openssl-devel automake pkgconfig systemd-devel
Requires(post): systemd-units Requires(post): systemd-units
Requires(preun): systemd-units Requires(preun): systemd-units
Requires(postun): systemd-units Requires(postun): systemd-units
@ -33,28 +33,28 @@ fi
autoconf autoconf
autoheader autoheader
%{configure} %configure
%{__sed} -i -e 's|-Wall -g -O2|%{optflags}|' Makefile sed -i -e 's|-Wall -g -O2|%{optflags}|' Makefile
%{__make} %{?_smp_mflags} make %{?_smp_mflags}
%install %install
%{__install} -d %{buildroot}%{_sbindir} install -d %{buildroot}%{_sbindir}
%{__install} -d %{buildroot}%{_mandir}/man8 install -d %{buildroot}%{_mandir}/man8
%{__install} -d %{buildroot}%{_mandir}/man5 install -d %{buildroot}%{_mandir}/man5
%{__install} -d %{buildroot}%{_unitdir} install -d %{buildroot}%{_unitdir}
%{__install} -d %{buildroot}%{_sysconfdir}/isns install -d %{buildroot}%{_sysconfdir}/isns
%{__install} -d %{buildroot}%{_var}/lib install -d %{buildroot}%{_var}/lib
%{__install} -d %{buildroot}%{_var}/lib/isns install -d %{buildroot}%{_var}/lib/isns
%{__install} -p -m 644 etc/isnsd.conf %{buildroot}%{_sysconfdir}/isns/isnsd.conf install -p -m 644 etc/isnsd.conf %{buildroot}%{_sysconfdir}/isns/isnsd.conf
%{__install} -p -m 644 etc/isnsdd.conf %{buildroot}%{_sysconfdir}/isns/isnsdd.conf install -p -m 644 etc/isnsdd.conf %{buildroot}%{_sysconfdir}/isns/isnsdd.conf
%{__install} -p -m 644 etc/isnsadm.conf %{buildroot}%{_sysconfdir}/isns/isnsadm.conf install -p -m 644 etc/isnsadm.conf %{buildroot}%{_sysconfdir}/isns/isnsadm.conf
%{__install} -p -m 755 isnsd isnsdd isnsadm isnssetup %{buildroot}%{_sbindir} install -p -m 755 isnsd isnsdd isnsadm isnssetup %{buildroot}%{_sbindir}
%{__install} -p -m 644 %{SOURCE1} %{buildroot}%{_unitdir}/isnsd.service install -p -m 644 %{SOURCE1} %{buildroot}%{_unitdir}/isnsd.service
%{__install} -p -m 644 doc/isns_config.5 %{buildroot}/%{_mandir}/man5/ install -p -m 644 doc/isns_config.5 %{buildroot}/%{_mandir}/man5/
%{__install} -p -m 644 doc/isnsd.8 doc/isnsdd.8 doc/isnsadm.8 %{buildroot}/%{_mandir}/man8/ install -p -m 644 doc/isnsd.8 doc/isnsdd.8 doc/isnsadm.8 %{buildroot}/%{_mandir}/man8/
%post %post
@ -80,9 +80,6 @@ autoheader
/bin/systemctl try-restart isnsd.service >/dev/null 2>&1 || : /bin/systemctl try-restart isnsd.service >/dev/null 2>&1 || :
%clean
%{__rm} -rf %{buildroot}
%files %files
%doc COPYING README %doc COPYING README
%{_sbindir}/isnsd %{_sbindir}/isnsd
@ -97,6 +94,9 @@ autoheader
%attr(0644,root,root) %config(noreplace) %{_sysconfdir}/isns/* %attr(0644,root,root) %config(noreplace) %{_sysconfdir}/isns/*
%changelog %changelog
* Sun Aug 4 2013 Peter Robinson <pbrobinson@fedoraproject.org> 0.93-4
- Fix FTBFS, modernise spec
* Sat Aug 03 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.93-3 * Sat Aug 03 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.93-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild