From 94fb217e17ba800dc565b2cea821b835ce0707c9a8319a4add2d1093012a4983 Mon Sep 17 00:00:00 2001
From: Ludwig Nussel <lnussel@suse.com>
Date: Tue, 6 Oct 2020 12:42:16 +0000
Subject: [PATCH] Accepting request 839813 from
 home:lnussel:branches:systemsmanagement:cockpit

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

OBS-URL: https://build.opensuse.org/request/show/839813
OBS-URL: https://build.opensuse.org/package/show/systemsmanagement:cockpit/cockpit?expand=0&rev=50
---
 cockpit-228.tar.xz |  3 ---
 cockpit-229.tar.xz |  3 +++
 cockpit.changes    |  6 ++++++
 cockpit.spec       | 36 ++++++++++++++++++++++++++----------
 4 files changed, 35 insertions(+), 13 deletions(-)
 delete mode 100644 cockpit-228.tar.xz
 create mode 100644 cockpit-229.tar.xz

diff --git a/cockpit-228.tar.xz b/cockpit-228.tar.xz
deleted file mode 100644
index 309e107..0000000
--- a/cockpit-228.tar.xz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:ccd09f4224c9b42bd28f064eac74c0389c88bfa58ad7b302dd018aab0a105fd0
-size 14653692
diff --git a/cockpit-229.tar.xz b/cockpit-229.tar.xz
new file mode 100644
index 0000000..fe48d12
--- /dev/null
+++ b/cockpit-229.tar.xz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:1d18e720da971459f0e489415b966a8149a1edf93617f3d8820a7fd68f54e1ac
+size 16347736
diff --git a/cockpit.changes b/cockpit.changes
index 3a4f5fc..3532f53 100644
--- a/cockpit.changes
+++ b/cockpit.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Tue Oct  6 06:24:58 UTC 2020 - Ludwig Nussel <lnussel@suse.de>
+
+- new version 229
+  https://cockpit-project.org/blog/cockpit-229.html
+
 -------------------------------------------------------------------
 Thu Oct  1 11:32:48 UTC 2020 - Ludwig Nussel <lnussel@suse.de>
 
diff --git a/cockpit.spec b/cockpit.spec
index da51a2f..8f4bb0e 100644
--- a/cockpit.spec
+++ b/cockpit.spec
@@ -40,11 +40,6 @@
 
 %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}
@@ -63,7 +58,7 @@ Summary:        Web Console for Linux servers
 License:        LGPL-2.1-or-later
 URL:            https://cockpit-project.org/
 
-Version:        228
+Version:        229
 %if %{defined wip}
 Release:        1.%{wip}%{?dist}
 Source0:        cockpit-%{version}.tar.xz
@@ -75,6 +70,23 @@ Source1:       cockpit.pam
 Source2:       cockpit-rpmlintrc
 Source99:      README.packaging
 
+# 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)
@@ -85,7 +97,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
@@ -157,6 +169,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
 
@@ -248,12 +263,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
@@ -268,7 +284,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
@@ -420,7 +436,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