diff --git a/.cockpit-podman.metadata b/.cockpit-podman.metadata index 7db586d..5cb4745 100644 --- a/.cockpit-podman.metadata +++ b/.cockpit-podman.metadata @@ -1 +1 @@ -0d24542b1213643ff738c2d35af8152adeed99ed SOURCES/cockpit-podman-4.tar.gz +b7e78c163be798d3bb04a00b6969a7613eaf3280 SOURCES/cockpit-podman-11.tar.gz diff --git a/.gitignore b/.gitignore index 0a0fb8f..6a17c8b 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -SOURCES/cockpit-podman-4.tar.gz +SOURCES/cockpit-podman-11.tar.gz diff --git a/SOURCES/0001-Fix-AppStream-ID.patch b/SOURCES/0001-Fix-AppStream-ID.patch deleted file mode 100644 index bc3387e..0000000 --- a/SOURCES/0001-Fix-AppStream-ID.patch +++ /dev/null @@ -1,39 +0,0 @@ -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 index e161a45..80201b7 100644 --- a/SPECS/cockpit-podman.spec +++ b/SPECS/cockpit-podman.spec @@ -1,5 +1,5 @@ # This spec file has been automatically updated -Version: 4 +Version: 11 Release: 1%{?dist} Name: cockpit-podman Summary: Cockpit component for Podman containers @@ -7,20 +7,18 @@ 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 +Requires: podman >= 1.3.0 %description The Cockpit user interface for Podman containers. %prep -%autosetup -S patch -n cockpit-podman +%setup -q -n cockpit-podman %build # Nothing to build @@ -34,6 +32,21 @@ appstream-util validate-relax --nonet %{buildroot}/%{_datadir}/metainfo/* %{_datadir}/metainfo/* %changelog +* Wed Dec 11 2019 Jindrich Novy - 11-1 +- Fix Alert notification in Image Search Modal +- Allow more than a single Error Notification for Container action errors +- Various Alert cleanups +- Translation updates +- Related: RHELPLAN-25138 + +* Wed Nov 13 2019 Matej Marusak - 10-1 +- Support for user containers +- Show list of containers that use given image +- Show placeholder while loading containers and images +- Fix setting memory limit - bug 1732713 +- Add container Terminal - bug 1703245 +- Related: RHELPLAN-25138 + * Wed Jun 26 2019 Martin Pitt - 4-1 - Fix regression in container commit - Fix AppStream ID rhbz#1734809