diff --git a/radvd.spec b/radvd.spec index 7be3cce..d1f3ddd 100644 --- a/radvd.spec +++ b/radvd.spec @@ -1,11 +1,11 @@ -%define initdir /etc/rc.d/init.d -#%(if test -d /etc/init.d/. ; then echo /etc/init.d ; else echo /etc/rc.d/init.d ; fi) +%define initdir %{_sysconfdir}/rc.d/init.d +#%(if test -d %{_sysconfdir}/init.d/. ; then echo %{_sysconfdir}/init.d ; else echo %{_sysconfdir}/rc.d/init.d ; fi) %define RADVD_UID 75 Summary: A Router Advertisement daemon Name: radvd Version: 1.6 -Release: 2%{?dist} +Release: 3%{?dist} # The code includes the advertising clause, so it's GPL-incompatible License: BSD with advertising Group: System Environment/Daemons @@ -36,7 +36,7 @@ services. %build export CFLAGS="$RPM_OPT_FLAGS -D_GNU_SOURCE -fPIE" export LDFLAGS='-pie -Wl,-z,relro,-z,now,-z,noexecstack,-z,nodlopen' -%configure --with-pidfile=/var/run/radvd/radvd.pid +%configure --with-pidfile=%{_localstatedir}/run/radvd/radvd.pid make # make %{?_smp_mflags} # Parallel builds still fail because seds that transform y.tab.x into @@ -50,7 +50,7 @@ make DESTDIR=$RPM_BUILD_ROOT install mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig mkdir -p $RPM_BUILD_ROOT%{initdir} -mkdir -p $RPM_BUILD_ROOT/var/run/radvd +mkdir -p $RPM_BUILD_ROOT%{_localstatedir}/run/radvd install -m 644 redhat/radvd.conf.empty $RPM_BUILD_ROOT%{_sysconfdir}/radvd.conf install -m 755 %{SOURCE1} $RPM_BUILD_ROOT%{initdir}/radvd @@ -83,15 +83,18 @@ exit 0 %defattr(-,root,root,-) %doc COPYRIGHT README CHANGES INTRO.html TODO %config(noreplace) %{_sysconfdir}/radvd.conf -%config(noreplace) /etc/sysconfig/radvd +%config(noreplace) %{_sysconfdir}/sysconfig/radvd %{initdir}/radvd -%dir %attr(-,radvd,radvd) /var/run/radvd/ +%dir %attr(-,radvd,radvd) %ghost %{_localstatedir}/run/radvd/ %doc radvd.conf.example %{_mandir}/*/* %{_sbindir}/radvd %{_sbindir}/radvdump %changelog +* Wed Dec 01 2010 Jiri Skala - 1.6-3 +- fixes #656682 - Please Update Spec File to use %ghost on files in /var/run + * Fri May 21 2010 Jiri Skala - 1.6-2 - ensure fax group id == fax user id