commit cockpit for openSUSE:Factory
Hello community,
here is the log from the commit of package cockpit for openSUSE:Factory checked
in at 2020-10-15 13:51:45
Comparing /work/SRC/openSUSE:Factory/cockpit (Old)
and /work/SRC/openSUSE:Factory/.cockpit.new.3486 (New)
Package is "cockpit"
Thu Oct 15 13:51:45 2020 rev:9 rq:841891 version:230
Changes:
--- /work/SRC/openSUSE:Factory/cockpit/cockpit.changes 2020-10-07
14:18:03.513465268 +0200
+++ /work/SRC/openSUSE:Factory/.cockpit.new.3486/cockpit.changes
2020-10-15 13:52:08.469343057 +0200
@@ -1,0 +2,6 @@
+Thu Oct 15 08:16:01 UTC 2020 - Ludwig Nussel
+
+- new version 230
+ https://cockpit-project.org/blog/cockpit-230.html
+
+---
Old:
cockpit-229.tar.xz
New:
cockpit-230.tar.xz
Other differences:
--
++ cockpit.spec ++
--- /var/tmp/diff_new_pack.n6jcxd/_old 2020-10-15 13:52:09.261343389 +0200
+++ /var/tmp/diff_new_pack.n6jcxd/_new 2020-10-15 13:52:09.265343390 +0200
@@ -58,7 +58,7 @@
License:LGPL-2.1-or-later
URL:https://cockpit-project.org/
-Version:229
+Version:230
%if %{defined wip}
Release:1.%{wip}%{?dist}
Source0:cockpit-%{version}.tar.xz
@@ -303,7 +303,6 @@
# the distro.
pushd %{buildroot}/%{_datadir}/cockpit/branding
find -L * -type l -printf "%H\n" | sort -u | xargs rm -rv
-ln -s opensuse-tumbleweed opensuse-microos
popd
# need this in SUSE as post build checks dislike stale symlinks
install -m 644 -D /dev/null %{buildroot}/run/cockpit/motd
++ cockpit-229.tar.xz -> cockpit-230.tar.xz ++
/work/SRC/openSUSE:Factory/cockpit/cockpit-229.tar.xz
/work/SRC/openSUSE:Factory/.cockpit.new.3486/cockpit-230.tar.xz differ: char
25, line 1
commit cockpit for openSUSE:Factory
Hello community,
here is the log from the commit of package cockpit for openSUSE:Factory checked
in at 2020-10-07 14:18:00
Comparing /work/SRC/openSUSE:Factory/cockpit (Old)
and /work/SRC/openSUSE:Factory/.cockpit.new.4249 (New)
Package is "cockpit"
Wed Oct 7 14:18:00 2020 rev:8 rq:839814 version:229
Changes:
--- /work/SRC/openSUSE:Factory/cockpit/cockpit.changes 2020-10-03
18:57:38.865624852 +0200
+++ /work/SRC/openSUSE:Factory/.cockpit.new.4249/cockpit.changes
2020-10-07 14:18:03.513465268 +0200
@@ -1,0 +2,6 @@
+Tue Oct 6 06:24:58 UTC 2020 - Ludwig Nussel
+
+- new version 229
+ https://cockpit-project.org/blog/cockpit-229.html
+
+---
Old:
cockpit-228.tar.xz
New:
cockpit-229.tar.xz
Other differences:
--
++ cockpit.spec ++
--- /var/tmp/diff_new_pack.TxQ6RE/_old 2020-10-07 14:18:04.293465888 +0200
+++ /var/tmp/diff_new_pack.TxQ6RE/_new 2020-10-07 14:18:04.297465892 +0200
@@ -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 @@
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 @@
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: 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 @@
--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 @@
%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 @@
# 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 @@
%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
++ cockpit-228.tar.xz -> cockpit-229.tar.xz ++
/work/SRC/openSUSE:Factory/cockpit/cockpit-228.tar.xz
/work/SRC/openSUSE:Factory/.cockpit.new.4249/cockpit-229.tar.xz differ: char
26, line 1
commit cockpit for openSUSE:Factory
Hello community,
here is the log from the commit of package cockpit for openSUSE:Factory checked
in at 2020-10-03 18:56:59
Comparing /work/SRC/openSUSE:Factory/cockpit (Old)
and /work/SRC/openSUSE:Factory/.cockpit.new.4249 (New)
Package is "cockpit"
Sat Oct 3 18:56:59 2020 rev:7 rq:839210 version:228
Changes:
--- /work/SRC/openSUSE:Factory/cockpit/cockpit.changes 2020-09-21
17:22:06.295867757 +0200
+++ /work/SRC/openSUSE:Factory/.cockpit.new.4249/cockpit.changes
2020-10-03 18:57:38.865624852 +0200
@@ -1,0 +2,9 @@
+Thu Oct 1 11:32:48 UTC 2020 - Ludwig Nussel
+
+- 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
+
+---
Old:
cockpit-225.tar.xz
New:
cockpit-228.tar.xz
Other differences:
--
++ cockpit.spec ++
--- /var/tmp/diff_new_pack.LdM9AH/_old 2020-10-03 18:57:39.637625708 +0200
+++ /var/tmp/diff_new_pack.LdM9AH/_new 2020-10-03 18:57:39.641625712 +0200
@@ -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 @@
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: 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: 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-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 @@
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 @@
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 @@
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
commit cockpit for openSUSE:Factory
Hello community,
here is the log from the commit of package cockpit for openSUSE:Factory checked
in at 2020-09-21 17:19:14
Comparing /work/SRC/openSUSE:Factory/cockpit (Old)
and /work/SRC/openSUSE:Factory/.cockpit.new.4249 (New)
Package is "cockpit"
Mon Sep 21 17:19:14 2020 rev:6 rq:835202 version:225
Changes:
--- /work/SRC/openSUSE:Factory/cockpit/cockpit.changes 2020-09-09
18:07:28.815500584 +0200
+++ /work/SRC/openSUSE:Factory/.cockpit.new.4249/cockpit.changes
2020-09-21 17:22:06.295867757 +0200
@@ -1,0 +2,5 @@
+Thu Sep 10 12:49:00 UTC 2020 - Ludwig Nussel
+
+- adjust spec file to match upstream
+
+---
Other differences:
--
++ cockpit.spec ++
--- /var/tmp/diff_new_pack.yXkmVp/_old 2020-09-21 17:22:19.851878219 +0200
+++ /var/tmp/diff_new_pack.yXkmVp/_new 2020-09-21 17:22:19.855878222 +0200
@@ -469,19 +469,12 @@
Requires: glib-networking
Requires: openssl
Requires: glib2 >= 2.37.4
-Requires: group(wheel)
Conflicts: firewalld < 0.6.0-1
Recommends: sscg >= 2.3
Recommends: system-logos
-%if !0%{?suse_version}
-Requires: systemd >= 235
-%endif
Suggests: sssd-dbus
+%if 0%{?suse_version}
Requires(pre): permissions
-%if !0%{?suse_version}
-Requires(post): systemd
-Requires(preun): systemd
-Requires(postun): systemd
%endif
%description ws
@@ -530,8 +523,7 @@
%{_libexecdir}/cockpit-wsinstance-factory
%{_libexecdir}/cockpit-tls
%{_libexecdir}/cockpit-desktop
-%attr(4750, root, cockpit-wsinstance) %{_libexecdir}/cockpit-session
-%attr(775, -, wheel) %{_localstatedir}/lib/cockpit
+%{?suse_version:%verify(not mode) }%attr(4750, root, cockpit-wsinstance)
%{_libexecdir}/cockpit-session
%{_datadir}/cockpit/static
%{_datadir}/cockpit/branding
@@ -542,7 +534,9 @@
getent passwd cockpit-wsinstance >/dev/null || useradd -r -g
cockpit-wsinstance -d /nonexisting -s /sbin/nologin -c "User for cockpit-ws
instances" cockpit-wsinstance
%post ws
+%if 0%{?suse_version}
%set_permissions %{_libexecdir}/cockpit-session
+%endif
%tmpfiles_create cockpit-tempfiles.conf
%systemd_post cockpit.socket
# firewalld only partially picks up changes to its services files without this
@@ -555,8 +549,10 @@
%systemd_postun_with_restart cockpit.socket
%systemd_postun_with_restart cockpit.service
+%if 0%{?suse_version}
%verifyscript ws
%verify_permissions -e %{_libexecdir}/cockpit-session
+%endif
#
---
# Sub-packages that are part of cockpit-system in RHEL/CentOS, but separate in
Fedora
commit cockpit for openSUSE:Factory
Hello community,
here is the log from the commit of package cockpit for openSUSE:Factory checked
in at 2020-09-09 18:01:11
Comparing /work/SRC/openSUSE:Factory/cockpit (Old)
and /work/SRC/openSUSE:Factory/.cockpit.new.3399 (New)
Package is "cockpit"
Wed Sep 9 18:01:11 2020 rev:5 rq:832694 version:225
Changes:
--- /work/SRC/openSUSE:Factory/cockpit/cockpit.changes 2020-08-15
21:20:56.331642468 +0200
+++ /work/SRC/openSUSE:Factory/.cockpit.new.3399/cockpit.changes
2020-09-09 18:07:28.815500584 +0200
@@ -1,0 +2,11 @@
+Fri Sep 4 12:09:16 UTC 2020 - Thorsten Kukuk
+
+- cockpit-ws: don't require systemd (allows to build a very small
+ cockpit-ws container)
+
+---
+Mon Aug 31 15:46:35 UTC 2020 - Ludwig Nussel
+
+- Add README.packaging for packagers
+
+---
New:
README.packaging
Other differences:
--
++ cockpit.spec ++
--- /var/tmp/diff_new_pack.ITxFlj/_old 2020-09-09 18:07:29.847501524 +0200
+++ /var/tmp/diff_new_pack.ITxFlj/_new 2020-09-09 18:07:29.851501528 +0200
@@ -86,6 +86,7 @@
%endif
Source1: cockpit.pam
Source2: cockpit-rpmlintrc
+Source99: README.packaging
BuildRequires: gcc
BuildRequires: pkgconfig(gio-unix-2.0)
@@ -472,12 +473,16 @@
Conflicts: firewalld < 0.6.0-1
Recommends: sscg >= 2.3
Recommends: system-logos
+%if !0%{?suse_version}
Requires: systemd >= 235
+%endif
Suggests: sssd-dbus
Requires(pre): permissions
+%if !0%{?suse_version}
Requires(post): systemd
Requires(preun): systemd
Requires(postun): systemd
+%endif
%description ws
The Cockpit Web Service listens on the network, and authenticates users.
++ README.packaging ++
The upstream cockpit spec file is rather complex and ugly. It does
contain information we need though, such as the bundled node
modules. Therefore the package reuses the upstream spec file and
applies openSUSE specifics that upstream doesn't accept on top. For
that purpose a git repo tracks the spec file changes:
https://github.com/lnussel/cockpit
There' an opensuse-$VERSION branch for each release
For simple fixes it's fine to just submit the spec file by OBS
means, I'll retrofit in git. Don't worry about that.
For version updates the git workflow really is needed to maintain
mental health though.
The following workflow is used to update the package to a newer
version:
- create a branch for the new version based on the old one:
git checkout -b opensuse-$NEW_VERSION opensuse-$OLD_VERSION
- use interactive rebase to amend the commits marked as EDIT THIS:
git rebase -i $NEW_VERSION
* for the very fist commit download the new tarball and extract
the spec file from it. Copy the spec file over
tools/cockpit.spec. That is basically what changed between the
versions wrt spec file.
* the second one adjust the spec file to have $NEW_VERSION. For
whatever reason the upstream spec file alwas has version 0.
* the rest of the changes should just apply.
- copy the spec file back into the OBS checkout and continue with
regular tasks related to updating packages.
- If any further spec file changes were needed, copy the spec back
into the git tree and commit there. Amend and reorder as needed.
- When done, push the git repo.
Sending fixes upstream:
if you have any changes that should go upstream, create a new, clean
branch and cherry pick *one* commit into it. Upstream wants pull
requests with only one commit
commit cockpit for openSUSE:Factory
Hello community,
here is the log from the commit of package cockpit for openSUSE:Factory checked
in at 2020-08-15 21:20:08
Comparing /work/SRC/openSUSE:Factory/cockpit (Old)
and /work/SRC/openSUSE:Factory/.cockpit.new.3399 (New)
Package is "cockpit"
Sat Aug 15 21:20:08 2020 rev:4 rq:826690 version:225
Changes:
--- /work/SRC/openSUSE:Factory/cockpit/cockpit.changes 2020-08-14
09:34:11.176424777 +0200
+++ /work/SRC/openSUSE:Factory/.cockpit.new.3399/cockpit.changes
2020-08-15 21:20:56.331642468 +0200
@@ -1,0 +2,8 @@
+Fri Aug 14 12:09:24 UTC 2020 - Ludwig Nussel
+
+- new version 225:
+ https://cockpit-project.org/blog/cockpit-223.html
+ https://cockpit-project.org/blog/cockpit-224.html
+ https://cockpit-project.org/blog/cockpit-225.html
+
+---
Old:
cockpit-222.tar.xz
New:
cockpit-225.tar.xz
Other differences:
--
++ cockpit.spec ++
--- /var/tmp/diff_new_pack.9RBbr0/_old 2020-08-15 21:20:57.463643114 +0200
+++ /var/tmp/diff_new_pack.9RBbr0/_new 2020-08-15 21:20:57.467643117 +0200
@@ -76,7 +76,7 @@
License:LGPL-2.1-or-later
URL:https://cockpit-project.org/
-Version:222
+Version:225
%if %{defined wip}
Release:1.%{wip}%{?dist}
Source0:cockpit-%{version}.tar.xz
@@ -94,6 +94,7 @@
BuildRequires: pam-devel
BuildRequires: autoconf automake
+BuildRequires: make
BuildRequires: /usr/bin/python3
BuildRequires: gettext >= 0.19.7
%if %{defined build_dashboard}
@@ -195,7 +196,7 @@
%{?testsuite_skip} make -j4 check %{?testsuite_fail}
%install
-make install DESTDIR=%{buildroot}
+%make_install
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
@@ -451,10 +452,10 @@
%endif
# NPM modules which are also available as packages
Provides: bundled(js-jquery) = 3.5.1
-Provides: bundled(js-moment) = 2.25.3
+Provides: bundled(js-moment) = 2.27.0
Provides: bundled(nodejs-flot) = 0.8.3
Provides: bundled(xstatic-bootstrap-datepicker-common) = 1.9.0
-Provides: bundled(xstatic-patternfly-common) = 3.59.4
+Provides: bundled(xstatic-patternfly-common) = 3.59.5
%description system
This package contains the Cockpit shell and system configuration interfaces.
++ cockpit-222.tar.xz -> cockpit-225.tar.xz ++
/work/SRC/openSUSE:Factory/cockpit/cockpit-222.tar.xz
/work/SRC/openSUSE:Factory/.cockpit.new.3399/cockpit-225.tar.xz differ: char
25, line 1
commit cockpit for openSUSE:Factory
Hello community,
here is the log from the commit of package cockpit for openSUSE:Factory checked
in at 2020-08-14 09:32:36
Comparing /work/SRC/openSUSE:Factory/cockpit (Old)
and /work/SRC/openSUSE:Factory/.cockpit.new.3399 (New)
Package is "cockpit"
Fri Aug 14 09:32:36 2020 rev:3 rq:826190 version:222
Changes:
--- /work/SRC/openSUSE:Factory/cockpit/cockpit.changes 2020-06-26
21:50:35.086819935 +0200
+++ /work/SRC/openSUSE:Factory/.cockpit.new.3399/cockpit.changes
2020-08-14 09:34:11.176424777 +0200
@@ -1,0 +2,7 @@
+Wed Aug 12 09:33:17 UTC 2020 - Thorsten Kukuk
+
+- Require group wheel
+- Add permission macros [bsc#1169614]
+- Create tmpfiles in %post install
+
+---
Other differences:
--
++ cockpit.spec ++
--- /var/tmp/diff_new_pack.1nJZ1R/_old 2020-08-14 09:34:11.740425066 +0200
+++ /var/tmp/diff_new_pack.1nJZ1R/_new 2020-08-14 09:34:11.744425068 +0200
@@ -467,11 +467,13 @@
Requires: glib-networking
Requires: openssl
Requires: glib2 >= 2.37.4
+Requires: group(wheel)
Conflicts: firewalld < 0.6.0-1
Recommends: sscg >= 2.3
Recommends: system-logos
Requires: systemd >= 235
Suggests: sssd-dbus
+Requires(pre): permissions
Requires(post): systemd
Requires(preun): systemd
Requires(postun): systemd
@@ -534,6 +536,8 @@
getent passwd cockpit-wsinstance >/dev/null || useradd -r -g
cockpit-wsinstance -d /nonexisting -s /sbin/nologin -c "User for cockpit-ws
instances" cockpit-wsinstance
%post ws
+%set_permissions %{_libexecdir}/cockpit-session
+%tmpfiles_create cockpit-tempfiles.conf
%systemd_post cockpit.socket
# firewalld only partially picks up changes to its services files without this
test -f %{_bindir}/firewall-cmd && firewall-cmd --reload --quiet || true
@@ -545,6 +549,9 @@
%systemd_postun_with_restart cockpit.socket
%systemd_postun_with_restart cockpit.service
+%verifyscript ws
+%verify_permissions -e %{_libexecdir}/cockpit-session
+
#
---
# Sub-packages that are part of cockpit-system in RHEL/CentOS, but separate in
Fedora
commit cockpit for openSUSE:Factory
Hello community,
here is the log from the commit of package cockpit for openSUSE:Factory checked
in at 2020-06-26 21:50:19
Comparing /work/SRC/openSUSE:Factory/cockpit (Old)
and /work/SRC/openSUSE:Factory/.cockpit.new.3060 (New)
Package is "cockpit"
Fri Jun 26 21:50:19 2020 rev:2 rq:817283 version:222
Changes:
--- /work/SRC/openSUSE:Factory/cockpit/cockpit.changes 2020-06-11
10:02:04.778654575 +0200
+++ /work/SRC/openSUSE:Factory/.cockpit.new.3060/cockpit.changes
2020-06-26 21:50:35.086819935 +0200
@@ -1,0 +2,9 @@
+Fri Jun 26 12:09:09 UTC 2020 - Ludwig Nussel
+
+- new version 222:
+ https://cockpit-project.org/blog/cockpit-222.html
+ changelog from 221:
+ https://cockpit-project.org/blog/cockpit-221.html
+- enable docker module
+
+---
Old:
cockpit-220.tar.xz
New:
cockpit-222.tar.xz
Other differences:
--
++ cockpit.spec ++
--- /var/tmp/diff_new_pack.mmXprb/_old 2020-06-26 21:50:36.230823617 +0200
+++ /var/tmp/diff_new_pack.mmXprb/_new 2020-06-26 21:50:36.234823630 +0200
@@ -76,7 +76,7 @@
License:LGPL-2.1-or-later
URL:https://cockpit-project.org/
-Version:220
+Version:222
%if %{defined wip}
Release:1.%{wip}%{?dist}
Source0:cockpit-%{version}.tar.xz
@@ -143,7 +143,7 @@
Suggests: cockpit-pcp
%ifarch x86_64 %{arm} aarch64 ppc64le i686 s390x
-%if 0%{?fedora} == 31 && 0%{?build_optional}
+%if (0%{?fedora} == 31 || 0%{?suse_version}) && 0%{?build_optional}
%define build_docker 1
Recommends: (cockpit-docker if /usr/bin/docker)
%endif
@@ -186,7 +186,13 @@
%define testsuite_fail || true
%endif
%endif
-make -j4 check %{?testsuite_fail}
+# HACK: RHEL i686 builders hang after running all tests; not a supported
architecture, so don't bother
+%if 0%{?rhel} >= 8
+%ifarch i686
+%define testsuite_skip #
+%endif
+%endif
+%{?testsuite_skip} make -j4 check %{?testsuite_fail}
%install
make install DESTDIR=%{buildroot}
@@ -312,6 +318,7 @@
# the distro.
pushd %{buildroot}/%{_datadir}/cockpit/branding
find -L * -type l -printf "%H\n" | sort -u | xargs rm -rv
+ln -s opensuse-tumbleweed opensuse-microos
popd
# need this in SUSE as post build checks dislike stale symlinks
install -m 644 -D /dev/null %{buildroot}/run/cockpit/motd
@@ -731,6 +738,7 @@
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
++ cockpit-220.tar.xz -> cockpit-222.tar.xz ++
/work/SRC/openSUSE:Factory/cockpit/cockpit-220.tar.xz
/work/SRC/openSUSE:Factory/.cockpit.new.3060/cockpit-222.tar.xz differ: char
25, line 1
