commit 6fd1bf4c732ccfccc457e7f3c4c42fe8f759850e
Author: Petr Písař <ppisar at redhat.com>
Date: Tue Apr 3 16:37:59 2012 +0200
Clean up spec file
radvd.spec | 16 ++++++----------
1 files changed, 6 insertions(+), 10 deletions(-)
---
diff --git a/radvd.spec b/radvd.spec
index 43110bc..373f06f 100644
--- a/radvd.spec
+++ b/radvd.spec
@@ -4,12 +4,12 @@
Summary: A Router Advertisement daemon
Name: radvd
Version: 1.8.5
-Release: 1%{?dist}
+Release: 2%{?dist}
# The code includes the advertising clause, so it's GPL-incompatible
License: BSD with advertising
Group: System Environment/Daemons
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
Source2: radvd-tmpfs.conf
Source3: radvd.service
@@ -18,7 +18,6 @@ Requires(preun): chkconfig, initscripts
Requires(post): chkconfig
Requires(pre): /usr/sbin/useradd
BuildRequires: flex, flex-static, byacc
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
%description
radvd is the router advertisement daemon for IPv6. It listens to router
@@ -45,8 +44,6 @@ make
#
%install
-[ $RPM_BUILD_ROOT != "/" ] && rm -rf $RPM_BUILD_ROOT
-
make DESTDIR=$RPM_BUILD_ROOT install
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 -m 644 %{SOURCE3} ${RPM_BUILD_ROOT}/lib/systemd/system
-%clean
-[ $RPM_BUILD_ROOT != "/" ] && rm -rf $RPM_BUILD_ROOT
-
%postun
/bin/systemctl daemon-reload >/dev/null 2>&1 || :
@@ -95,7 +89,6 @@ getent passwd radvd >/dev/null || \
exit 0
%files
-%defattr(-,root,root,-)
%doc COPYRIGHT README CHANGES INTRO.html TODO
/lib/systemd/system/radvd.service
%config(noreplace) %{_sysconfdir}/radvd.conf
@@ -109,6 +102,9 @@ exit 0
%{_sbindir}/radvdump
%changelog
+* Tue Apr 03 2012 Petr Pisar <ppisar at redhat.com> - 1.8.5-2
+- Clean up spec file
+
* Wed Feb 01 2012 Jiri Skala <jskala at redhat.com> - 1.8.5-1
- update to latest upstream version 1.8.5
@@ -153,7 +149,7 @@ exit 0
- #656682 - using tmpfiles.d
* Wed Dec 01 2010 Jiri Skala <jskala at 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
* Fri May 21 2010 Jiri Skala <jskala at redhat.com> - 1.6-2