From 8d9fa2d091254b9532670996a4110c9434957bb8 Mon Sep 17 00:00:00 2001 From: CentOS Sources Date: Mar 07 2018 09:34:32 +0000 Subject: import cockpit-160-1.el7 --- diff --git a/.cockpit.metadata b/.cockpit.metadata index e19db46..8e16f96 100644 --- a/.cockpit.metadata +++ b/.cockpit.metadata @@ -1 +1 @@ -350687e6d1a3d408042a5f831c43756970774f3c SOURCES/cockpit-157.tar.xz +236c4ed6fc4cfc4d78edf1d6fc9c54de08d82432 SOURCES/cockpit-160.tar.xz diff --git a/.gitignore b/.gitignore index 3295085..d294e5d 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -SOURCES/cockpit-157.tar.xz +SOURCES/cockpit-160.tar.xz diff --git a/SPECS/cockpit.spec b/SPECS/cockpit.spec index d520405..eb44907 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 @@ -33,7 +33,7 @@ Summary: A user interface for Linux servers License: LGPLv2+ URL: http://cockpit-project.org/ -Version: 157 +Version: 160 %if %{defined wip} Release: 1.%{wip}%{?dist} Source0: cockpit-%{version}.tar.gz @@ -205,12 +205,12 @@ echo '%dir %{_datadir}/%{name}/machines' > machines.list find %{buildroot}%{_datadir}/%{name}/machines -type f >> machines.list # on CentOS systems we don't have the required setroubleshoot-server packages -#%if 0%{?centos} -#rm -rf %{buildroot}%{_datadir}/%{name}/selinux -#%else +%if 0%{?centos} +rm -rf %{buildroot}%{_datadir}/%{name}/selinux +%else echo '%dir %{_datadir}/%{name}/selinux' > selinux.list find %{buildroot}%{_datadir}/%{name}/selinux -type f >> selinux.list -#%endif +%endif %ifarch x86_64 %{arm} aarch64 ppc64le i686 s390x echo '%dir %{_datadir}/%{name}/docker' > docker.list @@ -235,10 +235,8 @@ rm %{buildroot}/%{_libexecdir}/cockpit-stub touch kubernetes.list %endif -# On RHEL, apps/ovirt are not currently built -%if 0%{?rhel} +# On RHEL and CentOS, apps/ovirt are not currently built rm -rf %{buildroot}/%{_datadir}/%{name}/apps %{buildroot}/%{_datadir}/%{name}/ovirt -%endif sed -i "s|%{buildroot}||" *.list @@ -253,6 +251,8 @@ rm -rf %{buildroot}/usr/src/debug # On RHEL kdump, subscriptions, networkmanager, selinux, and sosreport are part of the system package %if 0%{?rhel} cat kdump.list subscriptions.list sosreport.list networkmanager.list selinux.list >> system.list +rm %{buildroot}/usr/share/metainfo/org.cockpit-project.cockpit-sosreport.metainfo.xml +rm %{buildroot}/usr/share/pixmaps/cockpit-sosreport.png %endif %find_lang %{name} @@ -301,8 +301,6 @@ embed or extend Cockpit. %exclude %{_docdir}/%{name}/COPYING %exclude %{_docdir}/%{name}/README.md %{_docdir}/%{name} -/usr/share/cockpit/ovirt/* -/usr/share/cockpit/apps/* %package machines Summary: Cockpit user interface for virtual machines @@ -534,6 +532,8 @@ The Cockpit component for creating diagnostic reports with the sosreport tool. %files sosreport -f sosreport.list +/usr/share/metainfo/org.cockpit-project.cockpit-sosreport.metainfo.xml +/usr/share/pixmaps/cockpit-sosreport.png %package subscriptions Summary: Cockpit subscription user interface package @@ -566,7 +566,7 @@ The Cockpit component for managing networking. This package uses NetworkManager %endif -#%if 0%{?rhel}%{?centos} == 0 +%if 0%{?rhel}%{?centos} == 0 %package selinux Summary: Cockpit SELinux package @@ -583,7 +583,7 @@ utility setroubleshoot to diagnose and resolve SELinux issues. %files selinux -f selinux.list -#%endif +%endif %ifarch x86_64 %{arm} aarch64 ppc64le s390x @@ -636,8 +636,12 @@ The Cockpit component for installing package updates, via PackageKit. %changelog -* Mon Jan 29 2018 Johnny Hughes 157-1 -- Manual CentOS Debranding +* Mon Jan 29 2018 Martin Pitt 160-1 + - Add check boxes for common NFS mount options + - Redesign package list on Software Updates page and show RHEL Errata + - Clarify Software Update status if only security updates are available + - Add serial console to virtual Machines page and redesign the Consoles tab + - Show more error message details for failures on virtual Machines page * Fri Dec 08 2017 Martin Pitt 157-1 - Correctly compute "used" space for NFS mounts