diff --git a/.gitignore b/.gitignore index 8d3e168..c0b00a0 100644 --- a/.gitignore +++ b/.gitignore @@ -318,3 +318,4 @@ /cockpit-341.tar.xz /cockpit-341.1.tar.xz /cockpit-342.tar.xz +/cockpit-343.tar.xz diff --git a/cockpit.spec b/cockpit.spec index 754f8fc..669577c 100644 --- a/cockpit.spec +++ b/cockpit.spec @@ -37,6 +37,14 @@ %define __lib lib +%if 0%{?suse_version} > 1500 +%define pamconfdir %{_pam_vendordir} +%define pamconfig tools/cockpit.suse.pam +%else +%define pamconfdir %{_sysconfdir}/pam.d +%define pamconfig tools/cockpit.pam +%endif + %if %{defined _pamdir} %define pamdir %{_pamdir} %else @@ -49,7 +57,7 @@ Summary: Web Console for Linux servers License: LGPL-2.1-or-later URL: https://cockpit-project.org/ -Version: 342 +Version: 343 Release: 1%{?dist} Source0: https://github.com/cockpit-project/cockpit/releases/download/%{version}/cockpit-%{version}.tar.xz @@ -155,15 +163,20 @@ BuildRequires: python3-pytest-timeout %check make -j$(nproc) check -%if 0%{?rhel} == 0 +%if 0%{?rhel} == 0 && 0%{?suse_version} == 0 export NO_QUNIT=1 %pytest %endif %install +%if 0%{?suse_version} +export NO_BRP_STALE_LINK_ERROR="yes" +%endif %make_install -mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/pam.d -install -p -m 644 tools/cockpit.pam $RPM_BUILD_ROOT%{_sysconfdir}/pam.d/cockpit + +mkdir -p $RPM_BUILD_ROOT%{pamconfdir} +install -p -m 644 %{pamconfig} $RPM_BUILD_ROOT%{pamconfdir}/cockpit + rm -f %{buildroot}/%{_libdir}/cockpit/*.so install -D -p -m 644 AUTHORS COPYING README.md %{buildroot}%{_docdir}/cockpit/ @@ -214,7 +227,12 @@ find %{buildroot}%{_datadir}/cockpit/static -type f >> static.list sed -i "s|%{buildroot}||" *.list -%if ! 0%{?suse_version} +%if 0%{?suse_version} +# remove files of not installable packages +rm -r %{buildroot}%{_datadir}/cockpit/sosreport +rm -f %{buildroot}/%{_prefix}/share/metainfo/org.cockpit_project.cockpit_sosreport.metainfo.xml +rm -f %{buildroot}%{_datadir}/icons/hicolor/64x64/apps/cockpit-sosreport.png +%else %global _debugsource_packages 1 %global _debuginfo_subpackages 0 @@ -384,7 +402,8 @@ authentication via sssd/FreeIPA. %doc %{_mandir}/man8/pam_ssh_add.8.gz %dir %{_sysconfdir}/cockpit %config(noreplace) %{_sysconfdir}/cockpit/ws-certs.d -%config(noreplace) %{_sysconfdir}/pam.d/cockpit +%config(noreplace) %{pamconfdir}/cockpit + # created in %post, so that users can rm the files %ghost %{_sysconfdir}/issue.d/cockpit.issue %ghost %{_sysconfdir}/motd.d/cockpit @@ -504,7 +523,11 @@ SELinux policy module for the cockpit-ws package. Summary: Cockpit user interface for kernel crash dumping Requires: cockpit-bridge >= %{required_base} Requires: cockpit-shell >= %{required_base} +%if 0%{?suse_version} +Requires: kexec-tools +%else Requires: /usr/bin/kdumpctl +%endif BuildArch: noarch %description kdump @@ -514,6 +537,8 @@ The Cockpit component for configuring kernel crash dumping. %license COPYING %{_datadir}/metainfo/org.cockpit_project.cockpit_kdump.metainfo.xml +# sosreport is not supported on opensuse yet +%if !0%{?suse_version} %package sosreport Summary: Cockpit user interface for diagnostic reports Requires: cockpit-bridge >= %{required_base} @@ -529,6 +554,7 @@ sosreport tool. %license COPYING %{_datadir}/metainfo/org.cockpit_project.cockpit_sosreport.metainfo.xml %{_datadir}/icons/hicolor/64x64/apps/cockpit-sosreport.png +%endif %package networkmanager Summary: Cockpit user interface for networking, using NetworkManager @@ -554,7 +580,10 @@ The Cockpit component for managing networking. This package uses NetworkManager Summary: Cockpit SELinux package Requires: cockpit-bridge >= %{required_base} Requires: cockpit-shell >= %{required_base} -Requires: setroubleshoot-server >= 3.3.3 +# setroubleshoot is available on SLE Micro starting with 5.5 +%if !0%{?is_smo} || ( 0%{?is_smo} && 0%{?sle_version} >= 150500 ) +Requires: setroubleshoot-server >= 3.3.3 +%endif BuildArch: noarch %description selinux @@ -618,6 +647,9 @@ via PackageKit. # The changelog is automatically generated and merged %changelog +* Wed Jul 23 2025 Packit - 343-1 +- Bug fixes and translation updates + * Wed Jul 09 2025 Packit - 342-1 - Bug fixes and translation updates diff --git a/packit.yaml b/packit.yaml index f98406b..201e72a 100644 --- a/packit.yaml +++ b/packit.yaml @@ -31,7 +31,7 @@ jobs: targets: &test_targets - fedora-41 - fedora-42 - - fedora-latest-stable-aarch64 + - fedora-latest-aarch64 - fedora-rawhide - centos-stream-9-x86_64 - centos-stream-9-aarch64 diff --git a/sources b/sources index f11fb53..eb6592d 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (cockpit-342.tar.xz) = eb2817efec6fb2573603dcbe51afeb732795ae691f36cfce99d9815eeb7ff10e666083dee0f75032ddf54625e6f843f3f06b027d447c517fd96f6e769b95acd7 +SHA512 (cockpit-343.tar.xz) = c317ec2d8ccade1eb5d7f4819b272a2ddad1bbb7e48f71e96855c463810dc44a740d956f57564cc69eef0b39867ea6f4cae25880d732e6c79c5cf74c13d64b50