From f2ab5e5b2dde4086b87cd76017790d229997d5c3686b628fc21ce60fa3f60167 Mon Sep 17 00:00:00 2001 From: Aleksa Sarai Date: Mon, 2 May 2016 07:41:45 +0000 Subject: [PATCH] * Remove conditional Patch directive for SUSE secrets, since conditionally including patches results in incompatible .src.rpms. The patch is still applied conditionally. OBS-URL: https://build.opensuse.org/package/show/Virtualization:containers/docker?expand=0&rev=103 --- docker.changes | 7 +++++++ docker.spec | 4 ---- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/docker.changes b/docker.changes index 9eaee5d..e747e8d 100644 --- a/docker.changes +++ b/docker.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Mon May 2 07:40:22 UTC 2016 - asarai@suse.de + +* Remove conditional Patch directive for SUSE secrets, since conditionally + including patches results in incompatible .src.rpms. The patch is still + applied conditionally. + ------------------------------------------------------------------- Fri Apr 29 09:04:54 UTC 2016 - asarai@suse.de diff --git a/docker.spec b/docker.spec index eaeaafd..8fa280f 100644 --- a/docker.spec +++ b/docker.spec @@ -47,13 +47,9 @@ Source7: README_SUSE.md Source8: docker-audit.rules # TODO: remove once we figure out what is wrong with iptables on ppc64le Source100: sysconfig.docker.ppc64le -%if 0%{?is_opensuse} -# nothing -%else # The mount-secrets patch is be a SLE-specific feature. As such, it is disabled by default on openSUSE. # PATCH-FEATURE-SLE docker-mount-secrets.patch -- pass the SCC machine credentials and the /etc/SUSEConnect file to containers Patch200: docker-mount-secrets.patch -%endif # Required to overcome some limitations of gcc-go: https://groups.google.com/forum/#!msg/golang-nuts/SlGCPYkjxo4/4DjcjXRCqAkJ Patch101: gcc-go-patches.patch Patch102: netlink_gcc_go.patch