summaryrefslogtreecommitdiffstats
path: root/redhat/main
diff options
context:
space:
mode:
Diffstat (limited to 'redhat/main')
-rw-r--r--redhat/main/tdeaddons/tdeaddons.spec4
-rw-r--r--redhat/main/tdeartwork/tdeartwork.spec8
-rw-r--r--redhat/main/tdebase/tdebase.spec11
-rw-r--r--redhat/main/tdebindings/tdebindings.spec2
-rw-r--r--redhat/main/tdepim/tdepim.spec4
-rw-r--r--redhat/main/tdeutils/tdeutils.spec3
6 files changed, 22 insertions, 10 deletions
diff --git a/redhat/main/tdeaddons/tdeaddons.spec b/redhat/main/tdeaddons/tdeaddons.spec
index 60086f993..a45b68867 100644
--- a/redhat/main/tdeaddons/tdeaddons.spec
+++ b/redhat/main/tdeaddons/tdeaddons.spec
@@ -138,8 +138,8 @@ BuildRequires: db4-devel
#%endif
# PYTHON2 support
-%if 0%{?rhel} >= 8 || 0%{?fedora} >= 30 || 0%{?mgaversion} >= 8
-%global python %python2
+%if 0%{?rhel} >= 8 || 0%{?fedora} >= 30 || 0%{?suse_version} >= 1500 || 0%{?mgaversion} >= 8
+%global python python2
%global __python %__python2
%endif
diff --git a/redhat/main/tdeartwork/tdeartwork.spec b/redhat/main/tdeartwork/tdeartwork.spec
index 2c26c45d6..4933488da 100644
--- a/redhat/main/tdeartwork/tdeartwork.spec
+++ b/redhat/main/tdeartwork/tdeartwork.spec
@@ -103,7 +103,8 @@ BuildRequires: libart_lgpl-devel
# RHEL 4: disabled
# RHEL 6: available in EPEL
# RHEL 7: available in NUX
-%if 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?rhel} == 5 || 0%{?rhel} == 6 || 0%{?rhel} == 7 || 0%{?suse_version}
+# RHEL 8: available in EPEL
+%if 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?rhel} >= 5 || 0%{?suse_version}
%define with_xscreensaver 1
%if 0%{?fedora} || 0%{?rhel} >= 5
@@ -732,8 +733,11 @@ fi
\
%{!?with_xscreensaver:-DWITH_XSCREENSAVER=OFF} \
%{!?with_libart}:-DWITH_LIBART=OFF} \
- -DWITH_OPENGL=ON \
+ -DWITH_ALL_OPTIONS=ON \
-DWITH_ARTS=ON \
+ -DWITH_LIBART=ON \
+ -DWITH_OPENGL=ON \
+ -DWITH_XSCREENSAVER=ON \
-DBUILD_ALL=ON \
..
diff --git a/redhat/main/tdebase/tdebase.spec b/redhat/main/tdebase/tdebase.spec
index 67d78d852..a14b915d7 100644
--- a/redhat/main/tdebase/tdebase.spec
+++ b/redhat/main/tdebase/tdebase.spec
@@ -352,6 +352,13 @@ Requires: mageia-theme-Default
%define tde_starticon %{tde_datadir}/oxygen/scalable/mgabutton.svg
%endif
+# Mageia 8 Theme
+%if 0%{?mgaversion} == 8
+Requires: mageia-theme-Default
+%define tde_bg /usr/share/mga/backgrounds/default.jpg
+%define tde_starticon %{tde_datadir}/oxygen/scalable/mgabutton.svg
+%endif
+
# Mandriva 2011 Theme: "rosa"
%if "%{distribution}" == "Mandriva Linux" && "%{?mdkversion}" == "201100"
Requires: mandriva-theme
@@ -590,7 +597,8 @@ BuildRequires: OpenEXR-devel
# RHEL 5: available in centos-extras
# RHEL 6: available in EPEL
# RHEL 7: available in NUX
-%if 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?rhel} == 5 || 0%{?rhel} == 6 || 0%{?rhel} == 7 || 0%{?suse_version}
+# RHEL 8: available in EPEL
+%if 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?rhel} >= 5 || 0%{?suse_version}
%define with_xscreensaver 1
%if 0%{?fedora} || 0%{?rhel} >= 5
@@ -2588,7 +2596,6 @@ functionality.
%{tde_datadir}/icons/crystalsvg/*/apps/kicker.png
%{tde_datadir}/icons/crystalsvg/*/apps/panel.png
%{tde_datadir}/icons/crystalsvg/*/apps/runprocesscatcher.png
-%{tde_datadir}/icons/crystalsvg/*/apps/window_list.png
%{tde_datadir}/icons/crystalsvg/*/apps/kbinaryclock.svgz
%{tde_datadir}/icons/crystalsvg/*/apps/systemtray.svgz
%{tde_datadir}/servicetypes/kickoffsearchplugin.desktop
diff --git a/redhat/main/tdebindings/tdebindings.spec b/redhat/main/tdebindings/tdebindings.spec
index f5d4b33c5..6077c0861 100644
--- a/redhat/main/tdebindings/tdebindings.spec
+++ b/redhat/main/tdebindings/tdebindings.spec
@@ -169,7 +169,7 @@ BuildRequires: Mesa-libGLU-devel
%endif
# PYTHON support
-%if 0%{?rhel} >= 8 || 0%{?fedora} >= 31 || 0%{?suse_version} >= 1550 || 0%{?mgaversion} >= 8
+%if 0%{?rhel} >= 8 || 0%{?fedora} >= 31 || 0%{?suse_version} >= 1500 || 0%{?mgaversion} >= 8
%global python python2
%global __python %__python2
%global python_sitearch %{python2_sitearch}
diff --git a/redhat/main/tdepim/tdepim.spec b/redhat/main/tdepim/tdepim.spec
index 049f75e8d..b3ae1b276 100644
--- a/redhat/main/tdepim/tdepim.spec
+++ b/redhat/main/tdepim/tdepim.spec
@@ -148,7 +148,8 @@ BuildRequires: libXcomposite-devel
# RHEL 4: disabled
# RHEL 6: available in EPEL
# RHEL 7: available in NUX
-%if 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?rhel} == 5 || 0%{?rhel} == 6 || 0%{?rhel} == 7 || 0%{?suse_version}
+# RHEL 8: available in EPEL
+%if 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?rhel} >= 5 || 0%{?suse_version}
%define with_xscreensaver 1
%if 0%{?fedora} || 0%{?rhel} >= 5
@@ -1480,7 +1481,6 @@ library.
%files -n trinity-libtdepim-devel
%defattr(-,root,root,-)
-%{tde_tdeincludedir}/tdepimmacros.h
%{tde_libdir}/libtdepim.la
%{tde_libdir}/libtdepim.so
diff --git a/redhat/main/tdeutils/tdeutils.spec b/redhat/main/tdeutils/tdeutils.spec
index 509b9310e..b8f4137ec 100644
--- a/redhat/main/tdeutils/tdeutils.spec
+++ b/redhat/main/tdeutils/tdeutils.spec
@@ -145,7 +145,8 @@ BuildRequires: pcre-devel
BuildRequires: libacl-devel
# XSCREENSAVER support
-%if 0%{?fedora} >= 15 || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?rhel} == 5 || 0%{?rhel} == 6 || 0%{?rhel} == 7 || 0%{?suse_version}
+# RHEL 8: available in EPEL
+%if 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?rhel} >= 5 || 0%{?suse_version}
%define with_xscreensaver 1
%if 0%{?fedora} || 0%{?rhel} >= 5 || 0%{?suse_version}
BuildRequires: libXScrnSaver-devel
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-20 23:40:36 +0000