SHA256
1
0
forked from cockpit/cockpit

Accepting request 875154 from systemsmanagement:cockpit

- new version 238.1
  https://cockpit-project.org/blog/cockpit-238.html
  https://cockpit-project.org/blog/cockpit-237.html
- No longer recompress tarball at buildtime

- Rebuild from git leveraging local-npm-registry (needs
  cockpit-redhatfont.diff)

- new version 236
  https://cockpit-project.org/blog/cockpit-236.html

OBS-URL: https://build.opensuse.org/request/show/875154
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/cockpit?expand=0&rev=12
This commit is contained in:
Richard Brown 2021-03-02 11:26:08 +00:00 committed by Git OBS Bridge
commit f1fdc525c3
11 changed files with 42372 additions and 191 deletions

23
_service Normal file
View File

@ -0,0 +1,23 @@
<services>
<service name="obs_scm" mode="manual">
<param name="versionformat">@PARENT_TAG@</param>
<param name="url">http://github.com/cockpit-project/cockpit.git</param>
<param name="scm">git</param>
<param name="revision">238.1</param>
</service>
<service name="node_modules" mode="manual">
<param name="cpio">node_modules.obscpio</param>
<param name="output">node_modules.spec.inc</param>
<param name="source-offset">1000</param>
</service>
<service mode="buildtime" name="tar">
<param name="obsinfo">cockpit.obsinfo</param>
</service>
<service mode="buildtime" name="recompress">
<param name="file">*.tar</param>
<param name="compression">gz</param>
</service>
<service mode="buildtime" name="set_version">
<param name="basename">cockpit</param>
</service>
</services>

4
_servicedata Normal file
View File

@ -0,0 +1,4 @@
<servicedata>
<service name="tar_scm">
<param name="url">http://github.com/cockpit-project/cockpit.git</param>
<param name="changesrevision">046b3d4b381cd60f9d44756fc51f15ed7e17d0b5</param></service></servicedata>

BIN
cockpit-235.tar.xz (Stored with Git LFS)

Binary file not shown.

BIN
cockpit-238.1.obscpio (Stored with Git LFS) Normal file

Binary file not shown.

13
cockpit-redhatfont.diff Normal file
View File

@ -0,0 +1,13 @@
Index: cockpit-238.1/package.json
===================================================================
--- cockpit-238.1.orig/package.json
+++ cockpit-238.1/package.json
@@ -8,7 +8,7 @@
"@patternfly/react-core": "4.97.2",
"@patternfly/react-styles": "4.8.2",
"@patternfly/react-table": "4.23.2",
- "@redhat/redhat-font": "git+https://github.com/RedHatOfficial/RedHatFont.git#2.2.0",
+ "@redhat/redhat-font": "2.2.0",
"bootstrap": "3.4.1",
"bootstrap-datepicker": "1.9.0",
"deep-equal": "2.0.5",

View File

@ -1,3 +1,23 @@
-------------------------------------------------------------------
Wed Feb 24 17:03:41 UTC 2021 - Adam Majer <adam.majer@suse.de>
- new version 238.1
https://cockpit-project.org/blog/cockpit-238.html
https://cockpit-project.org/blog/cockpit-237.html
- No longer recompress tarball at buildtime
-------------------------------------------------------------------
Thu Feb 4 16:18:13 UTC 2021 - Ludwig Nussel <lnussel@suse.de>
- Rebuild from git leveraging local-npm-registry (needs
cockpit-redhatfont.diff)
-------------------------------------------------------------------
Fri Jan 22 15:38:53 UTC 2021 - Ludwig Nussel <lnussel@suse.de>
- new version 236
https://cockpit-project.org/blog/cockpit-236.html
-------------------------------------------------------------------
Fri Jan 22 08:53:25 UTC 2021 - Ludwig Nussel <lnussel@suse.de>

5
cockpit.obsinfo Normal file
View File

@ -0,0 +1,5 @@
name: cockpit
version: 238.1
mtime: 1613933302
commit: 58540c0666c61ef7e02c32ff8285caab35eb0754

View File

