diff --git a/.gitignore b/.gitignore index ac9e480..d0b455d 100644 --- a/.gitignore +++ b/.gitignore @@ -47,3 +47,5 @@ /62cae104820901fa48176b79cbce27596309914c.tar.gz /14e878dbfc49bbc145bba1c6493630bccde94823.tar.gz /8fcdfe4e51ee75a9d5ab6dbaf88e0c028b09735b.tar.gz +/0f8238c93928d11325c17cb1716fb26f2697d75c.tar.gz +/b39a7831b50391a04afc3512a8e94a7f6df26e79.tar.gz diff --git a/atomic.spec b/atomic.spec index 8fe9bdc..dc536f8 100644 --- a/atomic.spec +++ b/atomic.spec @@ -11,18 +11,18 @@ %global __python %{__python3} %endif -%global commit 8fcdfe4e51ee75a9d5ab6dbaf88e0c028b09735b +%global commit b39a7831b50391a04afc3512a8e94a7f6df26e79 %global shortcommit %(c=%{commit}; echo ${c:0:7}) # Registries package %global git_atomic_registries https://github.com/projectatomic/registries -%global commit_atomic_registries 55c231d89e660eb82262536cf25de4a5ca911616 +%global commit_atomic_registries 0f8238c93928d11325c17cb1716fb26f2697d75c %global atomic_registries_shortcommit %(c=%{commit_atomic_registries}; echo ${c:0:7}) Name: atomic Version: 1.19.1 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Tool for managing ProjectAtomic systems and containers License: LGPLv2+ URL: https://github.com/projectatomic/atomic @@ -116,14 +116,11 @@ The atomic host subcommand wraps rpm-ostree providing unified management. # Atomic Registries %package registries Summary: Parses a global YAML registry file -Requires: glib2 -Requires: libyaml -Requires: json-glib -BuildRequires: libyaml-devel -BuildRequires: json-glib-devel -BuildRequires: glib2-devel -BuildRequires: autoconf -BuildRequires: automake +BuildRequires: %{pypkg}-pytoml +BuildRequires: %{pypkg}-yaml + +Requires: %{pypkg}-pytoml +Requires: %{pypkg}-yaml %description registries Utility that parses a global YAML registry file for container runtimes. @@ -135,9 +132,7 @@ tar zxf %{SOURCE1} %build pushd ../registries-%{commit_atomic_registries} -sh ./autogen.sh -%configure -%make_build +make PYTHON=%{__python} all popd if [ %{pypkg} == 'python3' ]; then sed -i 's/input = raw_input/pass/' Atomic/util.py @@ -180,7 +175,7 @@ EOF '%{_mandir}/man1/%{name}*' pushd ../registries-%{commit_atomic_registries} -%make_install +make install DESTDIR=%{buildroot} install -d %{buildroot}%{_sysconfdir}/containers/ %if 0%{?rhel} install -p -m 644 registries.redhat %{buildroot}%{_sysconfdir}/containers/registries.conf @@ -191,14 +186,13 @@ install -p -m 644 registries.conf %{buildroot}%{_sysconfdir}/containers/ %endif install -d %{buildroot}%{_unitdir} install -p -m 644 registries.service %{buildroot}%{_unitdir} +install -p docs/registries.1.md %{buildroot}%{_mandir}/man1/ + popd %check [ ! -w /run/docker.sock ] || make PYTHON=%{__python} test -pushd ../registries-%{commit_atomic_registries} -make check -popd #define license tag if not already defined @@ -216,11 +210,17 @@ popd %license ../registries-%{commit_atomic_registries}/COPYING %doc ../registries-%{commit_atomic_registries}/README.md %{_libexecdir}/registries +%{_libexecdir}/registries_migrator %{_mandir}/man1/registries* %config(noreplace) %{_sysconfdir}/containers/registries.conf %{_unitdir}/registries.service +%{pysitelib}/registries +%{pysitelib}/registries-*.egg-info %changelog +* Thu Sep 14 2017 baude - 1.19.1-3 +- New registries and atomic packages + * Tue Aug 29 2017 baude - 1.19.1-2 - Add support for atomic run and system-containers diff --git a/sources b/sources index 8feee48..4c2541d 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (55c231d89e660eb82262536cf25de4a5ca911616.tar.gz) = df42305ffcc14b077f6f97c067b2d3fa3eba614546aaf0541997853b8317aa3af871d2dc0cce8a65b9658f26688f5330ee314b709c98a8934df2214c6923aaa0 -SHA512 (8fcdfe4e51ee75a9d5ab6dbaf88e0c028b09735b.tar.gz) = 0da256a9f58cda1696d48936698a59e4bab5c165bbbb8b82657ab2b5e220fa8ee06e78fa552f839985428cec1536002c7c0a3b1a3ab6d9a07a37e36f1bc8d372 +SHA512 (0f8238c93928d11325c17cb1716fb26f2697d75c.tar.gz) = 1d1ca29dde8d48dee18df32f927f495709b349a166d754de6c8a05dda1a394b338358a0c0652f39df79dde589d2dc524c4b7eb75b2cf0a5091dab88d91bf09b8 +SHA512 (b39a7831b50391a04afc3512a8e94a7f6df26e79.tar.gz) = 459a93a9b40baed03914c811bfc6c0471a78e0f4f6da33c7ec68ec3091aa9110990c8ceb0cf28fac0fce7a5edf591f503bb75ea4050903dfd10ae61f3c120a0b