diff --git a/docker.spec b/docker.spec index fc2bef5..b2227cc 100644 --- a/docker.spec +++ b/docker.spec @@ -20,8 +20,8 @@ %global d_dist %(echo %{?dist} | sed 's/./-/') # d-s-s stuff (prefix with dss_) -%global dss_libdir %{_prefix}/lib/%{repo}-storage-setup -%global dss_commit 6898d433f7c7666475656ab89565ec02d08c4c55 +%global dss_libdir %{_exec_prefix}/lib/%{repo}-storage-setup +%global dss_commit 01df51290475e7bd0243bca50725cb85c4915f36 %global dss_shortcommit %(c=%{dss_commit}; echo ${c:0:7}) %global utils_commit dab51acd1b1a77f7cb01a1b7e2129ec85c846b71 @@ -292,7 +292,8 @@ Requires(post): selinux-policy-targeted >= %{selinux_policyver} Requires(post): policycoreutils Requires(post): policycoreutils-python Requires(post): libselinux-utils -Provides: %{repo}-io-selinux +Requires(post): docker +Provides: %{repo}-io-selinux = %{epoch}:%{version}-%{release} %description selinux SELinux policy modules for use with Docker. @@ -326,11 +327,11 @@ sed -i 's/$/%{d_dist}/' VERSION # untar d-s-s tar zxf %{SOURCE8} -# untar %{repo}-utils +# untar %%{repo}-utils tar zxf %{SOURCE9} %if 0%{?with_selinux} -# unpack %{repo}-selinux +# unpack %%{repo}-selinux tar zxf %{SOURCE7} %endif # with_selinux @@ -358,7 +359,7 @@ go build github.com/vbatts/%{repo}-utils/cmd/%{repo}tarsum popd %if 0%{?with_selinux} -# build %{repo}-selinux +# build %%{repo}-selinux pushd %{repo}-selinux-%{ds_commit} make SHARE="%{_datadir}" TARGETS="%{modulenames}" popd @@ -375,7 +376,7 @@ install -p -m 755 _build/src/%{repo}tarsum %{buildroot}%{_bindir} for x in bundles/*%{d_dist}; do if ! test -d $x/dynbinary; then - continue + continue fi install -p -m 755 $x/dynbinary/%{repo}-*%{d_dist} %{buildroot}%{_bindir}/%{repo} install -p -m 755 $x/dynbinary/%{repo}init-*%{d_dist} %{buildroot}%{_libexecdir}/%{repo}/%{repo}init @@ -465,10 +466,10 @@ for dir in */ ; do done %endif # with_devel -# remove %{repo}-selinux rpm spec file +# remove %%{repo}-selinux rpm spec file rm -rf %{repo}-selinux-%{ds_commit}/%{repo}-selinux.spec -# install %{repo} config directory +# install %%{repo} config directory install -dp %{buildroot}%{_sysconfdir}/%{repo} # install d-s-s @@ -518,7 +519,7 @@ if %{_sbindir}/selinuxenabled ; then %{_sbindir}/load_policy %relabel_files if [ $1 -eq 1 ]; then - restorecon -R %{_sharedstatedir}/%{repo} + restorecon -R %{_sharedstatedir}/%{repo} fi fi %endif # with_selinux