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

Accepting request 544765 from home:RBrownSUSE:branches:Virtualization:containers

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

OBS-URL: https://build.opensuse.org/request/show/544765
OBS-URL: https://build.opensuse.org/package/show/Virtualization:containers/docker?expand=0&rev=218
This commit is contained in:
Aleksa Sarai 2017-11-24 10:06:46 +00:00 committed by Git OBS Bridge
parent c1e075d88f
commit eb28b07ea5
2 changed files with 13 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
docker.changes
View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Thu Nov 23 13:48:08 UTC 2017 - rbrown@suse.com
- Replace references to /var/adm/fillup-templates with new
%_fillupdir macro (boo#1069468)
------------------------------------------------------------------- -------------------------------------------------------------------
Tue Nov 7 16:47:01 UTC 2017 - asarai@suse.com Tue Nov 7 16:47:01 UTC 2017 - asarai@suse.com

9
docker.spec
View File

@ -17,6 +17,11 @@
# nodebuginfo # nodebuginfo
#Compat macro for new _fillupdir macro introduced in Nov 2017
%if ! %{defined _fillupdir}
%define _fillupdir /var/adm/fillup-templates
%endif
%global docker_store %{_localstatedir}/lib/docker %global docker_store %{_localstatedir}/lib/docker
%global docker_migration_testfile %{docker_store}/.suse-image-migration-v1to2-complete %global docker_migration_testfile %{docker_store}/.suse-image-migration-v1to2-complete
%global docker_migration_warnfile %{docker_store}/docker-update-message.txt %global docker_migration_warnfile %{docker_store}/docker-update-message.txt
@ -370,7 +375,7 @@ install -D -m 0644 %{SOURCE3} %{buildroot}%{_udevrulesdir}/80-%{name}.rules
install -D -m 0640 %{SOURCE8} %{buildroot}%{_sysconfdir}/audit/rules.d/%{name}.rules install -D -m 0640 %{SOURCE8} %{buildroot}%{_sysconfdir}/audit/rules.d/%{name}.rules
# sysconfig file # sysconfig file
install -D -m 644 %{SOURCE4} %{buildroot}%{_localstatedir}/adm/fillup-templates/sysconfig.docker install -D -m 644 %{SOURCE4} %{buildroot}%{_fillupdir}/sysconfig.docker
# install manpages (using the ones from the engine) # install manpages (using the ones from the engine)
install -d %{buildroot}%{_mandir}/man1 install -d %{buildroot}%{_mandir}/man1
@ -450,7 +455,7 @@ fi
%{_unitdir}/%{name}.service %{_unitdir}/%{name}.service
%config %{_sysconfdir}/audit/rules.d/%{name}.rules %config %{_sysconfdir}/audit/rules.d/%{name}.rules
%{_udevrulesdir}/80-%{name}.rules %{_udevrulesdir}/80-%{name}.rules
%{_localstatedir}/adm/fillup-templates/sysconfig.docker %{_fillupdir}/sysconfig.docker
%{_localstatedir}/lib/docker/ %{_localstatedir}/lib/docker/
%{_mandir}/man1/docker-*.1%{ext_man} %{_mandir}/man1/docker-*.1%{ext_man}
%{_mandir}/man1/docker.1%{ext_man} %{_mandir}/man1/docker.1%{ext_man}