From aa2c69d316d662d464b40d5dbf1ee6ceda88e8af Mon Sep 17 00:00:00 2001 From: CentOS Sources Date: Mar 12 2019 08:23:05 +0000 Subject: import cockpit-173.2-1.el7 --- diff --git a/.cockpit.metadata b/.cockpit.metadata index c7db194..211b8e0 100644 --- a/.cockpit.metadata +++ b/.cockpit.metadata @@ -1 +1 @@ -9de4e1b0b328c6d1bb923f373d3f72e9ba2e0ede SOURCES/cockpit-173.1.tar.xz +a287a1345d5aa8197be21b36ee25a9a607f407d7 SOURCES/cockpit-173.2.tar.xz diff --git a/.gitignore b/.gitignore index 44bd084..222a84c 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -SOURCES/cockpit-173.1.tar.xz +SOURCES/cockpit-173.2.tar.xz diff --git a/SPECS/cockpit.spec b/SPECS/cockpit.spec index c106f4e..e19bae6 100644 --- a/SPECS/cockpit.spec +++ b/SPECS/cockpit.spec @@ -7,9 +7,9 @@ # by tools/gen-spec-dependencies during "make dist", but keep a hardcoded fallback %define required_base 122 -#%if 0%{?centos} -#%define rhel 0 -#%endif +%if 0%{?centos} +%define rhel 0 +%endif # for testing this already gets set in fedora.install, as we want the target # VERSION_ID, not the mock chroot's one @@ -31,7 +31,7 @@ # on RHEL 7.x we build subscriptions; superseded later by # external subscription-manager-cockpit -%if (0%{?rhel} >= 7 && 0%{?rhel} < 8) && 0%{?centos} == 0 +%if 0%{?rhel} >= 7 && 0%{?rhel} < 8 %define build_subscriptions 1 %endif @@ -57,7 +57,7 @@ Summary: A user interface for Linux servers License: LGPLv2+ URL: https://cockpit-project.org/ -Version: 173.1 +Version: 173.2 %if %{defined wip} Release: 1.%{wip}%{?dist} Source0: cockpit-%{version}.tar.gz @@ -805,8 +805,8 @@ via PackageKit. %endif # build optional extension packages %changelog -* Wed Nov 28 2018 Johnny Hughes -- Manual CentOS Debranding +* Wed Jan 30 2019 Martin Pitt 173.2-1 +- ws: Fix bug parsing invalid base64 headers rhbz#1672296 * Tue Oct 30 2018 Martin Pitt 173.1-1 - Crash fixes spotted by coverity rhbz#1644345