Clean up spec file

This commit is contained in:
Petr Písař 2012-04-03 16:37:59 +02:00
parent 10d1818812
commit 6fd1bf4c73

View File

@ -4,12 +4,12 @@
Summary: A Router Advertisement daemon Summary: A Router Advertisement daemon
Name: radvd Name: radvd
Version: 1.8.5 Version: 1.8.5
Release: 1%{?dist} Release: 2%{?dist}
# The code includes the advertising clause, so it's GPL-incompatible # The code includes the advertising clause, so it's GPL-incompatible
License: BSD with advertising License: BSD with advertising
Group: System Environment/Daemons Group: System Environment/Daemons
URL: http://www.litech.org/radvd/ URL: http://www.litech.org/radvd/
Source: http://www.litech.org/radvd/dist/%{name}-%{version}.tar.gz Source: %{url}dist/%{name}-%{version}.tar.gz
Source1: radvd.init Source1: radvd.init
Source2: radvd-tmpfs.conf Source2: radvd-tmpfs.conf
Source3: radvd.service Source3: radvd.service
@ -18,7 +18,6 @@ Requires(preun): chkconfig, initscripts
Requires(post): chkconfig Requires(post): chkconfig
Requires(pre): /usr/sbin/useradd Requires(pre): /usr/sbin/useradd
BuildRequires: flex, flex-static, byacc BuildRequires: flex, flex-static, byacc
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
%description %description
radvd is the router advertisement daemon for IPv6. It listens to router radvd is the router advertisement daemon for IPv6. It listens to router
@ -45,8 +44,6 @@ make
# #
%install %install
[ $RPM_BUILD_ROOT != "/" ] && rm -rf $RPM_BUILD_ROOT
make DESTDIR=$RPM_BUILD_ROOT install make DESTDIR=$RPM_BUILD_ROOT install
mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig
@ -62,9 +59,6 @@ install -d -m 755 $RPM_BUILD_ROOT%{_sysconfdir}/tmpfiles.d
install -p -m 644 %{SOURCE2} $RPM_BUILD_ROOT%{_sysconfdir}/tmpfiles.d/radvd.conf install -p -m 644 %{SOURCE2} $RPM_BUILD_ROOT%{_sysconfdir}/tmpfiles.d/radvd.conf
install -m 644 %{SOURCE3} ${RPM_BUILD_ROOT}/lib/systemd/system install -m 644 %{SOURCE3} ${RPM_BUILD_ROOT}/lib/systemd/system
%clean
[ $RPM_BUILD_ROOT != "/" ] && rm -rf $RPM_BUILD_ROOT
%postun %postun
/bin/systemctl daemon-reload >/dev/null 2>&1 || : /bin/systemctl daemon-reload >/dev/null 2>&1 || :
@ -95,7 +89,6 @@ getent passwd radvd >/dev/null || \
exit 0 exit 0
%files %files
%defattr(-,root,root,-)
%doc COPYRIGHT README CHANGES INTRO.html TODO %doc COPYRIGHT README CHANGES INTRO.html TODO
/lib/systemd/system/radvd.service /lib/systemd/system/radvd.service
%config(noreplace) %{_sysconfdir}/radvd.conf %config(noreplace) %{_sysconfdir}/radvd.conf
@ -109,6 +102,9 @@ exit 0
%{_sbindir}/radvdump %{_sbindir}/radvdump
%changelog %changelog
* Tue Apr 03 2012 Petr Pisar <ppisar@redhat.com> - 1.8.5-2
- Clean up spec file
* Wed Feb 01 2012 Jiri Skala <jskala@redhat.com> - 1.8.5-1 * Wed Feb 01 2012 Jiri Skala <jskala@redhat.com> - 1.8.5-1
- update to latest upstream version 1.8.5 - update to latest upstream version 1.8.5
@ -153,7 +149,7 @@ exit 0
- #656682 - using tmpfiles.d - #656682 - using tmpfiles.d
* Wed Dec 01 2010 Jiri Skala <jskala@redhat.com> - 1.6-3 * Wed Dec 01 2010 Jiri Skala <jskala@redhat.com> - 1.6-3
- fixes #656682 - using %ghost on files in /var/run - fixes #656682 - using %%ghost on files in /var/run
- added necessary buildrequres flex-static - added necessary buildrequres flex-static
* Fri May 21 2010 Jiri Skala <jskala@redhat.com> - 1.6-2 * Fri May 21 2010 Jiri Skala <jskala@redhat.com> - 1.6-2