diff --git a/net-snmp.changes b/net-snmp.changes index cdb3d98..6a38137 100644 --- a/net-snmp.changes +++ b/net-snmp.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Thu Nov 23 13:46:24 UTC 2017 - rbrown@suse.com + +- Replace references to /var/adm/fillup-templates with new + %_fillupdir macro (boo#1069468) + ------------------------------------------------------------------- Tue Jun 13 10:07:45 UTC 2017 - daniel.molkentin@suse.com diff --git a/net-snmp.spec b/net-snmp.spec index 7588b8c..7f79b09 100644 --- a/net-snmp.spec +++ b/net-snmp.spec @@ -16,6 +16,11 @@ # +#Compat macro for new _fillupdir macro introduced in Nov 2017 +%if ! %{defined _fillupdir} + %define _fillupdir /var/adm/fillup-templates +%endif + # compatibility for SLES11 <=SP1 %{!?python_sitelib: %global python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib())")} %{!?python_sitearch: %global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib(1))")} @@ -291,7 +296,7 @@ popd %{buildroot}%{_includedir}/net-snmp/net-snmp-config.h.new %{__mv} %{buildroot}%{_includedir}/net-snmp/net-snmp-config.h{.new,} %{__install} -D -m 0644 %{S:7} \ - %{buildroot}/var/adm/fillup-templates/sysconfig.%{pkg_name} + %{buildroot}%{_fillupdir}/sysconfig.%{pkg_name} # %{__ln_s} -f %{netsnmp_agentx_socket_dir_fhs} %{buildroot}%{netsnmp_agentx_socket_dir_rfc} # @@ -360,7 +365,7 @@ rm -f "%buildroot/%_libdir"/*.la %dir %ghost %attr(700,root,root) %{netsnmp_agentx_socket_dir_fhs} %ghost %{netsnmp_logfile} %config(noreplace) /etc/logrotate.d/net-snmp -/var/adm/fillup-templates/sysconfig.%{pkg_name} +%{_fillupdir}/sysconfig.%{pkg_name} %{netsnmp_agentx_socket_dir_rfc} %{_datadir}/snmp/snmpconf-data/ %{_datadir}/snmp/snmp_perl.pl