From e423b0637d6a70b04b07f3750ec8585fdaba9bef Mon Sep 17 00:00:00 2001 From: Johnny Hughes Date: May 11 2018 13:46:14 +0000 Subject: Manual CentOS Debranding --- diff --git a/SPECS/cockpit.spec b/SPECS/cockpit.spec index 6875eee..b01fa82 100644 --- a/SPECS/cockpit.spec +++ b/SPECS/cockpit.spec @@ -7,10 +7,6 @@ # by tools/gen-spec-dependencies during "make dist", but keep a hardcoded fallback %define required_base 122 -%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 %if "%{!?os_version_id:1}" @@ -207,13 +203,8 @@ find %{buildroot}%{_datadir}/%{name}/packagekit -type f >> packagekit.list 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 echo '%dir %{_datadir}/%{name}/selinux' > selinux.list find %{buildroot}%{_datadir}/%{name}/selinux -type f >> selinux.list -%endif %ifarch x86_64 %{arm} aarch64 ppc64le i686 s390x echo '%dir %{_datadir}/%{name}/docker' > docker.list @@ -310,6 +301,8 @@ 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 @@ -571,7 +564,6 @@ The Cockpit component for managing networking. This package uses NetworkManager %endif -%if 0%{?rhel}%{?centos} == 0 %package selinux Summary: Cockpit SELinux package @@ -588,8 +580,6 @@ utility setroubleshoot to diagnose and resolve SELinux issues. %files selinux -f selinux.list -%endif - %ifarch x86_64 %{arm} aarch64 ppc64le s390x %package docker @@ -640,6 +630,9 @@ The Cockpit component for installing package updates, via PackageKit. %files packagekit -f packagekit.list %changelog +* Fri May 13 2018 Johnny Hughes 160-3 +- Manual CentOS Debranding + * Mon Feb 26 2018 Martin Pitt 160-3 - storaged: Drop VDO async option rhbz#1548988