- rename /etc/tmpfiles.d/freeradius.conf to /etc/tmpfiles.d/radiusd.conf

remove config(noreplace) because it must match files section and
  permissions differ between versions.
- fixup macro usage for /var/run & /var/lib
This commit is contained in:
John Dennis 2011-10-31 18:44:22 -04:00
parent bd9fb8d77b
commit 063c06395e

View File

@ -1,7 +1,7 @@
Summary: High-performance and highly configurable free RADIUS server Summary: High-performance and highly configurable free RADIUS server
Name: freeradius Name: freeradius
Version: 2.1.12 Version: 2.1.12
Release: 1%{?dist} Release: 2%{?dist}
License: GPLv2+ and LGPLv2+ License: GPLv2+ and LGPLv2+
Group: System Environment/Daemons Group: System Environment/Daemons
URL: http://www.freeradius.org/ URL: http://www.freeradius.org/
@ -183,8 +183,7 @@ perl -pi -e 's:sys_lib_search_path_spec=.*:sys_lib_search_path_spec="/lib64 /usr
make LINK_MODE=-pie make LINK_MODE=-pie
%install %install
mkdir -p %{buildroot}%{_sysconfdir}/tmpfiles.d mkdir -p $RPM_BUILD_ROOT/%{_localstatedir}/lib/radiusd
mkdir -p $RPM_BUILD_ROOT/var/lib/radiusd
# fix for bad libtool bug - can not rebuild dependent libs and bins # fix for bad libtool bug - can not rebuild dependent libs and bins
#FIXME export LD_LIBRARY_PATH=$RPM_BUILD_ROOT/%{_libdir} #FIXME export LD_LIBRARY_PATH=$RPM_BUILD_ROOT/%{_libdir}
make install R=$RPM_BUILD_ROOT make install R=$RPM_BUILD_ROOT
@ -203,7 +202,7 @@ install -D -m 644 %{SOURCE103} $RPM_BUILD_ROOT/%{_sysconfdir}/pam.d/radiusd
mkdir -p %{buildroot}%{_sysconfdir}/tmpfiles.d mkdir -p %{buildroot}%{_sysconfdir}/tmpfiles.d
mkdir -p %{buildroot}%{_localstatedir}/run/ mkdir -p %{buildroot}%{_localstatedir}/run/
install -d -m 0710 %{buildroot}%{_localstatedir}/run/radiusd/ install -d -m 0710 %{buildroot}%{_localstatedir}/run/radiusd/
install -m 0644 %{SOURCE104} %{buildroot}%{_sysconfdir}/tmpfiles.d/%{name}.conf install -m 0644 %{SOURCE104} %{buildroot}%{_sysconfdir}/tmpfiles.d/radiusd.conf
# remove unneeded stuff # remove unneeded stuff
rm -rf doc/00-OLD rm -rf doc/00-OLD
@ -295,9 +294,9 @@ exit 0
%config(noreplace) %{_sysconfdir}/pam.d/radiusd %config(noreplace) %{_sysconfdir}/pam.d/radiusd
%config(noreplace) %{_sysconfdir}/logrotate.d/radiusd %config(noreplace) %{_sysconfdir}/logrotate.d/radiusd
%{_unitdir}/radiusd.service %{_unitdir}/radiusd.service
%dir %{_localstatedir}/run/radiusd/ %config %{_sysconfdir}/tmpfiles.d/radiusd.conf
%config(noreplace) %{_sysconfdir}/tmpfiles.d/%{name}.conf %dir %attr(710,radiusd,radiusd) %{_localstatedir}/run/radiusd
%dir %attr(755,radiusd,radiusd) /var/lib/radiusd %dir %attr(755,radiusd,radiusd) %{_localstatedir}/lib/radiusd
# configs # configs
%dir %attr(755,root,radiusd) /etc/raddb %dir %attr(755,root,radiusd) /etc/raddb
%defattr(-,root,radiusd) %defattr(-,root,radiusd)
@ -383,7 +382,6 @@ exit 0
%attr(640,root,radiusd) %config(noreplace) /etc/raddb/modules/sradutmp %attr(640,root,radiusd) %config(noreplace) /etc/raddb/modules/sradutmp
%attr(640,root,radiusd) %config(noreplace) /etc/raddb/modules/unix %attr(640,root,radiusd) %config(noreplace) /etc/raddb/modules/unix
%attr(640,root,radiusd) %config(noreplace) /etc/raddb/modules/wimax %attr(640,root,radiusd) %config(noreplace) /etc/raddb/modules/wimax
%dir %attr(755,radiusd,radiusd) /var/run/radiusd/
# binaries # binaries
%defattr(-,root,root) %defattr(-,root,root)
/usr/sbin/checkrad /usr/sbin/checkrad
@ -588,6 +586,12 @@ exit 0
%{_libdir}/freeradius/rlm_sql_unixodbc-%{version}.so %{_libdir}/freeradius/rlm_sql_unixodbc-%{version}.so
%changelog %changelog
* Mon Oct 31 2011 John Dennis <jdennis@redhat.com> - 2.1.12-2
- rename /etc/tmpfiles.d/freeradius.conf to /etc/tmpfiles.d/radiusd.conf
remove config(noreplace) because it must match files section and
permissions differ between versions.
- fixup macro usage for /var/run & /var/lib
* Mon Oct 3 2011 John Dennis <jdennis@redhat.com> - 2.1.12-1 * Mon Oct 3 2011 John Dennis <jdennis@redhat.com> - 2.1.12-1
- Upgrade to latest upstream release: 2.1.12 - Upgrade to latest upstream release: 2.1.12
- Upstream changelog for 2.1.12: - Upstream changelog for 2.1.12: