pool/samba
SHA256
2
0
Fork 2
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 546037 from home:RBrownSUSE:branches:network:samba:STABLE

Browse Source 
Replace references to /var/adm/fillup-templates with new %_fillupdir macro (boo#1069468)

OBS-URL: https://build.opensuse.org/request/show/546037
OBS-URL: https://build.opensuse.org/package/show/network:samba:STABLE/samba?expand=0&rev=578
This commit is contained in:
David Mulder 2017-11-27 16:09:07 +00:00 committed by Git OBS Bridge
parent c11fa40403
commit 96e969a95c
2 changed files with 21 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
samba.changes
View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Mon Nov 27 14:23:09 UTC 2017 - rbrown@suse.com
- Replace references to /var/adm/fillup-templates with new
%_fillupdir macro (boo#1069468)
------------------------------------------------------------------- -------------------------------------------------------------------
Wed Nov 15 17:00:50 UTC 2017 - dmulder@suse.com Wed Nov 15 17:00:50 UTC 2017 - dmulder@suse.com

25
samba.spec
View File

@ -16,6 +16,11 @@
# #
#Compat macro for new _fillupdir macro introduced in Nov 2017
%if ! %{defined _fillupdir}
%define _fillupdir /var/adm/fillup-templates
%endif
%{!?_tmpfilesdir:%global _tmpfilesdir /usr/lib/tmpfiles.d} %{!?_tmpfilesdir:%global _tmpfilesdir /usr/lib/tmpfiles.d}
%if 0%{?suse_version} > 1140 && 0%{?suse_version} != 1315 %if 0%{?suse_version} > 1140 && 0%{?suse_version} != 1315
@ -1142,7 +1147,7 @@ install -d -m 0755 -p \
%{buildroot}/%{LOCKDIR}/{drivers/{WIN40,W32X86,W32MIPS,W32ALPHA,W32PPC,IA64,x64},netlogon,lock/msg.lock,printing,private/msg.sock,profiles,winbindd_privileged} \ %{buildroot}/%{LOCKDIR}/{drivers/{WIN40,W32X86,W32MIPS,W32ALPHA,W32PPC,IA64,x64},netlogon,lock/msg.lock,printing,private/msg.sock,profiles,winbindd_privileged} \
%{buildroot}/%{LOGDIR} \ %{buildroot}/%{LOGDIR} \
%{buildroot}/%{PIDDIR} \ %{buildroot}/%{PIDDIR} \
%{buildroot}/%{_var}/adm/fillup-templates \ %{buildroot}/%{_fillupdir} \
%{buildroot}/%{_var}/cache/krb5rcache \ %{buildroot}/%{_var}/cache/krb5rcache \
%{buildroot}/%{_var}/log/ctdb \ %{buildroot}/%{_var}/log/ctdb \
%{buildroot}/%{DOCDIR} \ %{buildroot}/%{DOCDIR} \
@ -1161,7 +1166,7 @@ rm \
%endif %endif
# CTDB # CTDB
install -m 0644 vendor-files-%{vendor_files_git_vers}/config/sysconfig.ctdb %{buildroot}/%{_var}/adm/fillup-templates install -m 0644 vendor-files-%{vendor_files_git_vers}/config/sysconfig.ctdb %{buildroot}/%{_fillupdir}
%if 0%{?suse_version} > 1220 %if 0%{?suse_version} > 1220
install -m 0755 ctdb/config/ctdb.service %{buildroot}%{_unitdir}/ctdb.service install -m 0755 ctdb/config/ctdb.service %{buildroot}%{_unitdir}/ctdb.service
ln -s service %{buildroot}/%{_sbindir}/rcctdb ln -s service %{buildroot}/%{_sbindir}/rcctdb
@ -1233,7 +1238,7 @@ done
install -m 0644 -p systemd/samba-ad-dc.service %{buildroot}/%{_unitdir} install -m 0644 -p systemd/samba-ad-dc.service %{buildroot}/%{_unitdir}
ln -s service %{buildroot}/%{_sbindir}/rcsamba-ad-dc ln -s service %{buildroot}/%{_sbindir}/rcsamba-ad-dc
%endif %endif
install -m 0644 systemd/sysconfig.* %{buildroot}%_var/adm/fillup-templates install -m 0644 systemd/sysconfig.* %{buildroot}%{_fillupdir}
install -m 0644 -p ../packaging/systemd/samba.conf.tmp %{buildroot}/%{_tmpfilesdir}/samba.conf install -m 0644 -p ../packaging/systemd/samba.conf.tmp %{buildroot}/%{_tmpfilesdir}/samba.conf
%else %else
for script in ${startScripts}; do for script in ${startScripts}; do
@ -1258,8 +1263,8 @@ install -m 0755 tools/update-apparmor-samba-profile \
install -p -m 0755 tools/smbprngenpdf %{buildroot}/%{_bindir}/smbprngenpdf install -p -m 0755 tools/smbprngenpdf %{buildroot}/%{_bindir}/smbprngenpdf
install -m 0644 config/samba.reg %{buildroot}/%{_sysconfdir}/slp.reg.d/samba.reg install -m 0644 config/samba.reg %{buildroot}/%{_sysconfdir}/slp.reg.d/samba.reg
install -m 0644 config/samba.pamd-common %{buildroot}/%{_sysconfdir}/pam.d/samba install -m 0644 config/samba.pamd-common %{buildroot}/%{_sysconfdir}/pam.d/samba
install -m 0644 config/dhcp.conf %{buildroot}/%{_var}/adm/fillup-templates/samba-client-dhcp.conf install -m 0644 config/dhcp.conf %{buildroot}/%{_fillupdir}/samba-client-dhcp.conf
install -m 0644 config/sysconfig.dhcp-samba-client %{buildroot}/%{_var}/adm/fillup-templates/sysconfig.dhcp-samba-client install -m 0644 config/sysconfig.dhcp-samba-client %{buildroot}/%{_fillupdir}/sysconfig.dhcp-samba-client
for script in dhcpcd-hook-samba dhcpcd-hook-samba-functions samba-winbindd; do for script in dhcpcd-hook-samba dhcpcd-hook-samba-functions samba-winbindd; do
install -m 0755 "tools/${script}" "%{buildroot}/%{_sysconfdir}/sysconfig/%{NET_CFGDIR}/scripts/${script}" install -m 0755 "tools/${script}" "%{buildroot}/%{_sysconfdir}/sysconfig/%{NET_CFGDIR}/scripts/${script}"
done done
@ -1700,7 +1705,7 @@ fi
%exclude %{_mandir}/man8/samba-tool.8.* %exclude %{_mandir}/man8/samba-tool.8.*
%exclude %{_mandir}/man8/samba.8.* %exclude %{_mandir}/man8/samba.8.*
%if 0%{?suse_version} > 1220 %if 0%{?suse_version} > 1220
%{_var}/adm/fillup-templates/sysconfig.samba %{_fillupdir}/sysconfig.samba
%endif %endif
%files client %files client
@ -1808,8 +1813,8 @@ fi
%{_datadir}/samba/templates %{_datadir}/samba/templates
%dir %{DOCDIR} %dir %{DOCDIR}
%doc %{DOCDIR}/README.%{VENDOR} %doc %{DOCDIR}/README.%{VENDOR}
%{_localstatedir}/adm/fillup-templates/samba-client-dhcp.conf %{_fillupdir}/samba-client-dhcp.conf
%{_localstatedir}/adm/fillup-templates/sysconfig.dhcp-samba-client %{_fillupdir}/sysconfig.dhcp-samba-client
%dir %{LOCKDIR} %dir %{LOCKDIR}
%dir %{LOCKDIR}/lock %dir %{LOCKDIR}/lock
%dir %{LOCKDIR}/private %dir %{LOCKDIR}/private
@ -2047,7 +2052,7 @@ fi
%attr(0644,root,root) %{_datadir}/omc/svcinfo.d/winbind.xml %attr(0644,root,root) %{_datadir}/omc/svcinfo.d/winbind.xml
%attr(0750,root,winbind) %dir %{LOCKDIR}/winbindd_privileged %attr(0750,root,winbind) %dir %{LOCKDIR}/winbindd_privileged
%if 0%{?suse_version} > 1220 %if 0%{?suse_version} > 1220
%{_var}/adm/fillup-templates/sysconfig.samba-winbind %{_fillupdir}/sysconfig.samba-winbind
%endif %endif
%attr(0770,root,root) %{_var}/cache/krb5rcache %attr(0770,root,root) %{_var}/cache/krb5rcache
%if 0%{?suse_version} > 1110 %if 0%{?suse_version} > 1110
@ -2061,7 +2066,7 @@ fi
%files -n ctdb %files -n ctdb
%defattr(-,root,root) %defattr(-,root,root)
%dir %{_sysconfdir}/ctdb %dir %{_sysconfdir}/ctdb
%{_var}/adm/fillup-templates/sysconfig.ctdb %{_fillupdir}/sysconfig.ctdb
%{_sysconfdir}/ctdb/notify.sh %{_sysconfdir}/ctdb/notify.sh
%{_sysconfdir}/ctdb/ctdb-crash-cleanup.sh %{_sysconfdir}/ctdb/ctdb-crash-cleanup.sh
%{_sysconfdir}/ctdb/debug-hung-script.sh %{_sysconfdir}/ctdb/debug-hung-script.sh