From 8ed811c5aff5671937496c1383cd37485db8c977a71a3068f4509798227c103f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Klaus=20K=C3=A4mpf?= Date: Wed, 14 Oct 2015 12:43:49 +0000 Subject: [PATCH] fix requires for SUSE OBS-URL: https://build.opensuse.org/package/show/systemsmanagement:cockpit/cockpit?expand=0&rev=24 --- cockpit.spec | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) diff --git a/cockpit.spec b/cockpit.spec index dfb5828..9935b5b 100644 --- a/cockpit.spec +++ b/cockpit.spec @@ -180,7 +180,11 @@ Summary: Cockpit Web Service Requires: glib-networking Requires: openssl Requires: glib2 >= 2.37.4 +%if 0%{?suse_version} +Requires: libssh4 >= %{libssh_version} +%else Requires: libssh >= %{libssh_version} +%endif Requires(post): systemd Requires(preun): systemd Requires(postun): systemd @@ -309,6 +313,22 @@ cat subscriptions.list docker.list networkmanager.list >> shell.list %define find_debug_info %{_rpmconfigdir}/find-debuginfo.sh %{?_missing_build_ids_terminate_build:--strict-build-id} %{?_include_minidebuginfo:-m} %{?_find_debuginfo_dwz_opts} %{?_find_debuginfo_opts} "%{_builddir}/%{?buildsubdir}" %endif +# .css, .html, and .html are minified/gzipped but somehow the originals remain +%if 0%{?suse_version} +rm -rf %{buildroot}%{_datadir}/%{name}/*/*.{css,js,mustache} +rm -rf %{buildroot}%{_datadir}/%{name}/*/index.html +rm -rf %{buildroot}%{_datadir}/%{name}/*/console.html +rm -rf %{buildroot}%{_datadir}/%{name}/*/operation.html +rm -rf %{buildroot}%{_datadir}/%{name}/*/shell.html +rm -rf %{buildroot}%{_datadir}/%{name}/*/logs.html +rm -rf %{buildroot}%{_datadir}/%{name}/*/terminal.html +rm -rf %{buildroot}%{_datadir}/%{name}/*/services.html +rm -rf %{buildroot}%{_datadir}/%{name}/kubernetes/views/*body.html +rm -rf %{buildroot}%{_datadir}/%{name}/kubernetes/views/*bar.html +rm -rf %{buildroot}%{_datadir}/%{name}/kubernetes/views/*page.html +rm -rf %{buildroot}%{_datadir}/%{name}/kubernetes/views/*panel.html +%endif + # Redefine how debug info is built to slip in our extra debug files %define __debug_install_post \ %{find_debug_info} \ @@ -420,7 +440,11 @@ test -f %{_bindir}/firewall-cmd && firewall-cmd --reload --quiet || true %package shell Summary: Cockpit Shell user interface package Requires: %{name}-bridge = %{version}-%{release} +%if 0%{?suse_version} +Requires: shadow +%else Requires: shadow-utils +%endif Requires: grep Requires: libpwquality Requires: /usr/bin/date @@ -450,7 +474,11 @@ This package contains the Cockpit shell UI assets. Summary: Cockpit user interface for storage, using Storaged Requires: storaged >= 2.1.1 Requires: storaged-lvm2 >= 2.1.1 +%if 0%{?suse_version} +Requires: multipath-tools +%else Requires: device-mapper-multipath +%endif BuildArch: noarch %description storaged