From 4a4fa8b6ca17613ff0cd0ea38220b64cb660c4b8 Mon Sep 17 00:00:00 2001 From: CentOS Sources Date: Mar 31 2016 23:03:55 +0000 Subject: import atomic-1.9-4.gitff44c6a.el7 --- diff --git a/.atomic.metadata b/.atomic.metadata index ce57459..b4111c8 100644 --- a/.atomic.metadata +++ b/.atomic.metadata @@ -1 +1,2 @@ -08539ca7b362375323c49ccac7c7ef081b479dd1 SOURCES/ca1e384502c46a275ee1d2467e1e8c494b31cbf3.tar.gz +2e64afda40392020a28cda67b470907324edd0c7 SOURCES/ff44c6a9496d3b2ba8189170e30ae2e93fee9eb4.tar.gz +f06d8948d0be37a8aeaf31e755ae82773b8ff7c5 SOURCES/skopeo-8094910.tar.gz diff --git a/.gitignore b/.gitignore index 31f69fe..e4c8365 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ -SOURCES/ca1e384502c46a275ee1d2467e1e8c494b31cbf3.tar.gz +SOURCES/ff44c6a9496d3b2ba8189170e30ae2e93fee9eb4.tar.gz +SOURCES/skopeo-8094910.tar.gz diff --git a/SPECS/atomic.spec b/SPECS/atomic.spec index b1f826a..8ac0028 100644 --- a/SPECS/atomic.spec +++ b/SPECS/atomic.spec @@ -13,40 +13,53 @@ %global pylint python3-pylint %endif -%global commit ca1e384502c46a275ee1d2467e1e8c494b31cbf3 -%global shortcommit %(c=%{commit}; echo ${c:0:7}) +%global commit0 ff44c6a9496d3b2ba8189170e30ae2e93fee9eb4 +%global shortcommit0 %(c=%{commit0}; echo ${c:0:7}) + +%global provider github +%global provider_tld com +%global project projectatomic +%global repo skopeo +# https://github.com/projectatomic/skopeo +%global provider_prefix %{provider}.%{provider_tld}/%{project}/%{repo} +%global import_path %{provider_prefix} +%global commit1 8094910c9a8122311e175b83b9c611f886a0a034 +%global shortcommit1 %(c=%{commit1}; echo ${c:0:7}) +%global skopeo_version 0.1.11 Name: atomic -Version: 1.6 -Release: 6.git%{shortcommit}%{?dist} +Version: 1.9 +Release: 4.git%{shortcommit0}%{?dist} Summary: Tool for managing ProjectAtomic systems and containers License: LGPLv2+ URL: https://github.com/projectatomic/atomic ExclusiveArch: x86_64 -Source0: https://github.com/projectatomic/%{name}/archive/%{commit}.tar.gz +Source0: https://github.com/projectatomic/%{name}/archive/%{commit0}.tar.gz +Source1: https://%{provider_prefix}/archive/%{commit1}/%{repo}-%{shortcommit1}.tar.gz BuildRequires: %{pypkg}-devel -%if 0%{?fedora} -BuildRequires: %{pylint} -%endif -BuildRequires: %{pypkg}-requests +BuildRequires: %{pypkg}-requests >= 2.4.3 +BuildRequires: %{pypkg}-setuptools BuildRequires: %{pypkg}-tools BuildRequires: %{pypkg}-dbus BuildRequires: %{pypkg}-setuptools BuildRequires: policycoreutils-%{pypkg} BuildRequires: go-md2man -BuildRequires: %{pypkg}-docker-py >= 1.4.0-118 +BuildRequires: %{pypkg}-dbus +BuildRequires: %{pypkg}-docker-py >= 1.7.2-1 +BuildRequires: rpm-%{pypkg} Requires: dbus Requires: docker Requires: polkit Requires: setup +Requires: rpm-%{pypkg} Requires: %{pypkg}-setuptools Requires: %{pypkg}-requests -Requires: %{pypkg}-docker-py >= 1.4.0-118 +Requires: %{pypkg}-docker-py >= 1.7.2-1 Requires: %{pypkg}-websocket-client >= 0.11.0 Requires: %{pypkg}-six >= 1.3.0 - +Requires: skopeo >= %{skopeo_version}-%{release} %description The goal of Atomic is to provide a high level, coherent entrypoint to the @@ -59,34 +72,132 @@ The atomic host subcommand wraps rpm-ostree, currently just providing a friendlier name, but in the future Atomic may provide more unified management. +%package -n skopeo +Summary: Inspect Docker images and repositories on registries +License: ASL 2.0 +URL: https://%{provider_prefix} +BuildRequires: %{?go_compiler:compiler(go-compiler)}%{!?go_compiler:golang} + +%description -n skopeo +Command line utility to inspect images and repositories directly on Docker +registries without the need to pull them + %prep -%setup -qn %{name}-%{commit} +%setup -qn %{name}-%{commit0} +if [ %{pypkg} == 'python3' ]; then +sed -i 's/input = raw_input/pass/' Atomic/util.py +fi + +# untar skopeo +tar zxf %{SOURCE1} %build -make PYTHON=%{__python} PYLINT=%{?pylint} all +make PYTHON=%{__python} python-build +make PYTHON=%{__python} docs + +pushd skopeo-%{commit1} +mkdir -p src/github.com/projectatomic +ln -s ../../../ src/github.com/projectatomic/skopeo + +mkdir -p vendor/src +mv vendor/github.com vendor/src/. +mv vendor/golang.org vendor/src/. + +export GOPATH=$(pwd):$(pwd)/vendor:%{gopath} +export GO15VENDOREXPERIMENT=1 +go build -o skopeo . + +go-md2man -in man/skopeo.1.md -out skopeo.1 +popd %install -make PYTHON=%{__python} PYLINT=%{?pylint} install DESTDIR=%{buildroot} +make PYTHON=%{__python} install-only DESTDIR=%{buildroot} + +pushd skopeo-%{commit1} +mkdir -p %{buildroot}%{_mandir}/man1 +make DESTDIR=%{buildroot} install +popd + +# Better support for doing continuous delivery by supporting optional +# components. The canonical copy of this is in `rpm-ostree.spec`. +cat > autofiles.py < 0: + sys.stderr.write('{0} matched {1} files\n'.format(line, len(files))) + sys.stdout.write(line + '\n') + else: + sys.stderr.write('{0} did not match any files\n'.format(line)) +EOF +%{pypkg} autofiles.py > files \ + '%{pysitelib}/Atomic' \ + '%{pysitelib}/%{name}*.egg-info' \ + '%{_sysconfdir}/profile.d/%{name}.sh' \ + '%{_bindir}/%{name}' \ + '%{_datadir}/%{name}' \ + '%{_libexecdir}/%{name}/' \ + '%{_datadir}/bash-completion/completions/%{name}' \ + '%{_datadir}/dbus-1/system-services/org.%{name}.service' \ + '%{_datadir}/polkit-1/actions/org.%{name}.policy' \ + '%{_mandir}/man1/%{name}*' %check [ ! -w /run/docker.sock ] || make PYTHON=%{__python} test -%files +%files -f files %doc COPYING README.md %config(noreplace) %{_sysconfdir}/sysconfig/%{name} %config(noreplace) %{_sysconfdir}/dbus-1/system.d/org.%{name}.conf -%{pysitelib}/Atomic -%{pysitelib}/%{name}*.egg-info -%{_sysconfdir}/profile.d/%{name}.sh -%{_bindir}/%{name} -%{_datadir}/%{name} -%{_datadir}/bash-completion/completions/%{name} -%{_datadir}/dbus-1/system-services/org.%{name}.service -%{_datadir}/polkit-1/actions/org.%{name}.policy -%{_mandir}/man1/%{name}* +%files -n skopeo +%{_bindir}/skopeo +%{_mandir}/man1/skopeo.1* +%doc skopeo-%{commit1}/LICENSE skopeo-%{commit1}/README.md %changelog +* Tue Mar 08 2016 Lokesh Mandvekar - 1.9-4.gitff44c6a +- depend on python-docker-py >= 1.7.2-1 + +* Tue Mar 08 2016 Lokesh Mandvekar - 1.9-3.gitff44c6a +- include skopeo subpackage + +* Tue Mar 08 2016 Lokesh Mandvekar - 1.9-2.gitff44c6a +- Resolves: rhbz#1315846 - rebase to 1.9 +- built atomic commit#ff44c6a + +* Thu Feb 18 2016 Antonio Murdaca - 1.8-7.git1bc3814 +- rebuilt + +* Tue Jan 26 2016 Lokesh Mandvekar - 1.8-6.git1bc3814 +- built atomic commit#1bc3814 + +* Tue Jan 26 2016 Lokesh Mandvekar - 1.8-5.git1bc3814 +- Resolves: rhbz#1300459 - no .egg-info file/dir installed anymore +- built atomic commit#1bc3814 + +* Tue Jan 19 2016 Lokesh Mandvekar - 1.8-4.git958d939 +- Resolves: rhbz#1292776 +- built atomic commit#958d939 + +* Tue Jan 19 2016 Lokesh Mandvekar - 1.8-3.git958d939 +- built atomic commit#958d939 + +* Tue Jan 05 2016 Lokesh Mandvekar - 1.8-2.gita35ae18 +- built atomic commit#a35ae18 + +* Tue Dec 01 2015 Lokesh Mandvekar - 1.7-3.git95b28a9 +- Resolves: rhbz#1285461 - improved 'atomic images' formatting +- built atomic commit#95b28a9 + +* Mon Nov 23 2015 Lokesh Mandvekar - 1.7-2.git68be076 +- built atomic commit#68be076 + * Wed Nov 04 2015 Lokesh Mandvekar - 1.6-6.gitca1e384 - update python-docker-py dependency over what was shipped in 7.1.6 and 7.2.0