Hello community, here is the log from the commit of package golang-github-docker-libnetwork for openSUSE:Factory checked in at 2018-09-05 13:45:56 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/golang-github-docker-libnetwork (Old) and /work/SRC/openSUSE:Factory/.golang-github-docker-libnetwork.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "golang-github-docker-libnetwork" Wed Sep 5 13:45:56 2018 rev:9 rq:630777 version:0.7.0.1+gitr2664_3ac297bc7fd0 Changes: -------- --- /work/SRC/openSUSE:Factory/golang-github-docker-libnetwork/golang-github-docker-libnetwork.changes 2018-06-22 13:15:26.346913421 +0200 +++ /work/SRC/openSUSE:Factory/.golang-github-docker-libnetwork.new/golang-github-docker-libnetwork.changes 2018-09-05 13:45:58.545998048 +0200 @@ -1,0 +2,23 @@ +Thu Aug 16 02:00:31 UTC 2018 - asa...@suse.com + +- Merge -kubic packages back into the main Virtualization:containers packages. + This is done using _multibuild to add a "kubic" flavour, which is then used + to conditionally compile patches and other kubic-specific features. + bsc#1105000 + +------------------------------------------------------------------- +Wed Jul 25 08:57:03 UTC 2018 - asa...@suse.com + +- Switch to Go 1.10 for build. +- Upgrade to version 3ac297bc7fd0afec9051bbb47024c9bc1d75bf5b which is requried + by the Docker v18.06.0-ce upgrade. bsc#1102522 + * Use fmt precision to limit string length + * Fix error handling about bridgeSetup + * ipam: Test rejection of overlapping pool requests + * ipam, types: Expand documentation + * CircleCI use latest image + * Optimize networkDB queue + * Enhance testing infra + * Allows to set generic knobs on the Sandbox + +------------------------------------------------------------------- @@ -6,0 +30,10 @@ +Mon Feb 12 10:46:57 UTC 2018 - rbr...@suse.com + +- Add ${version} to equivalent non-kubic package provides + +------------------------------------------------------------------- +Thu Feb 8 12:35:15 UTC 2018 - rbr...@suse.com + +- Add Provides for equivalent non-kubic packages + +------------------------------------------------------------------- @@ -9,0 +43,12 @@ + +------------------------------------------------------------------- +Wed Jan 31 09:10:23 UTC 2018 - vrothb...@suse.com + +- Make it conflict with the non-Kubic package to avoid a file conflict in + Factory. + +------------------------------------------------------------------- +Mon Jan 29 12:58:54 UTC 2018 - vrothb...@suse.com + +- Correct conflict with docker < 17.09.0_ce to avoid a file conflict on + docker-proxy. Old: ---- libnetwork-git.7b2b1feb1de4817d522cc372af149ff48d25028e.tar.xz New: ---- _multibuild libnetwork-git.3ac297bc7fd0afec9051bbb47024c9bc1d75bf5b.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ golang-github-docker-libnetwork.spec ++++++ --- /var/tmp/diff_new_pack.ZXYTZa/_old 2018-09-05 13:46:00.726001703 +0200 +++ /var/tmp/diff_new_pack.ZXYTZa/_new 2018-09-05 13:46:00.726001703 +0200 @@ -17,15 +17,26 @@ # nodebuginfo +# Handle _multibuild magic. +%define flavour @BUILD_FLAVOR@%{nil} + +# We split the Name: into "realname" and "name_suffix". +%define realname golang-%{provider}-%{project}-%{repo} +%if "%flavour" == "" +%define name_suffix %{nil} +%else +%define name_suffix -%{flavour} +%endif + # MANUAL: Update the git_version and git_revision -%define git_version 7b2b1feb1de4817d522cc372af149ff48d25028e -%define git_short 7b2b1feb1de4 +%define git_version 3ac297bc7fd0afec9051bbb47024c9bc1d75bf5b +%define git_short 3ac297bc7fd0 # How to get the git_revision # git clone https://github.com/docker/libnetwork.git libnetwork # cd libnetwork # git checkout $git_version # git_revision=r$(git rev-list HEAD | wc -l) -%define git_revision r2066 +%define git_revision r2664 %global provider github %global provider_tld com @@ -34,12 +45,13 @@ %global provider_prefix %{provider}.%{provider_tld}/%{project}/%{repo} %global import_path %{provider_prefix} -Name: golang-%{provider}-%{project}-%{repo} -# FIX-UPSTREAM: It looks like Docker _downgraded_ their version of libnetwork -# in the bump from v17.07.0_ce (0.7.0+gitr2322_4a242dba7739) to -# v17.10.0_ce (0.7.0+gitr2066_7b2b1feb1de4). This means that we -# have to fake the version here to be different from the upstream -# version. Please keep this in mind next time you do an update. +Name: %{realname}%{name_suffix} +# NOTE: A while ago, Docker downgraded this dependency on an upgrade, which +# caused lots of issues when trying to upgrade the RPMs. To fix this, we +# bumped the version to v0.7.0.1+... which RPM saw as an upgrade. +# Unfortunately subsequent upgrades have yet to bump the other version +# components, so we need to keep the '.1' even though it isn't +# technically correct. Hopefully we will be able to remove it eventually. Version: 0.7.0.1+git%{git_revision}_%{git_short} Release: 0 Summary: Docker Networking @@ -47,13 +59,21 @@ Group: Development/Languages/Golang Url: http://github.com/docker/libnetwork Source0: %{repo}-git.%{git_version}.tar.xz -Source1: %{name}-rpmlintrc -BuildRoot: %{_tmppath}/%{name}-%{version}-build +Source1: %{realname}-rpmlintrc BuildRequires: fdupes BuildRequires: golang-packaging BuildRequires: xz -BuildRequires: golang(API) = 1.8 +BuildRequires: golang(API) = 1.10 ExcludeArch: s390 +# KUBIC-SPECIFIC: This was required when upgrading from the original kubic +# packaging, when everything was renamed to -kubic. It also is +# used to ensure that nothing complains too much when using +# -kubic packages. Hopfully it can be removed one day. +%if "%flavour" == "kubic" +# Conflict with the non-Kubic package, and provide equivalent +Conflicts: golang-%{provider}-%{project}-%{repo} +Provides: golang-%{provider}-%{project}-%{repo} = %{version} +%endif %{go_provides} %description @@ -63,16 +83,25 @@ provides a consistent programming interface and the required network abstractions for applications. -%package -n docker-libnetwork +%package -n docker-libnetwork%{name_suffix} Summary: Docker Networking Group: System/Management AutoReqProv: Off Conflicts: docker < 17.09.0_ce Provides: fix_bsc_1057743 # We provide a git revision so that Docker can require it properly. -Provides: docker-libnetwork-git = %{git_version} +Provides: docker-libnetwork%{name_suffix}-git = %{git_version} +# KUBIC-SPECIFIC: This was required when upgrading from the original kubic +# packaging, when everything was renamed to -kubic. It also is +# used to ensure that nothing complains too much when using +# -kubic packages. Hopfully it can be removed one day. +%if "%flavour" == "kubic" +# Conflict with non-kubic package, and provide equivalent +Conflicts: docker-libnetwork-git +Provides: docker-libnetwork-git = %{version} +%endif -%description -n docker-libnetwork +%description -n docker-libnetwork%{name_suffix} The docker-proxy binary used by Docker that provides Docker with libnetwork support. @@ -98,7 +127,7 @@ %doc README.md MAINTAINERS %license LICENSE -%files -n docker-libnetwork +%files -n docker-libnetwork%{name_suffix} %defattr(-,root,root,-) %{_bindir}/docker-proxy ++++++ _multibuild ++++++ <multibuild> <package>kubic</package> </multibuild> ++++++ _service ++++++ --- /var/tmp/diff_new_pack.ZXYTZa/_old 2018-09-05 13:46:00.766001770 +0200 +++ /var/tmp/diff_new_pack.ZXYTZa/_new 2018-09-05 13:46:00.766001770 +0200 @@ -4,7 +4,7 @@ <param name="scm">git</param> <param name="exclude">.git</param> <param name="versionformat">git.%H</param> - <param name="revision">7b2b1feb1de4817d522cc372af149ff48d25028e</param> + <param name="revision">3ac297bc7fd0afec9051bbb47024c9bc1d75bf5b</param> <param name="changesgenerate">enable</param> </service> <service name="recompress" mode="disabled"> ++++++ libnetwork-git.7b2b1feb1de4817d522cc372af149ff48d25028e.tar.xz -> libnetwork-git.3ac297bc7fd0afec9051bbb47024c9bc1d75bf5b.tar.xz ++++++ ++++ 279561 lines of diff (skipped)