diff --git a/.gitignore b/.gitignore index 8831840..509385b 100644 --- a/.gitignore +++ b/.gitignore @@ -113,3 +113,4 @@ /cockpit-149.tar.xz /cockpit-150.tar.xz /cockpit-151.tar.xz +/cockpit-152.tar.xz diff --git a/cockpit.spec b/cockpit.spec index ee9a731..ec46dad 100644 --- a/cockpit.spec +++ b/cockpit.spec @@ -1,6 +1,6 @@ # This spec file has been automatically updated -Version: 151 -Release: 2%{?dist} +Version: 152 +Release: 1%{?dist} # # This file is maintained at the following location: # https://github.com/cockpit-project/cockpit/blob/master/tools/cockpit.spec @@ -51,7 +51,7 @@ BuildRequires: pkgconfig(polkit-agent-1) >= 0.105 BuildRequires: pam-devel BuildRequires: autoconf automake -BuildRequires: /usr/bin/python +BuildRequires: /usr/bin/python2 BuildRequires: intltool %if %{defined build_dashboard} BuildRequires: libssh-devel >= %{libssh_version} @@ -205,6 +205,9 @@ find %{buildroot}%{_datadir}/%{name}/ostree -type f >> ostree.list echo '%dir %{_datadir}/%{name}/packagekit' >> packagekit.list find %{buildroot}%{_datadir}/%{name}/packagekit -type f >> packagekit.list +echo '%dir %{_datadir}/%{name}/apps' >> packagekit.list +find %{buildroot}%{_datadir}/%{name}/apps -type f >> packagekit.list + echo '%dir %{_datadir}/%{name}/machines' > machines.list find %{buildroot}%{_datadir}/%{name}/machines -type f >> machines.list @@ -259,7 +262,7 @@ cat kdump.list subscriptions.list sosreport.list networkmanager.list selinux.lis # dwz has trouble with the go binaries # https://fedoraproject.org/wiki/PackagingDrafts/Go %global _dwz_low_mem_die_limit 0 -%if 0%{?fedora} >= 27 +%if 0%{?fedora} >= 27 || 0%{?rhel} >= 8 %global _debugsource_packages 1 %global _debuginfo_subpackages 0 %endif @@ -468,7 +471,7 @@ Requires: libvirt-daemon Requires: libvirt-python Requires: qemu-kvm Requires: npm -Requires: python +Requires: python2 Requires: rsync Requires: xz Requires: openssh-clients @@ -615,7 +618,7 @@ Summary: Cockpit user interface for Docker containers Requires: %{name}-bridge >= 122 Requires: %{name}-shell >= 122 Requires: /usr/bin/docker -Requires: python +Requires: python2 %description docker The Cockpit components for interacting with Docker and user interface. @@ -648,17 +651,24 @@ cluster. Installed on the Kubernetes master. This package is not yet complete. %endif %package packagekit -Summary: Cockpit user interface for package updates +Summary: Cockpit user interface for packages Requires: %{name}-bridge >= 138 Requires: PackageKit %description packagekit -The Cockpit component for installing package updates, via PackageKit. +The Cockpit components for installing OS updates and Cockpit add-ons, +via PackageKit. %files packagekit -f packagekit.list # The changelog is automatically generated and merged %changelog +* Fri Oct 06 2017 Martin Pitt - 152-1 + +- Add Applications page +- Add automatic update configuration for dnf to Software Updates +- Fix cockpit-bridge crash if /etc/os-release does not exist + * Mon Sep 25 2017 Stef Walter - 151-2 - Add simulated test failure diff --git a/sources b/sources index a20792c..2cbe92c 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (cockpit-151.tar.xz) = 4ea861967f3bf33ea0d044da1af5bb787523e9cc4b997825615be3022491627524cf889d97ee263cfb636917ceb2156f78cc6c043cd40aad846264cd4804163e +SHA512 (cockpit-152.tar.xz) = 2111ba7d48324e7a153453c119006d04cbe94021cccd66c3953cb67ddde4ea2a122b40ac17e0ec25650c30fea86e1c4cf6c52587e6b6ff4d6a30a6446c80aad2