diff --git a/.docker-distribution.metadata b/.docker-distribution.metadata index 342e5fd..a34e78a 100644 --- a/.docker-distribution.metadata +++ b/.docker-distribution.metadata @@ -1 +1 @@ -50d88524c5e0488a30b7ca894b6b1ac0fad7f76d SOURCES/12acdf0a6c1e56d965ac6eb395d2bce687bf22fc.tar.gz +de04a231db6a04ebe9fe842a0ff88f2d366f8c30 SOURCES/325b0804fef3a66309d962357aac3c2ce3f4d329.tar.gz diff --git a/.gitignore b/.gitignore index bf64f60..ef38ee3 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -SOURCES/12acdf0a6c1e56d965ac6eb395d2bce687bf22fc.tar.gz +SOURCES/325b0804fef3a66309d962357aac3c2ce3f4d329.tar.gz diff --git a/SPECS/docker-distribution.spec b/SPECS/docker-distribution.spec index 10563d2..0a22855 100644 --- a/SPECS/docker-distribution.spec +++ b/SPECS/docker-distribution.spec @@ -33,11 +33,11 @@ # https://github.com/docker/distribution %global provider_prefix %{provider}.%{provider_tld}/%{project}/%{repo} %global import_path %{provider_prefix} -%global commit 12acdf0a6c1e56d965ac6eb395d2bce687bf22fc +%global commit 325b0804fef3a66309d962357aac3c2ce3f4d329 %global shortcommit %(c=%{commit}; echo ${c:0:7}) Name: %{project}-%{repo} -Version: 2.5.1 +Version: 2.6.0 Release: 1%{?dist} Summary: Docker toolset to pack, ship, store, and deliver content License: ASL 2.0 @@ -50,7 +50,7 @@ BuildRequires: systemd Requires(post): systemd Requires(preun): systemd Requires(postun): systemd -Obsoletes: docker-registry <= 0.9.1-7 +Obsoletes: docker-registry < 0.9.1-8 Provides: docker-registry = %{version}-%{release} @@ -340,6 +340,11 @@ make test %endif %changelog +* Mon Jan 23 2017 Frantisek Kluknavsky - 2.6.0-1 +- rebase to v2.6.0 +* Mon Jan 09 2017 Frantisek Kluknavsky - 2.5.1-2 +- fix wrong obsoleting of docker-registry + * Mon Oct 24 2016 Frantisek Kluknavsky - 2.5.1-1 - rebase to v2.5.1