The package rpms/cockpit.git has added or updated architecture specific content in its
spec file (ExclusiveArch/ExcludeArch or %ifarch/%ifnarch) in commit(s):
https://src.fedoraproject.org/cgit/rpms/cockpit.git/commit/?id=fda5bf0412....
Change:
-%ifarch x86_64 %{arm} aarch64 ppc64le i686 s390x
Thanks.
Full change:
============
commit fda5bf04122681721eae81cff63b9dfeeb7165df
Author: Cockpit Project <cockpituous(a)gmail.com>
Date: Wed Jul 25 15:03:30 2018 +0000
Update to 173-1
- Storage: Offer installation of VDO
- Machines: Add disks to a virtual machine
diff --git a/.gitignore b/.gitignore
index d1656db..f826d91 100644
--- a/.gitignore
+++ b/.gitignore
@@ -133,3 +133,4 @@
/cockpit-170.tar.xz
/cockpit-171.tar.xz
/cockpit-172.tar.xz
+/cockpit-173.tar.xz
diff --git a/cockpit.spec b/cockpit.spec
index cfcfec9..cedb22e 100644
--- a/cockpit.spec
+++ b/cockpit.spec
@@ -1,5 +1,5 @@
# This spec file has been automatically updated
-Version: 172
+Version: 173
Release: 1%{?dist}
#
# This file is maintained at the following location:
@@ -59,6 +59,10 @@ Release: 1%{?dist}
%global go_scl_prefix %{nil}
%endif
+%if 0%{?rhel} >= 7 || 0%{?centos}
+%define vdo_on_demand 1
+%endif
+
Name: cockpit
Summary: A user interface for Linux servers
@@ -71,6 +75,7 @@ Source0: cockpit-%{version}.tar.gz
Source0:
https://github.com/cockpit-project/cockpit/releases/download/%{version}/c...
%endif
+BuildRequires: gcc
BuildRequires: pkgconfig(gio-unix-2.0)
BuildRequires: pkgconfig(json-glib-1.0)
BuildRequires: pkgconfig(polkit-agent-1) >= 0.105
@@ -107,28 +112,27 @@ BuildRequires: xmlto
# This is the "cockpit" metapackage. It should only
# Require, Suggest or Recommend other cockpit-xxx subpackages
-Requires: cockpit-bridge = %{version}-%{release}
-Requires: cockpit-ws = %{version}-%{release}
-Requires: cockpit-system = %{version}-%{release}
+Requires: cockpit-bridge
+Requires: cockpit-ws
+Requires: cockpit-system
# Optional components (for f24 we use soft deps)
%if 0%{?fedora} >= 24 || 0%{?rhel} >= 8
%if 0%{?rhel} == 0
-Recommends: cockpit-dashboard = %{version}-%{release}
+Recommends: cockpit-dashboard
+%ifarch x86_64 %{arm} aarch64 ppc64le i686 s390x
+Recommends: (cockpit-docker if /usr/bin/docker)
%endif
-Recommends: (cockpit-networkmanager = %{version}-%{release} if NetworkManager)
-Recommends: (cockpit-storaged = %{version}-%{release} if udisks2)
-Recommends: (cockpit-packagekit = %{version}-%{release} if PackageKit)
+%endif
+Recommends: (cockpit-networkmanager if NetworkManager)
+Recommends: (cockpit-storaged if udisks2)
+Recommends: cockpit-packagekit
%if 0%{?rhel} >= 8
Recommends: subscription-manager-cockpit
%endif
-%ifarch x86_64 %{arm} aarch64 ppc64le i686 s390x
-Recommends: (cockpit-docker = %{version}-%{release} if /usr/bin/docker)
-%endif
-Suggests: cockpit-pcp = %{version}-%{release}
-Suggests: cockpit-kubernetes = %{version}-%{release}
-Suggests: cockpit-selinux = %{version}-%{release}
-Suggests: cockpit-packagekit = %{version}-%{release}
+Suggests: cockpit-pcp
+Suggests: cockpit-kubernetes
+Suggests: cockpit-selinux
%endif
%prep
@@ -156,7 +160,8 @@ exec 2>&1
--with-selinux-config-type=etc_t \
%{?rhel:--without-storaged-iscsi-sessions} \
--with-appstream-data-packages='[ "appstream-data" ]' \
- --with-nfs-client-package='"nfs-utils"'
+ --with-nfs-client-package='"nfs-utils"' \
+ %{?vdo_on_demand:--with-vdo-package='"vdo"'}
make -j4 %{?extra_flags} all
%check
@@ -258,12 +263,17 @@ find %{buildroot}%{_datadir}/cockpit/selinux -type f >>
selinux.list
%endif
%ifarch x86_64 %{arm} aarch64 ppc64le i686 s390x
+%if 0%{?fedora} || 0%{?rhel} < 8
echo '%dir %{_datadir}/cockpit/docker' > docker.list
find %{buildroot}%{_datadir}/cockpit/docker -type f >> docker.list
%else
rm -rf %{buildroot}/%{_datadir}/cockpit/docker
touch docker.list
%endif
+%else
+rm -rf %{buildroot}/%{_datadir}/cockpit/docker
+touch docker.list
+%endif
%ifarch aarch64 x86_64 ppc64le s390x
%if %{defined wip}
@@ -325,8 +335,13 @@ rm -rf %{buildroot}/usr/src/debug
# On RHEL kdump, networkmanager, selinux, and sosreport are part of the system package
%if 0%{?rhel}
cat kdump.list sosreport.list networkmanager.list selinux.list >> system.list
-rm -f %{buildroot}/usr/share/metainfo/org.cockpit-project.cockpit-sosreport.metainfo.xml
-rm -f %{buildroot}/usr/share/pixmaps/cockpit-sosreport.png
+rm -f
%{buildroot}%{_datadir}/metainfo/org.cockpit-project.cockpit-sosreport.metainfo.xml
+rm -f %{buildroot}%{_datadir}/metainfo/org.cockpit-project.cockpit-kdump.metainfo.xml
+rm -f %{buildroot}%{_datadir}/pixmaps/cockpit-sosreport.png
+%endif
+
+%if 0%{?rhel}%{?centos}
+rm -f %{buildroot}%{_datadir}/metainfo/org.cockpit-project.cockpit-selinux.metainfo.xml
%endif
%if 0%{?build_basic}
@@ -516,6 +531,7 @@ BuildArch: noarch
The Cockpit component for configuring kernel crash dumping.
%files kdump -f kdump.list
+%{_datadir}/metainfo/org.cockpit-project.cockpit-kdump.metainfo.xml
%package sosreport
Summary: Cockpit user interface for diagnostic reports
@@ -529,8 +545,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
+%{_datadir}/metainfo/org.cockpit-project.cockpit-sosreport.metainfo.xml
+%{_datadir}/pixmaps/cockpit-sosreport.png
%package networkmanager
Summary: Cockpit user interface for networking, using NetworkManager
@@ -557,7 +573,7 @@ Summary: Cockpit SELinux package
Requires: cockpit-bridge >= 122
Requires: cockpit-shell >= 122
%if 0%{?fedora} >= 24 || 0%{?rhel} >= 8
-Recommends: setroubleshoot-server >= 3.3.3
+Requires: setroubleshoot-server >= 3.3.3
%endif
BuildArch: noarch
@@ -566,6 +582,7 @@ This package contains the Cockpit user interface integration with the
utility setroubleshoot to diagnose and resolve SELinux issues.
%files selinux -f selinux.list
+%{_datadir}/metainfo/org.cockpit-project.cockpit-selinux.metainfo.xml
%endif
@@ -584,7 +601,7 @@ Dummy package from building optional packages only; never install or
publish me.
# storaged on Fedora < 27, udisks on newer ones
# Recommends: not supported in RHEL <= 7
-%package storaged
+%package -n cockpit-storaged
Summary: Cockpit user interface for storage, using udisks
Requires: cockpit-shell >= 122
%if 0%{?rhel} == 7 || 0%{?centos} == 7
@@ -615,10 +632,10 @@ Requires: python-dbus
%endif
BuildArch: noarch
-%description storaged
+%description -n cockpit-storaged
The Cockpit component for managing storage. This package uses udisks.
-%files storaged -f storaged.list
+%files -n cockpit-storaged -f storaged.list
%package -n cockpit-tests
@@ -733,13 +750,14 @@ bastion hosts, and a basic dashboard.
%ifarch x86_64 %{arm} aarch64 ppc64le i686 s390x
+%if 0%{?fedora} || 0%{?rhel} < 8
%package -n cockpit-docker
Summary: Cockpit user interface for Docker containers
Requires: cockpit-bridge >= 122
Requires: cockpit-shell >= 122
Requires: /usr/bin/docker
Requires: /usr/lib/systemd/system/docker.service
-%if 0%{?fedora} || 0%{?rhel} >= 8
+%if 0%{?fedora}
Requires: python3
%else
Requires: python2
@@ -752,6 +770,7 @@ This package is not yet complete.
%files -n cockpit-docker -f docker.list
%endif
+%endif
%ifarch aarch64 x86_64 ppc64le s390x
@@ -795,6 +814,11 @@ via PackageKit.
# The changelog is automatically generated and merged
%changelog
+* Wed Jul 25 2018 Martin Pitt <martin(a)piware.de> - 173-1
+
+- Storage: Offer installation of VDO
+- Machines: Add disks to a virtual machine
+
* Wed Jul 11 2018 Martin Pitt <martin(a)piware.de> - 172-1
- System: Offer installation of PCP
diff --git a/sources b/sources
index 38704f4..f4f8565 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (cockpit-172.tar.xz) =
8ca3f4df56fac6835c838f317cc8d614639463831aac9787872814ea6ea17f685bc8992022d29b5ad33bfcc00cf4e0d4e4a09e754f4c674be1f0caf1942a062d
+SHA512 (cockpit-173.tar.xz) =
07e59f187d7431f6e3e232d07593cca7d061745394b946927ce819e2de77dc70ed0cf78887ce06920a36d3c1b8650c950049028c913f22464921d6650d01a3e5