forked from cockpit/cockpit
Accepting request 1175756 from home:ldragon:branches:systemsmanagement:cockpit
- new version 316: * cockpit.js API: Fix format_bytes() units - add users_support_for_lastlog_001.patch (bsc#1220551) - add users_support_for_lastlog_002.patch (bsc#1220551) ------------------------------------ OBS-URL: https://build.opensuse.org/request/show/1175756 OBS-URL: https://build.opensuse.org/package/show/systemsmanagement:cockpit/cockpit?expand=0&rev=172
This commit is contained in:
Git OBS Bridge
77
cockpit.spec
77
cockpit.spec
@@ -50,7 +50,7 @@ Summary: Web Console for Linux servers
|
||||
License: LGPL-2.1-or-later
|
||||
URL: https://cockpit-project.org/
|
||||
|
||||
Version: 315
|
||||
Version: 316
|
||||
Release: 0
|
||||
Source0: cockpit-%{version}.tar
|
||||
Source1: cockpit.pam
|
||||
@@ -66,6 +66,8 @@ Patch2: suse_docs.patch
|
||||
Patch3: suse-microos-branding.patch
|
||||
Patch4: css-overrides.patch
|
||||
Patch5: storage-btrfs.patch
|
||||
Patch6: 0001-users-Support-for-watching-lastlog2.patch
|
||||
Patch7: 0002-users-Support-for-watching-lastlog2-and-wutmp-on-overview-page.patch
|
||||
# SLE Micro specific patches
|
||||
Patch101: hide-pcp.patch
|
||||
Patch102: 0002-selinux-temporary-remove-setroubleshoot-section.patch
|
||||
@@ -73,6 +75,25 @@ Patch102: 0002-selinux-temporary-remove-setroubleshoot-section.patch
|
||||
Patch103: 0004-leap-gnu18-removal.patch
|
||||
Patch104: selinux_libdir.patch
|
||||
|
||||
%define build_all 1
|
||||
%if 0%{?rhel} == 8 && 0%{?epel} == 0 && !0%{?build_all}
|
||||
|
||||
%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
|
||||
|
||||
%if 0%{?build_optional} && 0%{?suse_version} == 0
|
||||
%define build_tests 1
|
||||
%endif
|
||||
# pcp stopped building on ix86
|
||||
%define build_pcp 1
|
||||
%if 0%{?fedora} >= 40 || 0%{?rhel} >= 10 || 0%{?suse_version} > 1500
|
||||
@@ -84,6 +105,7 @@ Patch104: selinux_libdir.patch
|
||||
# Ship custom SELinux policy
|
||||
%define selinuxtype targeted
|
||||
%define selinux_configure_arg --enable-selinux-policy=%{selinuxtype}
|
||||
%define with_selinux 1
|
||||
|
||||
BuildRequires: gcc
|
||||
BuildRequires: pkgconfig(gio-unix-2.0)
|
||||
@@ -186,6 +208,8 @@ BuildRequires: python3-tox-current-env
|
||||
%patch -P 3 -p1
|
||||
%patch -P 4 -p1
|
||||
%patch -P 5 -p1
|
||||
%patch -P 6 -p1
|
||||
%patch -P 7 -p1
|
||||
|
||||
# SLE Micro specific patches
|
||||
%if 0%{?is_smo}
|
||||
@@ -238,7 +262,7 @@ bzip2 -9 cockpit.pp
|
||||
%check
|
||||
make -j$(nproc) check
|
||||
|
||||
%if 0%{?rhel} == 0
|
||||
%if 0%{?rhel} == 0 && 0%{?suse_version} == 0
|
||||
%tox
|
||||
%endif
|
||||
|
||||
@@ -287,6 +311,51 @@ echo '%dir %{_datadir}/cockpit/pcp' > pcp.list
|
||||
find %{buildroot}%{_datadir}/cockpit/pcp -type f >> pcp.list
|
||||
%endif
|
||||
|
||||
# when not building basic packages, remove their files
|
||||
%if 0%{?build_basic} == 0
|
||||
for pkg in base1 branding motd kdump networkmanager selinux shell sosreport static systemd users metrics; do
|
||||
rm -r %{buildroot}/%{_datadir}/cockpit/$pkg
|
||||
rm -f %{buildroot}/%{_datadir}/metainfo/org.cockpit-project.cockpit-${pkg}.metainfo.xml
|
||||
done
|
||||
for data in doc man pixmaps polkit-1; do
|
||||
rm -r %{buildroot}/%{_datadir}/$data
|
||||
done
|
||||
rm -r %{buildroot}/%{_prefix}/%{__lib}/tmpfiles.d
|
||||
find %{buildroot}/%{_unitdir}/ -type f ! -name 'cockpit-session*' -delete
|
||||
for libexec in cockpit-askpass cockpit-session cockpit-ws cockpit-tls cockpit-wsinstance-factory cockpit-client cockpit-client.ui cockpit-desktop cockpit-certificate-helper cockpit-certificate-ensure; do
|
||||
rm -f %{buildroot}/%{_libexecdir}/$libexec
|
||||
done
|
||||
rm -rf %{buildroot}/%{_sysconfdir}/pam.d %{buildroot}/%{_sysconfdir}/motd.d %{buildroot}/%{_sysconfdir}/issue.d
|
||||
%if 0%{?suse_version} > 1500
|
||||
rm -rf %{buildroot}/%{_pam_vendordir}
|
||||
%else
|
||||
rm -rf %{buildroot}/%{_sysconfdir}/pam.d
|
||||
%endif
|
||||
rm -f %{buildroot}/%{_libdir}/security/pam_*
|
||||
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*
|
||||
%endif
|
||||
|
||||
# when not building optional packages, remove their files
|
||||
%if 0%{?build_optional} == 0
|
||||
for pkg in apps packagekit pcp playground storaged; do
|
||||
rm -rf %{buildroot}/%{_datadir}/cockpit/$pkg
|
||||
done
|
||||
# files from -pcp
|
||||
rm -rf %{buildroot}/%{_libexecdir}/cockpit-pcp %{buildroot}/%{_localstatedir}/lib/pcp/
|
||||
# files from -storaged
|
||||
rm -f %{buildroot}/%{_prefix}/share/metainfo/org.cockpit-project.cockpit-storaged.metainfo.xml
|
||||
%endif
|
||||
|
||||
%if 0%{?build_tests} == 0
|
||||
rm -rf %{buildroot}%{_datadir}/cockpit/playground
|
||||
rm -f %{buildroot}/%{pamdir}/mock-pam-conv-mod.so
|
||||
rm -f %{buildroot}/%{_unitdir}/cockpit-session.socket
|
||||
rm -f %{buildroot}/%{_unitdir}/cockpit-session@.service
|
||||
%endif
|
||||
|
||||
echo '%dir %{_datadir}/cockpit/shell' >> system.list
|
||||
find %{buildroot}%{_datadir}/cockpit/shell -type f >> system.list
|
||||
|
||||
@@ -320,8 +389,8 @@ find %{buildroot}%{_datadir}/cockpit/apps -type f >> packagekit.list
|
||||
echo '%dir %{_datadir}/cockpit/selinux' > selinux.list
|
||||
find %{buildroot}%{_datadir}/cockpit/selinux -type f >> selinux.list
|
||||
|
||||
echo '%dir %{_datadir}/cockpit/playground' > tests.list
|
||||
find %{buildroot}%{_datadir}/cockpit/playground -type f >> tests.list
|
||||
# echo '%dir %{_datadir}/cockpit/playground' > tests.list
|
||||
# find %{buildroot}%{_datadir}/cockpit/playground -type f >> tests.list
|
||||
|
||||
echo '%dir %{_datadir}/cockpit/static' > static.list
|
||||
echo '%dir %{_datadir}/cockpit/static/fonts' >> static.list
|
||||
|
||||
Reference in New Issue
Block a user