summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFrançois Andriot <albator78@libertysurf.fr>2014-11-02 13:54:49 +0100
committerFrançois Andriot <albator78@libertysurf.fr>2014-11-02 13:54:49 +0100
commitbadca07466722ee8736bdfb4590c3192bc0cee91 (patch)
treec470bcb82fbb772c1018323dac2c4056fafa8c6d
parent6ff4a682ecaab4dc13e484ba0d42abc3465b3a3f (diff)
downloadtde-packaging-badca07466722ee8736bdfb4590c3192bc0cee91.tar.gz
tde-packaging-badca07466722ee8736bdfb4590c3192bc0cee91.zip
RPM Packaging: update tdeartwork
-rw-r--r--redhat/tdeartwork/tdeartwork-14.0.0.spec19
1 files changed, 17 insertions, 2 deletions
diff --git a/redhat/tdeartwork/tdeartwork-14.0.0.spec b/redhat/tdeartwork/tdeartwork-14.0.0.spec
index d96fbc47a..c870618ef 100644
--- a/redhat/tdeartwork/tdeartwork-14.0.0.spec
+++ b/redhat/tdeartwork/tdeartwork-14.0.0.spec
@@ -73,7 +73,18 @@ BuildRequires: gettext
# ESOUND support
BuildRequires: esound-devel
-# OpenGL support
+# MESA support
+%if 0%{?rhel} || 0%{?fedora}
+BuildRequires: mesa-libGL-devel
+BuildRequires: mesa-libGLU-devel
+%endif
+%if 0%{?mdkversion} || 0%{?mgaversion}
+BuildRequires: mesaglu-devel
+%endif
+%if 0%{?suse_version}
+BuildRequires: Mesa-libGL-devel
+BuildRequires: Mesa-libGLU-devel
+%endif
%if 0%{?rhel} == 4
BuildRequires: xorg-x11-Mesa-libGLU
%endif
@@ -83,7 +94,8 @@ BuildRequires: xorg-x11-Mesa-libGLU
BuildRequires: libart_lgpl-devel
# XSCREENSAVER support
-%if 0%{?fedora} >= 15 || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?rhel} >= 6 || 0%{?suse_version} || 0%{?with_xscreensaver}
+# Disabled on RHEL4, RHEL < 7
+%if 0%{?fedora} >= 15 || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?rhel} >= 7 || 0%{?suse_version} || 0%{?with_xscreensaver}
%if 0%{?rhel} == 0 || 0%{?rhel} <= 6 || 0%{?with_xscreensaver}
%define with_xscreensaver 1
@@ -764,6 +776,9 @@ export PATH="%{tde_bindir}:${PATH}"
%__rm -f %{?buildroot}%{tde_datadir}/icons/locolor/16x16/apps/kbabel.png
%__rm -f %{?buildroot}%{tde_datadir}/icons/locolor/32x32/apps/kbabel.png
+# Links duplicate files
+%fdupes "%{?buildroot}%{tde_datadir}"
+
%clean
%__rm -rf %{buildroot}