Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package cockpit for openSUSE:Factory checked in at 2023-08-03 17:27:00 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/cockpit (Old) and /work/SRC/openSUSE:Factory/.cockpit.new.22712 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "cockpit" Thu Aug 3 17:27:00 2023 rev:30 rq:1099925 version:296 Changes: -------- --- /work/SRC/openSUSE:Factory/cockpit/cockpit.changes 2023-06-18 23:07:30.401304290 +0200 +++ /work/SRC/openSUSE:Factory/.cockpit.new.22712/cockpit.changes 2023-08-03 17:27:01.678762925 +0200 @@ -1,0 +2,9 @@ +Mon Jul 17 12:19:27 UTC 2023 - Adam Majer <adam.ma...@suse.de> + +- new version 296: + - https://cockpit-project.org/blog/cockpit-296.html + - https://cockpit-project.org/blog/cockpit-295.html + - https://cockpit-project.org/blog/cockpit-294.html +- 0004-leap-gnu18-removal.patch: added support for Leap thanks to Lubos + +------------------------------------------------------------------- Old: ---- cockpit-293.obscpio New: ---- 0004-leap-gnu18-removal.patch cockpit-296.obscpio ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ cockpit.spec ++++++ --- /var/tmp/diff_new_pack.4jWA3k/_old 2023-08-03 17:27:06.258790644 +0200 +++ /var/tmp/diff_new_pack.4jWA3k/_new 2023-08-03 17:27:06.262790668 +0200 @@ -50,7 +50,7 @@ License: LGPL-2.1-or-later URL: https://cockpit-project.org/ -Version: 293 +Version: 296 Release: 0 Source0: cockpit-%{version}.tar Source1: cockpit.pam @@ -68,6 +68,13 @@ # SLE Micro specific patches Patch101: hide-pcp.patch Patch102: 0002-selinux-temporary-remove-setroubleshoot-section.patch +# For anything based on SLES 15 codebase (including Leap, SLE Micro) +Patch103: 0004-leap-gnu18-removal.patch + +# Use Python bridge on non-stable versions +%if 0%{?fedora} >= 39 +%define cockpit_enable_python 1 +%endif # Experimental Python support %if !%{defined cockpit_enable_python} @@ -107,10 +114,11 @@ %endif # Ship custom SELinux policy (but not for cockpit-appstream) -%if 0%{?rhel} >= 9 || 0%{?fedora} || 0%{?suse_version} +%if 0%{?rhel} >= 9 || 0%{?fedora} || 0%{?suse_version} >= 1600 || 0%{?is_smo} %if "%{name}" == "cockpit" %define selinuxtype targeted %define selinux_configure_arg --enable-selinux-policy=%{selinuxtype} +%define with_selinux 1 %endif %endif @@ -166,9 +174,11 @@ # For documentation BuildRequires: xmlto +%if 0%{?with_selinux} BuildRequires: selinux-policy BuildRequires: selinux-policy-%{selinuxtype} BuildRequires: selinux-policy-devel +%endif # for rebuilding nodejs bits BuildRequires: npm @@ -224,9 +234,14 @@ %patch101 -p1 %patch102 -p1 %endif +# For anything based on SLES 15 codebase (including Leap, SLEM) +%if 0%{?suse_version} == 1500 +%patch103 -p1 +%endif cp %SOURCE1 tools/cockpit.pam # +rm -rf node_modules package-lock.json local-npm-registry %{_sourcedir} install --also=dev --legacy-peer-deps %build @@ -253,8 +268,10 @@ --disable-ssh \ %endif +%if 0%{?with_selinux} make -f /usr/share/selinux/devel/Makefile cockpit.pp bzip2 -9 cockpit.pp +%endif %make_build @@ -280,11 +297,13 @@ install -D -p -m 644 AUTHORS COPYING README.md %{buildroot}%{_docdir}/cockpit/ # selinux +%if 0%{?with_selinux} install -D -m 644 %{name}.pp.bz2 %{buildroot}%{_datadir}/selinux/packages/%{selinuxtype}/%{name}.pp.bz2 install -D -m 644 -t %{buildroot}%{_mandir}/man8 selinux/%{name}_session_selinux.8cockpit install -D -m 644 -t %{buildroot}%{_mandir}/man8 selinux/%{name}_ws_selinux.8cockpit # create this directory in the build root so that %ghost sees the desired mode install -d -m 700 %{buildroot}%{_sharedstatedir}/selinux/%{selinuxtype}/active/modules/200/%{name} +%endif # SUSE branding mkdir -p %{buildroot}%{_datadir}/cockpit/branding/suse @@ -372,8 +391,7 @@ rm -f %{buildroot}/usr/bin/cockpit-bridge rm -f %{buildroot}%{_libexecdir}/cockpit-ssh rm -f %{buildroot}%{_datadir}/metainfo/cockpit.appdata.xml -rm -rf %{buildroot}%{python3_sitelib}/cockpit/ -rm -rf %{buildroot}%{python3_sitelib}/cockpit-%{version}.dist-info/ +rm -rf %{buildroot}%{python3_sitelib}/cockpit* %endif # when not building optional packages, remove their files @@ -474,8 +492,7 @@ %{_bindir}/cockpit-bridge %{_libexecdir}/cockpit-askpass %if %{cockpit_enable_python} -%{python3_sitelib}/%{name}/ -%{python3_sitelib}/%{name}-%{version}.dist-info/ +%{python3_sitelib}/%{name}* %endif %package doc @@ -540,8 +557,10 @@ Requires: glib-networking Requires: openssl Requires: glib2 >= 2.50.0 +%if 0%{?with_selinux} Requires: (selinux-policy >= %{_selinux_policy_version} if selinux-policy-%{selinuxtype}) Requires(post): (policycoreutils if selinux-policy-%{selinuxtype}) +%endif Conflicts: firewalld < 0.6.0-1 Recommends: sscg >= 2.3 Recommends: system-logos @@ -610,10 +629,12 @@ %{_libexecdir}/cockpit-certificate-helper %{?suse_version:%verify(not mode) }%attr(4750, root, cockpit-wsinstance) %{_libexecdir}/cockpit-session %{_datadir}/cockpit/branding +%if 0%{?with_selinux} %{_datadir}/selinux/packages/%{selinuxtype}/%{name}.pp.bz2 %{_mandir}/man8/%{name}_session_selinux.8cockpit.* %{_mandir}/man8/%{name}_ws_selinux.8cockpit.* %ghost %{_sharedstatedir}/selinux/%{selinuxtype}/active/modules/200/%{name} +%endif %pre ws getent group cockpit-ws >/dev/null || groupadd -r cockpit-ws ++++++ 0004-leap-gnu18-removal.patch ++++++ --- cockpit/src/Makefile.am.orig +++ cockpit/src/Makefile.am @@ -44,7 +44,7 @@ $(NULL) AM_CFLAGS = \ - -std=gnu18 \ + -std=gnu11 \ -pthread \ -Wall \ -Werror=strict-prototypes \ ++++++ _service ++++++ --- /var/tmp/diff_new_pack.4jWA3k/_old 2023-08-03 17:27:06.334791104 +0200 +++ /var/tmp/diff_new_pack.4jWA3k/_new 2023-08-03 17:27:06.338791128 +0200 @@ -13,7 +13,7 @@ <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">293</param> + <param name="revision">296</param> <param name="submodules">disable</param> </service> <service name="node_modules" mode="manual"> ++++++ cockpit-293.obscpio -> cockpit-296.obscpio ++++++ /work/SRC/openSUSE:Factory/cockpit/cockpit-293.obscpio /work/SRC/openSUSE:Factory/.cockpit.new.22712/cockpit-296.obscpio differ: char 49, line 1 ++++++ cockpit.obsinfo ++++++ --- /var/tmp/diff_new_pack.4jWA3k/_old 2023-08-03 17:27:06.438791733 +0200 +++ /var/tmp/diff_new_pack.4jWA3k/_new 2023-08-03 17:27:06.438791733 +0200 @@ -1,5 +1,5 @@ name: cockpit -version: 293 -mtime: 1685606167 -commit: 06aba4d08e6017abed05a3cc3e3bbb49276bc0d1 +version: 296 +mtime: 1689145790 +commit: 1336ce350d88d385870ba56405136df7a55ae73f ++++++ node_modules.obscpio ++++++ /work/SRC/openSUSE:Factory/cockpit/node_modules.obscpio /work/SRC/openSUSE:Factory/.cockpit.new.22712/node_modules.obscpio differ: char 59, line 1 ++++++ node_modules.spec.inc ++++++ ++++ 916 lines (skipped) ++++ between /work/SRC/openSUSE:Factory/cockpit/node_modules.spec.inc ++++ and /work/SRC/openSUSE:Factory/.cockpit.new.22712/node_modules.spec.inc ++++++ package-lock.json ++++++ ++++ 671 lines (skipped) ++++ between /work/SRC/openSUSE:Factory/cockpit/package-lock.json ++++ and /work/SRC/openSUSE:Factory/.cockpit.new.22712/package-lock.json