@ -1,21 +1,33 @@
#
# spec file for package cockpit
#
# Copyright (c) 2021 SUSE LLC
# Copyright (C) 2014-2020 Red Hat, Inc.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
# upon. The license for this file, and modifications and additions to the
# file, is the same license as for the pristine package itself (unless the
# license for the pristine package is not an Open Source License, in which
# case the license is the MIT License). An "Open Source License" is a
# license that conforms to the Open Source Definition (Version 1.9)
# published by the Open Source Initiative.
# Please submit bugfixes or comments via https://bugs.opensuse.org/
# Cockpit is free software; you can redistribute it and/or modify it
# under the terms of the GNU Lesser General Public License as published by
# the Free Software Foundation; either version 2.1 of the License, or
# (at your option) any later version.
#
# Cockpit is distributed in the hope that it will be useful, but
# WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
# Lesser General Public License for more details.
#
# You should have received a copy of the GNU Lesser General Public License
# along with Cockpit; If not, see <http://www.gnu.org/licenses/>.
#
#
# This file is maintained at the following location:
# https://github.com/cockpit-project/cockpit/blob/master/tools/cockpit.spec
#
# If you are editing this file in another location, changes will likely
# be clobbered the next time an automated release is done.
#
# Check first cockpit-devel@lists.fedorahosted.org
#
# Globals that may be defined elsewhere
# * Version 122
# * wip 1
#
# earliest base that the subpackages work on; the instances of this get computed/updated
# by tools/gen-spec-dependencies during "make dist", but keep a hardcoded fallback
@ -42,25 +54,26 @@
Name: cockpit
Summary: Web Console for Linux servers
License: LGPL-2.1-or-later
License: LGPL-2.1-or-later
URL: https://cockpit-project.org/
Version: 235
Version: 238.1
Release: 0
%if %{defined wip}
Source0: cockpit-%{version}.tar.xz
%else
Source0: https://github.com/cockpit-project/cockpit/releases/download/%{version}/cockpit-%{version}.tar.xz
%endif
Source0: cockpit-%{version}.tar.gz
Source1: cockpit.pam
Source2: cockpit-rpmlintrc
Source99: README.packaging
Source98: package-lock.json
Source97: node_modules.spec.inc
%include %{_sourcedir}/node_modules.spec.inc
Patch0: cockpit-redhatfont.diff
# in RHEL the source package is duplicated: cockpit (building basic packages like cockpit-{bridge,system})
# in RHEL 8 the source package is duplicated: cockpit (building basic packages like cockpit-{bridge,system})
# and cockpit-appstream (building optional packages like cockpit-{machines,pcp})
# This split does not apply to EPEL/COPR.
%if 0%{?rhel} && 0%{?epel} == 0
# In Fedora ELN/RHEL 9+ there is just one source package, which ships rpms in both BaseOS and AppStream
%if 0%{?rhel} == 8 && 0%{?epel} == 0
%if "%{name}" == "cockpit"
%define build_basic 1
@ -76,56 +89,60 @@ Source99: README.packaging
%endif
BuildRequires: gcc
BuildRequires: pam-devel
BuildRequires: pkgconfig(gio-unix-2.0)
BuildRequires: pkgconfig(json-glib-1.0)
BuildRequires: pkgconfig(polkit-agent-1) >= 0.105
BuildRequires: pam-devel
BuildRequires: /usr/bin/python3
BuildRequires: autoconf
BuildRequires: automake
BuildRequires: gettext >= 0.19.7
BuildRequires: autoconf automake
BuildRequires: make
BuildRequires: /usr/bin/python3
BuildRequires: gettext >= 0.19.7
%if 0%{?build_basic}
BuildRequires: libssh-devel >= 0.8.5
%endif
BuildRequires: glib-networking
BuildRequires: gnutls-devel >= 3.4.3
BuildRequires: libxslt-devel
BuildRequires: openssl-devel
BuildRequires: sed
BuildRequires: gnutls-devel >= 3.4.3
BuildRequires: zlib-devel
BuildRequires: pkgconfig(krb5) >= 1.11
BuildRequires: libxslt-devel
BuildRequires: glib-networking
BuildRequires: sed
BuildRequires: glib2-devel >= 2.50.0
# this is for runtimedir in the tls proxy ace21c8879
BuildRequires: pkgconfig(libsystemd) >= 235
%if 0%{?suse_version}
BuildRequires: distribution-logos
BuildRequires: distribution-release
BuildRequires: libpcp-devel
BuildRequires: pcp-devel
BuildRequires: libpcp3
BuildRequires: libpcp_import1
BuildRequires: openssh
BuildRequires: pcp-devel
BuildRequires: distribution-logos
BuildRequires: wallpaper-branding
%else
BuildRequires: docbook-style-xsl
BuildRequires: openssh-clients
BuildRequires: pcp-libs-devel
BuildRequires: openssh-clients
BuildRequires: docbook-style-xsl
%endif
BuildRequires: gdb
BuildRequires: krb5-server
BuildRequires: gdb
# For documentation
BuildRequires: xmlto
# for rebuilding nodejs bits
BuildRequires: npm
BuildRequires: sassc
BuildRequires: local-npm-registry
# This is the "cockpit" metapackage. It should only
# Require, Suggest or Recommend other cockpit-xxx subpackages
Requires: cockpit-bridge
Requires: cockpit-system
Requires: cockpit-ws
Requires: cockpit-system
# Optional components
Recommends: (cockpit-storaged if udisks2)
@ -144,9 +161,18 @@ Recommends: subscription-manager-cockpit
%setup -q -n cockpit-%{version}
%autopatch -p1
cp %SOURCE1 tools/cockpit.pam
#
local-npm-registry %{_sourcedir} install --also=dev
%build
find node_modules -name \*.node -print -delete
touch node_modules/.stamp
exec 2>&1
PKG_NAME="Cockpit"
echo %version > .tarball
autoreconf -fvi -I tools
#
%configure \
--disable-silent-rules \
--with-cockpit-user=cockpit-ws \
@ -165,7 +191,6 @@ exec 2>&1
make -j4 %{?extra_flags} all
%check
exec 2>&1
# HACK: Fedora koji builders are very slow, unreliable, and inaccessible for debugging; https://github.com/cockpit-project/cockpit/issues/13909
%if 0%{?fedora} >= 0
%ifarch s390x
@ -178,10 +203,11 @@ exec 2>&1
%define testsuite_skip #
%endif
%endif
%{?testsuite_skip} make -j4 check %{?testsuite_fail}
%{?testsuite_skip} make -j4 check || { ls -l /dev/std* ; [ -e ./test-suite.log ] && cat ./test-suite.log ; false; } %{?testsuite_fail}
%install
%make_install
# In obs we get write error: stdout
%make_install | tee make_install.log
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
@ -255,7 +281,6 @@ find %{buildroot}%{_datadir}/cockpit/static -type f >> static.list
%if 0%{?build_basic} == 0
for pkg in base1 branding motd kdump networkmanager selinux shell sosreport ssh static systemd tuned users metrics; 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
@ -276,7 +301,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 machines packagekit pcp playground storaged; do
rm -rf %{buildroot}/%{_datadir}/cockpit/$pkg %{buildroot}/usr/src/debug/%{_datadir}/cockpit/$pkg
rm -rf %{buildroot}/%{_datadir}/cockpit/$pkg
done
# files from -tests
rm -r %{buildroot}/%{_prefix}/%{__lib}/cockpit-test-assets
@ -308,18 +333,6 @@ rm -f %{buildroot}%{_datadir}/pixmaps/cockpit-sosreport.png
%define find_debug_info %{_rpmconfigdir}/find-debuginfo.sh %{?_missing_build_ids_terminate_build:--strict-build-id} %{?_include_minidebuginfo:-m} %{?_find_debuginfo_dwz_opts} %{?_find_debuginfo_opts} %{?_debugsource_packages:-S debugsourcefiles.list} "%{_builddir}/%{?buildsubdir}"
# Redefine how debug info is built to slip in our extra debug files
%define __debug_install_post \
%{find_debug_info} \
cat debug.partial >> %{_builddir}/%{?buildsubdir}/debugfiles.list \
%{nil}
# Build the package lists for debug package, and move debug files to installed locations
find %{buildroot}/usr/src/debug%{_datadir}/cockpit -type f -o -type l > debug.partial
sed -i "s|%{buildroot}/usr/src/debug||" debug.partial
sed -n 's/\.map\(\.gz\)\?$/\0/p' *.list >> debug.partial
sed -i '/\.map\(\.gz\)\?$/d' *.list
tar -C %{buildroot}/usr/src/debug -cf - . | tar -C %{buildroot} -xf -
%endif
# /suse_version
rm -rf %{buildroot}/usr/src/debug
@ -333,6 +346,9 @@ rm -f %{buildroot}%{_datadir}/metainfo/org.cockpit-project.cockpit-selinux.metai
rm -f %{buildroot}%{_datadir}/pixmaps/cockpit-sosreport.png
%endif
mkdir -p %{buildroot}%{_datadir}/cockpit/devel/lib
cp -a pkg/lib/* %{buildroot}%{_datadir}/cockpit/devel/lib
%if 0%{?build_basic}
%find_lang cockpit
%endif
@ -358,6 +374,7 @@ troubleshooting, interactive command-line sessions, and more.
%{_datadir}/pixmaps/cockpit.png
%doc %{_mandir}/man1/cockpit.1.gz
%package bridge
Summary: Cockpit bridge server-side component
Requires: glib-networking
@ -403,13 +420,14 @@ Requires: cockpit-bridge >= %{version}-%{release}
%if !0%{?suse_version}
Requires: shadow-utils
%endif
Requires: /usr/bin/date
Requires: /usr/bin/pwscore
Requires: grep
Requires: /usr/bin/pwscore
Requires: /usr/bin/date
Provides: cockpit-shell = %{version}-%{release}
Provides: cockpit-systemd = %{version}-%{release}
Provides: cockpit-tuned = %{version}-%{release}
Provides: cockpit-users = %{version}-%{release}
Obsoletes: cockpit-dashboard
%if 0%{?rhel}
Provides: cockpit-networkmanager = %{version}-%{release}
Obsoletes: cockpit-networkmanager
@ -423,7 +441,6 @@ Recommends: setroubleshoot-server >= 3.3.3
Provides: cockpit-selinux = %{version}-%{release}
Provides: cockpit-sosreport = %{version}-%{release}
Requires: sos
Obsoletes: cockpit-dashboard
%endif
%if 0%{?fedora} >= 29
# 0.7.0 (actually) supports task cancellation.
@ -433,7 +450,6 @@ Recommends: (reportd >= 0.7.1 if abrt)
# NPM modules which are also available as packages
Provides: bundled(js-jquery) = 3.5.1
Provides: bundled(js-moment) = 2.29.1
Provides: bundled(nodejs-flot) = 0.8.3
Provides: bundled(xstatic-bootstrap-datepicker-common) = 1.9.0
Provides: bundled(xstatic-patternfly-common) = 3.59.5
@ -446,8 +462,8 @@ This package contains the Cockpit shell and system configuration interfaces.
%package ws
Summary: Cockpit Web Service
Requires: glib-networking
Requires: glib2 >= 2.50.0
Requires: openssl
Requires: glib2 >= 2.50.0
Conflicts: firewalld < 0.6.0-1
Recommends: sscg >= 2.3
Recommends: system-logos
@ -570,9 +586,9 @@ sosreport tool.
%package networkmanager
Summary: Cockpit user interface for networking, using NetworkManager
Requires: NetworkManager >= 1.6
Requires: cockpit-bridge >= 186
Requires: cockpit-shell >= 186
Requires: NetworkManager >= 1.6
# Optional components
Recommends: NetworkManager-team
BuildArch: noarch
@ -642,10 +658,9 @@ The Cockpit component for managing storage. This package uses udisks.
%package -n cockpit-tests
Summary: Tests for Cockpit
Requires: /usr/bin/ssh-add
Requires: /usr/bin/ssh-agent
Requires: cockpit-bridge >= 138
Requires: cockpit-system >= 138
Requires: openssh-clients
Provides: cockpit-test-assets = %{version}-%{release}
%description -n cockpit-tests
@ -655,6 +670,15 @@ These files are not required for running Cockpit.
%files -n cockpit-tests -f tests.list
%{_prefix}/%{__lib}/cockpit-test-assets
%package devel
Summary: Development files for for Cockpit
%description devel
This package contains files used to develop cockpit modules
%files devel
%{_datadir}/cockpit/devel
%package -n cockpit-machines
BuildArch: noarch
Summary: Cockpit user interface for virtual machines
@ -698,8 +722,9 @@ systemctl reload-or-try-restart pmlogger
%package -n cockpit-packagekit
Summary: Cockpit user interface for packages
BuildArch: noarch
Requires: PackageKit
Requires: cockpit-bridge >= 186
Requires: PackageKit
Recommends: python3-tracer
%description -n cockpit-packagekit
The Cockpit components for installing OS updates and Cockpit add-ons,
@ -711,5 +736,4 @@ via PackageKit.
%endif
# The changelog is automatically generated and merged
%changelog

BIN
node_modules.obscpio (Stored with Git LFS) Normal file

Binary file not shown.

1524
node_modules.spec.inc Normal file

File diff suppressed because it is too large Load Diff

40565
package-lock.json generated Normal file

File diff suppressed because it is too large Load Diff