Update to 229-1
- shell: Any page can be the shell
This commit is contained in:
parent
3637c554cd
commit
d72d827068
1
.gitignore
vendored
1
.gitignore
vendored
@ -188,3 +188,4 @@
|
||||
/cockpit-226.tar.xz
|
||||
/cockpit-227.tar.xz
|
||||
/cockpit-228.tar.xz
|
||||
/cockpit-229.tar.xz
|
||||
|
40
cockpit.spec
40
cockpit.spec
@ -1,5 +1,5 @@
|
||||
# This spec file has been automatically updated
|
||||
Version: 228
|
||||
Version: 229
|
||||
Release: 1%{?dist}
|
||||
#
|
||||
# Copyright (C) 2014-2020 Red Hat, Inc.
|
||||
@ -42,11 +42,6 @@ Release: 1%{?dist}
|
||||
|
||||
%define _hardened_build 1
|
||||
|
||||
# build basic packages like cockpit-bridge
|
||||
%define build_basic 1
|
||||
# build optional extensions like cockpit-machines
|
||||
%define build_optional 1
|
||||
|
||||
%define __lib lib
|
||||
|
||||
%if 0%{?rhel}
|
||||
@ -71,6 +66,23 @@ Source0: cockpit-%{version}.tar.gz
|
||||
Source0: https://github.com/cockpit-project/cockpit/releases/download/%{version}/cockpit-%{version}.tar.xz
|
||||
%endif
|
||||
|
||||
# in RHEL the source package is duplicated: cockpit (building basic packages like cockpit-{bridge,system})
|
||||
# and cockpit-appstream (building optional packages like cockpit-{machines,pcp})
|
||||
%if 0%{?rhel}
|
||||
|
||||
%if "%{name}" == "cockpit"
|
||||
%define build_basic 1
|
||||
%define build_optional 0
|
||||
%else
|
||||
%define build_basic 0
|
||||
%define build_optional 1
|
||||
%endif
|
||||
|
||||
%else
|
||||
%define build_basic 1
|
||||
%define build_optional 1
|
||||
%endif
|
||||
|
||||
BuildRequires: gcc
|
||||
BuildRequires: pkgconfig(gio-unix-2.0)
|
||||
BuildRequires: pkgconfig(json-glib-1.0)
|
||||
@ -81,7 +93,7 @@ BuildRequires: autoconf automake
|
||||
BuildRequires: make
|
||||
BuildRequires: /usr/bin/python3
|
||||
BuildRequires: gettext >= 0.19.7
|
||||
%if 0%{?build_optional}
|
||||
%if 0%{?build_basic}
|
||||
BuildRequires: libssh-devel >= 0.8.5
|
||||
%endif
|
||||
BuildRequires: openssl-devel
|
||||
@ -151,6 +163,9 @@ exec 2>&1
|
||||
--docdir=%_defaultdocdir/%{name} \
|
||||
%endif
|
||||
--with-pamdir='%{pamdir}' \
|
||||
%if 0%{?build_basic} == 0
|
||||
--disable-ssh \
|
||||
%endif
|
||||
%{?vdo_on_demand:--with-vdo-package='"vdo"'}
|
||||
make -j4 %{?extra_flags} all
|
||||
|
||||
@ -242,12 +257,13 @@ find %{buildroot}%{_datadir}/cockpit/playground -type f >> tests.list
|
||||
%if 0%{?build_basic} == 0
|
||||
for pkg in base1 branding motd kdump networkmanager selinux shell sosreport ssh static systemd tuned users; do
|
||||
rm -r %{buildroot}/%{_datadir}/cockpit/$pkg
|
||||
rm -rf %{buildroot}/usr/src/debug/%{_datadir}/cockpit/$pkg
|
||||
rm -f %{buildroot}/%{_datadir}/metainfo/org.cockpit-project.cockpit-${pkg}.metainfo.xml
|
||||
done
|
||||
for data in doc locale man pixmaps polkit-1; do
|
||||
rm -r %{buildroot}/%{_datadir}/$data
|
||||
done
|
||||
for lib in systemd tmpfiles.d firewalld; do
|
||||
for lib in systemd tmpfiles.d; do
|
||||
rm -r %{buildroot}/%{_prefix}/%{__lib}/$lib
|
||||
done
|
||||
for libexec in cockpit-askpass cockpit-session cockpit-ws cockpit-tls cockpit-wsinstance-factory cockpit-desktop; do
|
||||
@ -262,7 +278,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 machines packagekit pcp playground storaged; do
|
||||
rm -rf %{buildroot}/%{_datadir}/cockpit/$pkg
|
||||
rm -rf %{buildroot}/%{_datadir}/cockpit/$pkg %{buildroot}/usr/src/debug/%{_datadir}/cockpit/$pkg
|
||||
done
|
||||
# files from -tests
|
||||
rm -r %{buildroot}/%{_prefix}/%{__lib}/cockpit-test-assets
|
||||
@ -407,7 +423,7 @@ Recommends: (reportd >= 0.7.1 if abrt)
|
||||
%endif
|
||||
# NPM modules which are also available as packages
|
||||
Provides: bundled(js-jquery) = 3.5.1
|
||||
Provides: bundled(js-moment) = 2.27.0
|
||||
Provides: bundled(js-moment) = 2.28.0
|
||||
Provides: bundled(nodejs-flot) = 0.8.3
|
||||
Provides: bundled(xstatic-bootstrap-datepicker-common) = 1.9.0
|
||||
Provides: bundled(xstatic-patternfly-common) = 3.59.5
|
||||
@ -682,6 +698,10 @@ via PackageKit.
|
||||
|
||||
# The changelog is automatically generated and merged
|
||||
%changelog
|
||||
* Wed Sep 30 2020 Marius Vollmer <mvollmer@redhat.com> - 229-1
|
||||
|
||||
- shell: Any page can be the shell
|
||||
|
||||
* Wed Sep 16 2020 Katerina Koukiou <kkoukiou@redhat.com> - 228-1
|
||||
|
||||
- Accounts: Allow setting weak passwords
|
||||
|
2
sources
2
sources
@ -1 +1 @@
|
||||
SHA512 (cockpit-228.tar.xz) = 8eee63b51415a431b1950a3c25667ad6859e008aa9e26ee0a7901394c0801c56940ee9260f0ec385666a464dc213ad94c411d663d3d47eb7ca60e6d04920f770
|
||||
SHA512 (cockpit-229.tar.xz) = 7e363e45646a5490534247f86a19124c0a1a729e9db450688181f53d6bff813b338021064c6f0365f47295d8163402b68ea068801102f4b10fbafa826423416e
|
||||
|
Loading…
Reference in New Issue
Block a user