From d4ddeabff1057c999a07f0b031536bbf71738296 Mon Sep 17 00:00:00 2001 From: CentOS Sources Date: Nov 05 2019 19:38:15 +0000 Subject: import cockpit-podman-4-1.module+el8.1.0+4081+b29780af --- diff --git a/.cockpit-podman.metadata b/.cockpit-podman.metadata new file mode 100644 index 0000000..7db586d --- /dev/null +++ b/.cockpit-podman.metadata @@ -0,0 +1 @@ +0d24542b1213643ff738c2d35af8152adeed99ed SOURCES/cockpit-podman-4.tar.gz diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..0a0fb8f --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +SOURCES/cockpit-podman-4.tar.gz diff --git a/SOURCES/0001-Fix-AppStream-ID.patch b/SOURCES/0001-Fix-AppStream-ID.patch new file mode 100644 index 0000000..bc3387e --- /dev/null +++ b/SOURCES/0001-Fix-AppStream-ID.patch @@ -0,0 +1,39 @@ +From a76f2022b70df6c22d627bb37a2f1cec579ab0be Mon Sep 17 00:00:00 2001 +From: Martin Pitt +Date: Wed, 31 Jul 2019 14:59:07 +0200 +Subject: [PATCH] Fix AppStream ID + +Cockpit renamed its ID to "org.cockpit_project.cockpit" to conform to +the AppStream spec [1]. Follow suit and also fix our own ID to not +contain hyphens. + +[1] https://github.com/cockpit-project/cockpit/commit/4a9ffe669c + +Closes #159 +--- + org.cockpit-project.podman.metainfo.xml | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/org.cockpit-project.podman.metainfo.xml b/org.cockpit-project.podman.metainfo.xml +index def903f..b4725d5 100644 +--- a/org.cockpit-project.podman.metainfo.xml ++++ b/org.cockpit-project.podman.metainfo.xml +@@ -1,6 +1,6 @@ + + +- org.cockpit-project.podman ++ org.cockpit_project.podman + CC0-1.0 + Cockpit Podman + +@@ -11,6 +11,6 @@ + The Cockpit user interface for Podman containers. +

+ +- cockpit.desktop ++ org.cockpit_project.cockpit + cockpit-podman + +-- +2.21.0 + diff --git a/SPECS/cockpit-podman.spec b/SPECS/cockpit-podman.spec new file mode 100644 index 0000000..e161a45 --- /dev/null +++ b/SPECS/cockpit-podman.spec @@ -0,0 +1,58 @@ +# This spec file has been automatically updated +Version: 4 +Release: 1%{?dist} +Name: cockpit-podman +Summary: Cockpit component for Podman containers +License: LGPLv2+ +URL: https://github.com/cockpit-project/cockpit-podman + +Source0: https://github.com/cockpit-project/cockpit-podman/releases/download/%{version}/cockpit-podman-%{version}.tar.gz +Patch0001: 0001-Fix-AppStream-ID.patch + +BuildArch: noarch +BuildRequires: libappstream-glib + +Requires: cockpit-bridge >= 138 +Requires: cockpit-shell >= 138 +Requires: podman >= 1.2.0 + +%description +The Cockpit user interface for Podman containers. + +%prep +%autosetup -S patch -n cockpit-podman + +%build +# Nothing to build + +%install +%make_install +appstream-util validate-relax --nonet %{buildroot}/%{_datadir}/metainfo/* + +%files +%{_datadir}/cockpit/* +%{_datadir}/metainfo/* + +%changelog +* Wed Jun 26 2019 Martin Pitt - 4-1 +- Fix regression in container commit +- Fix AppStream ID rhbz#1734809 + +* Mon Jun 17 2019 Martin Pitt - 3-1 +- Enable Commit button for running containers +- Fix race condition with container deletion +- Stop fetching all containers/images for each container/image event + +* Sun Jun 09 2019 Martin Pitt - 2-2 +- Fix podman dependency + +* Mon May 27 2019 Martin Pitt - 2-1 +- Update to upstream 2 release +- Support podman API 1.3 +- Support running commands with arguments +- Show the default command coming from image +- Implement filtering of images and containers + +* Wed Apr 17 2019 Cockpit Project - 1-2 +- Update to upstream 1 release +