forked from cockpit/cockpit
Accepting request 839141 from home:lnussel:branches:systemsmanagement:cockpit
- new version 228 https://cockpit-project.org/blog/cockpit-228.html https://cockpit-project.org/blog/cockpit-227.html https://cockpit-project.org/blog/cockpit-226.html - enable cockpit-machines to manage libvirt OBS-URL: https://build.opensuse.org/request/show/839141 OBS-URL: https://build.opensuse.org/package/show/systemsmanagement:cockpit/cockpit?expand=0&rev=48
This commit is contained in:
Git OBS Bridge
parent
36b2d27f58
commit
1ea140fcbc
BIN
cockpit-225.tar.xz
(Stored with Git LFS)
BIN
cockpit-225.tar.xz
(Stored with Git LFS)
Binary file not shown.
BIN
cockpit-228.tar.xz
(Stored with Git LFS)
Normal file
BIN
cockpit-228.tar.xz
(Stored with Git LFS)
Normal file
Binary file not shown.
@ -1,3 +1,12 @@
|
||||
-------------------------------------------------------------------
|
||||
Thu Oct 1 11:32:48 UTC 2020 - Ludwig Nussel <lnussel@suse.de>
|
||||
|
||||
- new version 228
|
||||
https://cockpit-project.org/blog/cockpit-228.html
|
||||
https://cockpit-project.org/blog/cockpit-227.html
|
||||
https://cockpit-project.org/blog/cockpit-226.html
|
||||
- enable cockpit-machines to manage libvirt
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Thu Sep 10 12:49:00 UTC 2020 - Ludwig Nussel <lnussel@suse.de>
|
||||
|
||||
|
||||
86
cockpit.spec
86
cockpit.spec
@ -38,24 +38,11 @@
|
||||
%define rhel %{centos}
|
||||
%endif
|
||||
|
||||
%if "%{!?__python3:1}"
|
||||
%define __python3 /usr/bin/python3
|
||||
%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}"
|
||||
%define os_version_id %(. /etc/os-release; echo $VERSION_ID)
|
||||
%endif
|
||||
|
||||
%define _hardened_build 1
|
||||
|
||||
# define to build the dashboard
|
||||
%define build_dashboard 1
|
||||
|
||||
# build basic packages like cockpit-bridge
|
||||
%define build_basic 1
|
||||
# build optional extensions like cockpit-docker
|
||||
# build optional extensions like cockpit-machines
|
||||
%define build_optional 1
|
||||
|
||||
%define __lib lib
|
||||
@ -76,7 +63,7 @@ Summary: Web Console for Linux servers
|
||||
License: LGPL-2.1-or-later
|
||||
URL: https://cockpit-project.org/
|
||||
|
||||
Version: 225
|
||||
Version: 228
|
||||
%if %{defined wip}
|
||||
Release: 1.%{wip}%{?dist}
|
||||
Source0: cockpit-%{version}.tar.xz
|
||||
@ -98,7 +85,7 @@ BuildRequires: autoconf automake
|
||||
BuildRequires: make
|
||||
BuildRequires: /usr/bin/python3
|
||||
BuildRequires: gettext >= 0.19.7
|
||||
%if %{defined build_dashboard}
|
||||
%if 0%{?build_optional}
|
||||
BuildRequires: libssh-devel >= 0.8.5
|
||||
%endif
|
||||
BuildRequires: openssl-devel
|
||||
@ -109,7 +96,7 @@ BuildRequires: libxslt-devel
|
||||
BuildRequires: glib-networking
|
||||
BuildRequires: sed
|
||||
|
||||
BuildRequires: glib2-devel >= 2.37.4
|
||||
BuildRequires: glib2-devel >= 2.50.0
|
||||
# this is for runtimedir in the tls proxy ace21c8879
|
||||
BuildRequires: pkgconfig(libsystemd) >= 235
|
||||
%if 0%{?suse_version}
|
||||
@ -144,13 +131,6 @@ Recommends: (cockpit-storaged if udisks2)
|
||||
Recommends: cockpit-packagekit
|
||||
Suggests: cockpit-pcp
|
||||
|
||||
%ifarch x86_64 %{arm} aarch64 ppc64le i686 s390x
|
||||
%if (0%{?fedora} == 31 || 0%{?suse_version}) && 0%{?build_optional}
|
||||
%define build_docker 1
|
||||
Recommends: (cockpit-docker if /usr/bin/docker)
|
||||
%endif
|
||||
%endif
|
||||
|
||||
%if 0%{?rhel} == 0
|
||||
Recommends: (cockpit-networkmanager if NetworkManager)
|
||||
Suggests: cockpit-selinux
|
||||
@ -202,10 +182,13 @@ make install-tests DESTDIR=%{buildroot}
|
||||
mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/pam.d
|
||||
install -p -m 644 tools/cockpit.pam $RPM_BUILD_ROOT%{_sysconfdir}/pam.d/cockpit
|
||||
rm -f %{buildroot}/%{_libdir}/cockpit/*.so
|
||||
# shipped in firewalld since 0.6, everywhere in Fedora/RHEL 8
|
||||
rm -f %{buildroot}/%{_prefix}/%{__lib}/firewalld/services/cockpit.xml
|
||||
install -D -p -m 644 AUTHORS COPYING README.md %{buildroot}%{_docdir}/cockpit/
|
||||
|
||||
# only ship deprecated PatternFly API for stable releases
|
||||
%if 0%{?fedora} > 33 || 0%{?rhel} > 8
|
||||
rm %{buildroot}/%{_datadir}/cockpit/base1/patternfly.css
|
||||
%endif
|
||||
|
||||
# Build the package lists for resource packages
|
||||
echo '%dir %{_datadir}/cockpit/base1' > base.list
|
||||
echo '%dir %{_datadir}/cockpit/base1/fonts' >> base.list
|
||||
@ -216,13 +199,8 @@ echo '%dir %{_datadir}/cockpit/ssh' >> base.list
|
||||
find %{buildroot}%{_datadir}/cockpit/ssh -type f >> base.list
|
||||
echo '%{_libexecdir}/cockpit-ssh' >> base.list
|
||||
|
||||
%if %{defined build_dashboard}
|
||||
echo '%dir %{_datadir}/cockpit/dashboard' >> dashboard.list
|
||||
find %{buildroot}%{_datadir}/cockpit/dashboard -type f >> dashboard.list
|
||||
%else
|
||||
rm -rf %{buildroot}/%{_datadir}/cockpit/dashboard
|
||||
touch dashboard.list
|
||||
%endif
|
||||
|
||||
echo '%dir %{_datadir}/cockpit/pcp' >> pcp.list
|
||||
find %{buildroot}%{_datadir}/cockpit/pcp -type f >> pcp.list
|
||||
@ -266,15 +244,6 @@ find %{buildroot}%{_datadir}/cockpit/selinux -type f >> selinux.list
|
||||
echo '%dir %{_datadir}/cockpit/playground' > tests.list
|
||||
find %{buildroot}%{_datadir}/cockpit/playground -type f >> tests.list
|
||||
|
||||
%if 0%{?build_docker}
|
||||
echo '%dir %{_datadir}/cockpit/docker' > docker.list
|
||||
find %{buildroot}%{_datadir}/cockpit/docker -type f >> docker.list
|
||||
%else
|
||||
rm -rf %{buildroot}/%{_datadir}/cockpit/docker
|
||||
rm -f %{buildroot}/%{_prefix}/share/metainfo/org.cockpit-project.cockpit-docker.metainfo.xml
|
||||
touch docker.list
|
||||
%endif
|
||||
|
||||
# when not building basic packages, remove their files
|
||||
%if 0%{?build_basic} == 0
|
||||
for pkg in base1 branding motd kdump networkmanager selinux shell sosreport ssh static systemd tuned users; do
|
||||
@ -298,7 +267,7 @@ rm -f %{buildroot}%{_datadir}/metainfo/cockpit.appdata.xml
|
||||
|
||||
# when not building optional packages, remove their files
|
||||
%if 0%{?build_optional} == 0
|
||||
for pkg in apps dashboard docker machines packagekit pcp playground storaged; do
|
||||
for pkg in apps dashboard machines packagekit pcp playground storaged; do
|
||||
rm -rf %{buildroot}/%{_datadir}/cockpit/$pkg
|
||||
done
|
||||
# files from -tests
|
||||
@ -309,8 +278,6 @@ rm -r %{buildroot}/%{_libexecdir}/cockpit-pcp %{buildroot}/%{_localstatedir}/lib
|
||||
rm -f %{buildroot}/%{_prefix}/share/metainfo/org.cockpit-project.cockpit-machines.metainfo.xml
|
||||
# files from -storaged
|
||||
rm -f %{buildroot}/%{_prefix}/share/metainfo/org.cockpit-project.cockpit-storaged.metainfo.xml
|
||||
# files from -docker
|
||||
rm -f %{buildroot}/%{_prefix}/share/metainfo/org.cockpit-project.cockpit-docker.metainfo.xml
|
||||
%endif
|
||||
|
||||
sed -i "s|%{buildroot}||" *.list
|
||||
@ -325,8 +292,8 @@ popd
|
||||
# need this in SUSE as post build checks dislike stale symlinks
|
||||
install -m 644 -D /dev/null %{buildroot}/run/cockpit/motd
|
||||
# remove files of not installable packages
|
||||
rm -r %{buildroot}%{_datadir}/cockpit/{machines,sosreport,selinux}
|
||||
rm -f %{buildroot}/%{_prefix}/share/metainfo/org.cockpit-project.cockpit-{machines,selinux,sosreport}.metainfo.xml
|
||||
rm -r %{buildroot}%{_datadir}/cockpit/{sosreport,selinux}
|
||||
rm -f %{buildroot}/%{_prefix}/share/metainfo/org.cockpit-project.cockpit-{selinux,sosreport}.metainfo.xml
|
||||
rm -f %{buildroot}%{_datadir}/pixmaps/cockpit-sosreport.png
|
||||
%else
|
||||
%global _debugsource_packages 1
|
||||
@ -468,7 +435,7 @@ This package contains the Cockpit shell and system configuration interfaces.
|
||||
Summary: Cockpit Web Service
|
||||
Requires: glib-networking
|
||||
Requires: openssl
|
||||
Requires: glib2 >= 2.37.4
|
||||
Requires: glib2 >= 2.50.0
|
||||
Conflicts: firewalld < 0.6.0-1
|
||||
Recommends: sscg >= 2.3
|
||||
Recommends: system-logos
|
||||
@ -675,7 +642,6 @@ These files are not required for running Cockpit.
|
||||
%files -n cockpit-tests -f tests.list
|
||||
%{_prefix}/%{__lib}/cockpit-test-assets
|
||||
|
||||
%if !0%{?suse_version}
|
||||
%package -n cockpit-machines
|
||||
BuildArch: noarch
|
||||
Summary: Cockpit user interface for virtual machines
|
||||
@ -700,7 +666,6 @@ If "virt-install" is installed, you can also create new virtual machines.
|
||||
|
||||
%files -n cockpit-machines -f machines.list
|
||||
%{_datadir}/metainfo/org.cockpit-project.cockpit-machines.metainfo.xml
|
||||
%endif
|
||||
|
||||
%package -n cockpit-pcp
|
||||
Summary: Cockpit PCP integration
|
||||
@ -715,12 +680,8 @@ Cockpit support for reading PCP metrics and loading PCP archives.
|
||||
%{_localstatedir}/lib/pcp/config/pmlogconf/tools/cockpit
|
||||
|
||||
%post -n cockpit-pcp
|
||||
# HACK - https://bugzilla.redhat.com/show_bug.cgi?id=1185764
|
||||
# We can't use "systemctl reload-or-try-restart" since systemctl might
|
||||
# be out of sync with reality.
|
||||
/usr/share/pcp/lib/pmlogger condrestart
|
||||
systemctl reload-or-try-restart pmlogger
|
||||
|
||||
%if %{defined build_dashboard}
|
||||
%package -n cockpit-dashboard
|
||||
Summary: Cockpit remote server dashboard
|
||||
BuildArch: noarch
|
||||
@ -732,25 +693,6 @@ Cockpit page for showing performance graphs for up to 20 remote servers.
|
||||
|
||||
%files -n cockpit-dashboard -f dashboard.list
|
||||
|
||||
%endif
|
||||
|
||||
%if 0%{?build_docker}
|
||||
%package -n cockpit-docker
|
||||
Summary: Cockpit user interface for Docker containers
|
||||
Requires: cockpit-bridge >= 122
|
||||
Requires: cockpit-shell >= 122
|
||||
Requires: (docker or moby-engine or docker-ce)
|
||||
Requires: %{__python3}
|
||||
|
||||
%description -n cockpit-docker
|
||||
The Cockpit components for interacting with Docker and user interface.
|
||||
This package is not yet complete.
|
||||
|
||||
%files -n cockpit-docker -f docker.list
|
||||
%dir %{_datadir}/cockpit/docker/images
|
||||
%{_datadir}/metainfo/org.cockpit-project.cockpit-docker.metainfo.xml
|
||||
%endif
|
||||
|
||||
%package -n cockpit-packagekit
|
||||
Summary: Cockpit user interface for packages
|
||||
BuildArch: noarch
|
||||
|
||||
Loading…
Reference in New Issue
Block a user