summaryrefslogtreecommitdiffstats
path: root/redhat/main
diff options
context:
space:
mode:
Diffstat (limited to 'redhat/main')
-rw-r--r--redhat/main/tdebase/tdebase-14.0.0.spec17
-rw-r--r--redhat/main/tdemultimedia/tdemultimedia-14.0.0-autotools.spec2
-rw-r--r--redhat/main/tdemultimedia/tdemultimedia-14.0.0-cmake.spec4
3 files changed, 19 insertions, 4 deletions
diff --git a/redhat/main/tdebase/tdebase-14.0.0.spec b/redhat/main/tdebase/tdebase-14.0.0.spec
index af48b3492..6e0a03519 100644
--- a/redhat/main/tdebase/tdebase-14.0.0.spec
+++ b/redhat/main/tdebase/tdebase-14.0.0.spec
@@ -203,7 +203,15 @@ Requires: fedora-logos
# Fedora 25 Theme
%if 0%{?fedora} == 25
Requires: f25-backgrounds-base
-%define tde_bg /usr/share/backgrounds/f24/default/standard/f25.png
+%define tde_bg /usr/share/backgrounds/f25/default/standard/f25.png
+Requires: fedora-logos
+%define tde_starticon /usr/share/icons/hicolor/96x96/apps/fedora-logo-icon.png
+%endif
+
+# Fedora 26 Theme
+%if 0%{?fedora} == 26
+Requires: f26-backgrounds-base
+%define tde_bg /usr/share/backgrounds/f26/default/standard/f26.png
Requires: fedora-logos
%define tde_starticon /usr/share/icons/hicolor/96x96/apps/fedora-logo-icon.png
%endif
@@ -265,6 +273,13 @@ Requires: mageia-theme-Default
%define tde_starticon %{tde_datadir}/oxygen/scalable/mgabutton.svg
%endif
+# Mageia 6 Theme
+%if 0%{?mgaversion} == 6
+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
diff --git a/redhat/main/tdemultimedia/tdemultimedia-14.0.0-autotools.spec b/redhat/main/tdemultimedia/tdemultimedia-14.0.0-autotools.spec
index 6e8c2cf33..a6fc880f2 100644
--- a/redhat/main/tdemultimedia/tdemultimedia-14.0.0-autotools.spec
+++ b/redhat/main/tdemultimedia/tdemultimedia-14.0.0-autotools.spec
@@ -170,7 +170,7 @@ BuildRequires: libXxf86vm-devel
%endif
# XINE support
-%if 0%{?suse_version} || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?fedora} == 18 || 0%{?fedora} == 19 || 0%{?rhel} >= 5
+%if 0%{?suse_version} || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?fedora} || 0%{?rhel} >= 5
%define with_xine 1
%if 0%{?mgaversion} || 0%{?mdkversion}
%if 0%{?pclinuxos}
diff --git a/redhat/main/tdemultimedia/tdemultimedia-14.0.0-cmake.spec b/redhat/main/tdemultimedia/tdemultimedia-14.0.0-cmake.spec
index e8c261d10..de36dda1e 100644
--- a/redhat/main/tdemultimedia/tdemultimedia-14.0.0-cmake.spec
+++ b/redhat/main/tdemultimedia/tdemultimedia-14.0.0-cmake.spec
@@ -170,7 +170,7 @@ BuildRequires: libXxf86vm-devel
%endif
# XINE support
-%if 0%{?suse_version} || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?fedora} == 18 || 0%{?fedora} == 19 || 0%{?rhel} >= 5
+%if 0%{?suse_version} || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?fedora} || 0%{?rhel} >= 5
%define with_xine 1
%if 0%{?mgaversion} || 0%{?mdkversion}
%if 0%{?pclinuxos}
@@ -1089,7 +1089,7 @@ fi
-DBUILD_ALL=ON \
..
-%__make %{?_smp_mflags}
+%__make %{?_smp_mflags} || %__make
%install