From 5a9c30ef24e29ddc32121934330a495005633b3a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fran=C3=A7ois=20Andriot?= Date: Tue, 3 Aug 2021 10:52:09 +0200 Subject: RPM: add support for opensuse Leap 15.3 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: François Andriot --- redhat/main/tdebase/tdebase.spec | 20 ++++++++++++++------ redhat/main/tdelibs/tdelibs.spec | 2 +- 2 files changed, 15 insertions(+), 7 deletions(-) (limited to 'redhat/main') diff --git a/redhat/main/tdebase/tdebase.spec b/redhat/main/tdebase/tdebase.spec index 9992b18d0..0b94976ab 100644 --- a/redhat/main/tdebase/tdebase.spec +++ b/redhat/main/tdebase/tdebase.spec @@ -461,6 +461,14 @@ Requires: hicolor-icon-theme-branding %define tde_starticon /usr/share/icons/hicolor/scalable/apps/distributor.svg %endif +# OpenSuse 15.3 Theme +%if "%{?suse_version}" == "1530" +Requires: wallpaper-branding +%define tde_bg /usr/share/wallpapers/openSUSEdefault/contents/images/1600x1200.jpg +Requires: hicolor-icon-theme-branding +%define tde_starticon /usr/share/icons/hicolor/scalable/apps/distributor.svg +%endif + # OpenSuse TW Theme %if "%{?suse_version}" == "1550" Requires: wallpaper-branding @@ -1886,11 +1894,11 @@ Requires: psmisc %if 0%{?with_hal} Requires: hal >= 0.5 %endif -%if 0%{?rhel} == 4 || 0%{?suse_version} -Requires: cryptsetup -%else -Requires: cryptsetup-luks -%endif +#%if 0%{?rhel} == 4 || 0%{?suse_version} +#Requires: cryptsetup +#%else +#Requires: cryptsetup-luks +#%endif Obsoletes: tdebase-kio-plugins < %{?epoch:%{epoch}:}%{version}-%{release} Provides: tdebase-kio-plugins = %{?epoch:%{epoch}:}%{version}-%{release} @@ -2317,7 +2325,7 @@ already. Most users won't need this. %{_sysconfdir}/init.d/xdm.tde %endif %if 0%{?suse_version} >= 1210 -/usr/lib/X11/displaymanagers/tdm +/usr/lib/X11/displaymanagers/ %endif %if 0%{?fedora} >= 18 || 0%{?rhel} >= 7 || 0%{?mgaversion} >= 6 /usr/lib/systemd/system/tdm.service diff --git a/redhat/main/tdelibs/tdelibs.spec b/redhat/main/tdelibs/tdelibs.spec index 5f9f70832..1ecba4d30 100644 --- a/redhat/main/tdelibs/tdelibs.spec +++ b/redhat/main/tdelibs/tdelibs.spec @@ -249,7 +249,7 @@ BuildRequires: iceauth Requires: xorg-x11-server-utils BuildRequires: xorg-x11-server-utils %endif -%if 0%{?rhel} == 4 || 0%{?suse_version} +%if 0%{?rhel} == 4 Requires: xorg-x11 BuildRequires: xorg-x11 %endif -- cgit v1.2.1