RPM: merge redhat directory with master branch

2 files changed, 158 insertions, 209 deletions

diff --git a/redhat/main/tdeartwork/tdeartwork-14.0.0.spec b/redhat/main/tdeartwork/tdeartwork-14.0.0.spec
index 78ebaffcd..3d31f7233 100644
--- a/redhat/main/tdeartwork/tdeartwork-14.0.0.spec
+++ b/redhat/main/tdeartwork/tdeartwork-14.0.0.spec
@@ -1,5 +1,5 @@
 #
-# spec file for package tdeartwork (version R14.0.0)
+# spec file for package tdeartwork (version R14)
 #
 # Copyright (c) 2014 Trinity Desktop Environment
 #
@@ -12,7 +12,7 @@
 # license that conforms to the Open Source Definition (Version 1.9)
 # published by the Open Source Initiative.
 #
-# Please submit bugfixes or comments via http:/www.trinitydesktop.org/
+# Please submit bugfixes or comments via http://www.trinitydesktop.org/
 #
 
 # BUILD WARNING:
@@ -21,7 +21,9 @@
 
 # TDE variables
 %define tde_epoch 2
+%if "%{?tde_version}" == ""
 %define tde_version 14.0.0
+%endif
 %define tde_pkg tdeartwork
 %define tde_prefix /opt/trinity
 %define tde_bindir %{tde_prefix}/bin
@@ -39,7 +41,7 @@
 Name:		trinity-%{tde_pkg}
 Summary:	Additional artwork (themes, sound themes, ...) for TDE
 Version:	%{tde_version}
-Release:	%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}%{?_variant}
+Release:	%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}
 Group:		System/GUI/Other
 URL:		http://www.trinitydesktop.org/
 
@@ -74,6 +76,9 @@ BuildRequires:	libidn-devel
 # ESOUND support
 BuildRequires:	esound-devel
 
+# ACL support
+BuildRequires:	libacl-devel
+
 # MESA support
 %if 0%{?rhel} || 0%{?fedora}
 BuildRequires: mesa-libGL-devel
@@ -98,7 +103,7 @@ 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%{?suse_version} || 0%{?with_xscreensaver}
+%if 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?rhel} >= 5 || 0%{?suse_version}
 %define with_xscreensaver 1
 
 %if 0%{?fedora} || 0%{?rhel} >= 5
@@ -106,7 +111,7 @@ BuildRequires:	libXScrnSaver-devel
 BuildRequires:	xscreensaver
 BuildRequires:	xscreensaver-base
 BuildRequires:	xscreensaver-extras
-%if 0%{?fedora} || 0%{?rhel} >= 6
+%if 0%{?fedora}
 BuildRequires:	xscreensaver-extras-base
 %endif
 BuildRequires:	xscreensaver-gl-base
@@ -140,7 +145,7 @@ BuildRequires:	xscreensaver-gl
 %endif
 
 # JACK support
-%if 0%{?mgaversion} || 0%{?mdkversion} || 0%{?fedora} || 0%{?suse_version} || 0%{?with_jack}
+%if 0%{?mgaversion} || 0%{?mdkversion} || 0%{?fedora} || 0%{?suse_version} || 0%{?rhel}
 %define with_jack 1
 %if 0%{?mgaversion} || 0%{?mdkversion}
 %define jack_devel %{_lib}jack-devel
@@ -161,6 +166,9 @@ BuildRequires:	%{jack_devel}
 BuildRequires:	gamin-devel
 %endif
 
+# OPENSSL support
+BuildRequires:	openssl-devel
+
 
 # Metapackage
 Requires: %{name}-emoticons = %{version}-%{release}
@@ -273,18 +281,6 @@ This package is part of Trinity, and a component of the TDE artwork module.
 %{tde_datadir}/icons/locolor/index.theme
 %{tde_datadir}/icons/locolor/*/*/*.png
 
-%post theme-icon
-for i in locolor ikons kdeclassic kids slick ; do
- touch --no-create %{tde_datadir}/icons/$i 2>/dev/null || :
- gtk-update-icon-cache --quiet %{tde_datadir}/icons/$i 2>/dev/null || :
-done
-
-%postun theme-icon
-for i in locolor ikons kdeclassic kids slick ; do
- touch --no-create %{tde_datadir}/icons/$i 2>/dev/null || :
- gtk-update-icon-cache --quiet %{tde_datadir}/icons/$i 2>/dev/null || :
-done
-
 ##########
 
 %package theme-window
@@ -485,11 +481,38 @@ This package is part of Trinity, and a component of the TDE artwork module.
 %{tde_datadir}/applnk/System/ScreenSavers/cwaves.desktop
 %{tde_datadir}/applnk/System/ScreenSavers/topblock.desktop
 %{tde_datadir}/applnk/System/ScreenSavers/voronoi.desktop
+%if 0%{?rhel} >= 6 || 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?suse_version}
 %{tde_datadir}/applnk/System/ScreenSavers/cubicgrid.desktop
 %{tde_datadir}/applnk/System/ScreenSavers/hypnowheel.desktop
 %{tde_datadir}/applnk/System/ScreenSavers/lcdscrub.desktop
 %{tde_datadir}/applnk/System/ScreenSavers/photopile.desktop
 %{tde_datadir}/applnk/System/ScreenSavers/skytentacles.desktop
+%endif
+%if 0%{?rhel} == 5
+%{tde_datadir}/applnk/System/ScreenSavers/bubbles.desktop
+%{tde_datadir}/applnk/System/ScreenSavers/critical.desktop
+%{tde_datadir}/applnk/System/ScreenSavers/flag.desktop
+%{tde_datadir}/applnk/System/ScreenSavers/forest.desktop
+%{tde_datadir}/applnk/System/ScreenSavers/glforestfire.desktop
+%{tde_datadir}/applnk/System/ScreenSavers/hyperball.desktop
+%{tde_datadir}/applnk/System/ScreenSavers/hypercube.desktop
+%{tde_datadir}/applnk/System/ScreenSavers/juggle.desktop
+%{tde_datadir}/applnk/System/ScreenSavers/laser.desktop
+%{tde_datadir}/applnk/System/ScreenSavers/lightning.desktop
+%{tde_datadir}/applnk/System/ScreenSavers/lisa.desktop
+%{tde_datadir}/applnk/System/ScreenSavers/lissie.desktop
+%{tde_datadir}/applnk/System/ScreenSavers/lmorph.desktop
+%{tde_datadir}/applnk/System/ScreenSavers/mismunch.desktop
+%{tde_datadir}/applnk/System/ScreenSavers/rotor.desktop
+%{tde_datadir}/applnk/System/ScreenSavers/sphere.desktop
+%{tde_datadir}/applnk/System/ScreenSavers/spiral.desktop
+%{tde_datadir}/applnk/System/ScreenSavers/t3d.desktop
+%{tde_datadir}/applnk/System/ScreenSavers/vines.desktop
+%{tde_datadir}/applnk/System/ScreenSavers/whirlygig.desktop
+%{tde_datadir}/applnk/System/ScreenSavers/worm.desktop
+%endif
+
+%endif
 
 ##########
 
@@ -548,177 +571,122 @@ This package is part of Trinity, and a component of the TDE artwork module.
 
 %files -n trinity-tdescreensaver-xsavers-extra
 %defattr(-,root,root,-)
-%{tde_datadir}/applnk/System/ScreenSavers/anemone.desktop
-%{tde_datadir}/applnk/System/ScreenSavers/anemotaxis.desktop
-%{tde_datadir}/applnk/System/ScreenSavers/antmaze.desktop
-%{tde_datadir}/applnk/System/ScreenSavers/apollonian.desktop
-%{tde_datadir}/applnk/System/ScreenSavers/apple2.desktop
-%{tde_datadir}/applnk/System/ScreenSavers/atlantis.desktop
-%{tde_datadir}/applnk/System/ScreenSavers/attraction.desktop
-%{tde_datadir}/applnk/System/ScreenSavers/barcode.desktop
-%{tde_datadir}/applnk/System/ScreenSavers/blaster.desktop
-%{tde_datadir}/applnk/System/ScreenSavers/blitspin.desktop
-%{tde_datadir}/applnk/System/ScreenSavers/blocktube.desktop
-%{tde_datadir}/applnk/System/ScreenSavers/boing.desktop
-%{tde_datadir}/applnk/System/ScreenSavers/bouboule.desktop
-%{tde_datadir}/applnk/System/ScreenSavers/bouncingcow.desktop
-%{tde_datadir}/applnk/System/ScreenSavers/boxed.desktop
-%{tde_datadir}/applnk/System/ScreenSavers/boxfit.desktop
-%{tde_datadir}/applnk/System/ScreenSavers/bsod.desktop
-%{tde_datadir}/applnk/System/ScreenSavers/bumps.desktop
-%{tde_datadir}/applnk/System/ScreenSavers/cage.desktop
-%{tde_datadir}/applnk/System/ScreenSavers/carousel.desktop
-%{tde_datadir}/applnk/System/ScreenSavers/ccurve.desktop
-%{tde_datadir}/applnk/System/ScreenSavers/celtic.desktop
-%{tde_datadir}/applnk/System/ScreenSavers/cloudlife.desktop
-%{tde_datadir}/applnk/System/ScreenSavers/compass.desktop
-%{tde_datadir}/applnk/System/ScreenSavers/coral.desktop
-%{tde_datadir}/applnk/System/ScreenSavers/crackberg.desktop
-%{tde_datadir}/applnk/System/ScreenSavers/crystal.desktop
-%{tde_datadir}/applnk/System/ScreenSavers/cube21.desktop
-%{tde_datadir}/applnk/System/ScreenSavers/cubenetic.desktop
-%{tde_datadir}/applnk/System/ScreenSavers/cynosure.desktop
-%{tde_datadir}/applnk/System/ScreenSavers/dangerball.desktop
-%{tde_datadir}/applnk/System/ScreenSavers/decayscreen.desktop
-%{tde_datadir}/applnk/System/ScreenSavers/deluxe.desktop
-%{tde_datadir}/applnk/System/ScreenSavers/demon.desktop
-%{tde_datadir}/applnk/System/ScreenSavers/discrete.desktop
-%{tde_datadir}/applnk/System/ScreenSavers/drift.desktop
-%{tde_datadir}/applnk/System/ScreenSavers/epicycle.desktop
-%{tde_datadir}/applnk/System/ScreenSavers/eruption.desktop
-%{tde_datadir}/applnk/System/ScreenSavers/euler2d.desktop
-%if 0%{?rhel} != 7
-%{tde_datadir}/applnk/System/ScreenSavers/extrusion.desktop
-%endif
-%{tde_datadir}/applnk/System/ScreenSavers/fadeplot.desktop
-%{tde_datadir}/applnk/System/ScreenSavers/fireworkx.desktop
-%{tde_datadir}/applnk/System/ScreenSavers/flame.desktop
-%{tde_datadir}/applnk/System/ScreenSavers/fliptext.desktop
-%{tde_datadir}/applnk/System/ScreenSavers/flow.desktop
-%{tde_datadir}/applnk/System/ScreenSavers/fluidballs.desktop
-%{tde_datadir}/applnk/System/ScreenSavers/flurry.desktop
-%{tde_datadir}/applnk/System/ScreenSavers/fontglide.desktop
-%{tde_datadir}/applnk/System/ScreenSavers/glhanoi.desktop
-%{tde_datadir}/applnk/System/ScreenSavers/glplanet.desktop
-%{tde_datadir}/applnk/System/ScreenSavers/goop.desktop
-%{tde_datadir}/applnk/System/ScreenSavers/grav.desktop
-%{tde_datadir}/applnk/System/ScreenSavers/greynetic.desktop
-%{tde_datadir}/applnk/System/ScreenSavers/halftone.desktop
-%{tde_datadir}/applnk/System/ScreenSavers/halo.desktop
-%{tde_datadir}/applnk/System/ScreenSavers/helix.desktop
-%{tde_datadir}/applnk/System/ScreenSavers/hopalong.desktop
-%{tde_datadir}/applnk/System/ScreenSavers/ifs.desktop
-%{tde_datadir}/applnk/System/ScreenSavers/imsmap.desktop
-%{tde_datadir}/applnk/System/ScreenSavers/interaggregate.desktop
-%{tde_datadir}/applnk/System/ScreenSavers/interference.desktop
-%{tde_datadir}/applnk/System/ScreenSavers/intermomentary.desktop
-%{tde_datadir}/applnk/System/ScreenSavers/jigsaw.desktop
-%{tde_datadir}/applnk/System/ScreenSavers/juggler3d.desktop
-%{tde_datadir}/applnk/System/ScreenSavers/julia.desktop
-%{tde_datadir}/applnk/System/ScreenSavers/kaleidescope.desktop
-%{tde_datadir}/applnk/System/ScreenSavers/klein.desktop
-%{tde_datadir}/applnk/System/ScreenSavers/kumppa.desktop
-%{tde_datadir}/applnk/System/ScreenSavers/lament.desktop
-%{tde_datadir}/applnk/System/ScreenSavers/loop.desktop
-%{tde_datadir}/applnk/System/ScreenSavers/maze.desktop
-%{tde_datadir}/applnk/System/ScreenSavers/memscroller.desktop
-%{tde_datadir}/applnk/System/ScreenSavers/menger.desktop
-%{tde_datadir}/applnk/System/ScreenSavers/moire.desktop
-%{tde_datadir}/applnk/System/ScreenSavers/moire2.desktop
-%{tde_datadir}/applnk/System/ScreenSavers/mountain.desktop
-%{tde_datadir}/applnk/System/ScreenSavers/munch.desktop
-%{tde_datadir}/applnk/System/ScreenSavers/nerverot.desktop
-%{tde_datadir}/applnk/System/ScreenSavers/noof.desktop
-%{tde_datadir}/applnk/System/ScreenSavers/noseguy.desktop
-%{tde_datadir}/applnk/System/ScreenSavers/pacman.desktop
-%{tde_datadir}/applnk/System/ScreenSavers/pedal.desktop
-%{tde_datadir}/applnk/System/ScreenSavers/penetrate.desktop
-%{tde_datadir}/applnk/System/ScreenSavers/petri.desktop
-%{tde_datadir}/applnk/System/ScreenSavers/phosphor.desktop
-%{tde_datadir}/applnk/System/ScreenSavers/piecewise.desktop
-%{tde_datadir}/applnk/System/ScreenSavers/pinion.desktop
-%{tde_datadir}/applnk/System/ScreenSavers/polyominoes.desktop
-%{tde_datadir}/applnk/System/ScreenSavers/pong.desktop
-%{tde_datadir}/applnk/System/ScreenSavers/providence.desktop
-%{tde_datadir}/applnk/System/ScreenSavers/pyro.desktop
-%{tde_datadir}/applnk/System/ScreenSavers/qix.desktop
-%{tde_datadir}/applnk/System/ScreenSavers/rd-bomb.desktop
-%{tde_datadir}/applnk/System/ScreenSavers/rocks.desktop
-%{tde_datadir}/applnk/System/ScreenSavers/rorschach.desktop
-%{tde_datadir}/applnk/System/ScreenSavers/rotzoomer.desktop
-%{tde_datadir}/applnk/System/ScreenSavers/rubik.desktop
-%{tde_datadir}/applnk/System/ScreenSavers/sballs.desktop
-%{tde_datadir}/applnk/System/ScreenSavers/sierpinski.desktop
-%{tde_datadir}/applnk/System/ScreenSavers/slip.desktop
-%{tde_datadir}/applnk/System/ScreenSavers/speedmine.desktop
-%{tde_datadir}/applnk/System/ScreenSavers/spotlight.desktop
-%{tde_datadir}/applnk/System/ScreenSavers/sproingies.desktop
-%{tde_datadir}/applnk/System/ScreenSavers/squiral.desktop
-%{tde_datadir}/applnk/System/ScreenSavers/stairs.desktop
-%{tde_datadir}/applnk/System/ScreenSavers/starfish.desktop
-%{tde_datadir}/applnk/System/ScreenSavers/starwars.desktop
-%{tde_datadir}/applnk/System/ScreenSavers/strange.desktop
-%{tde_datadir}/applnk/System/ScreenSavers/substrate.desktop
-%{tde_datadir}/applnk/System/ScreenSavers/tangram.desktop
-%{tde_datadir}/applnk/System/ScreenSavers/thornbird.desktop
-%{tde_datadir}/applnk/System/ScreenSavers/timetunnel.desktop
-%{tde_datadir}/applnk/System/ScreenSavers/triangle.desktop
-%{tde_datadir}/applnk/System/ScreenSavers/truchet.desktop
-%{tde_datadir}/applnk/System/ScreenSavers/twang.desktop
-%{tde_datadir}/applnk/System/ScreenSavers/vermiculate.desktop
-%{tde_datadir}/applnk/System/ScreenSavers/wander.desktop
-%{tde_datadir}/applnk/System/ScreenSavers/whirlwindwarp.desktop
-%{tde_datadir}/applnk/System/ScreenSavers/wormhole.desktop
-%{tde_datadir}/applnk/System/ScreenSavers/xanalogtv.desktop
-%{tde_datadir}/applnk/System/ScreenSavers/xflame.desktop
-%{tde_datadir}/applnk/System/ScreenSavers/xrayswarm.desktop
-%{tde_datadir}/applnk/System/ScreenSavers/xspirograph.desktop
-%{tde_datadir}/applnk/System/ScreenSavers/zoom.desktop
-
-# These screensavers do not exist on OpenSuse
-%if 0%{?rhel} || 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion}
-%{tde_datadir}/applnk/System/ScreenSavers/vidwhacker.desktop
-%endif
-
-# These screensavers do not exist on Mageia / Mandriva
-%if 0%{?rhel} || 0%{?fedora} || 0%{?suse_version}
-%{tde_datadir}/applnk/System/ScreenSavers/glmatrix.desktop
-%{tde_datadir}/applnk/System/ScreenSavers/xjack.desktop
-%{tde_datadir}/applnk/System/ScreenSavers/xmatrix.desktop
-%endif
-
-%if 0%{?rhel} >= 6 || 0%{?mgaversion} || 0%{?fedora} >= 15 || 0%{?pclinuxos}
-%{tde_datadir}/applnk/System/ScreenSavers/rubikblocks.desktop
-%{tde_datadir}/applnk/System/ScreenSavers/surfaces.desktop
-%endif
-
-%if 0%{?mgaversion} || 0%{?rhel} >= 7 || 0%{?fedora} >= 15 || 0%{?pclinuxos}
-%{tde_datadir}/applnk/System/ScreenSavers/companioncube.desktop
-%{tde_datadir}/applnk/System/ScreenSavers/hilbert.desktop
-%{tde_datadir}/applnk/System/ScreenSavers/tronbit.desktop
-%endif
-
-%if 0%{?fedora} >= 20 || 0%{?pclinuxos} || 0%{?mgaversion} >= 4 || 0%{?rhel} >= 7
-%{tde_datadir}/applnk/System/ScreenSavers/hexadrop.desktop
-%{tde_datadir}/applnk/System/ScreenSavers/kaleidocycle.desktop
-%{tde_datadir}/applnk/System/ScreenSavers/quasicrystal.desktop
-%{tde_datadir}/applnk/System/ScreenSavers/unknownpleasures.desktop
-%endif
-
-%if 0%{?fedora} >= 20 || 0%{?mgaversion} >= 4 || 0%{?rhel} >= 7
-%{tde_datadir}/applnk/System/ScreenSavers/geodesic.desktop
-%endif
-
-%if 0%{?fedora} >= 20 || 0%{?rhel} >= 7
-%{tde_datadir}/applnk/System/ScreenSavers/projectiveplane.desktop
-%{tde_datadir}/applnk/System/ScreenSavers/tessellimage.desktop
-%endif
-
-%if 0%{?fedora} >= 20
-%{tde_datadir}/applnk/System/ScreenSavers/winduprobot.desktop
-%endif
-
-%endif
+%exclude %{tde_datadir}/applnk/System/ScreenSavers/webcollage.desktop
+%exclude %{tde_datadir}/applnk/System/ScreenSavers/antinspect.desktop
+%exclude %{tde_datadir}/applnk/System/ScreenSavers/antspotlight.desktop
+%exclude %{tde_datadir}/applnk/System/ScreenSavers/atunnel.desktop
+%exclude %{tde_datadir}/applnk/System/ScreenSavers/blinkbox.desktop
+%exclude %{tde_datadir}/applnk/System/ScreenSavers/braid.desktop
+%exclude %{tde_datadir}/applnk/System/ScreenSavers/bubble3d.desktop
+%exclude %{tde_datadir}/applnk/System/ScreenSavers/circuit.desktop
+%exclude %{tde_datadir}/applnk/System/ScreenSavers/cubestorm.desktop
+%exclude %{tde_datadir}/applnk/System/ScreenSavers/deco.desktop
+%exclude %{tde_datadir}/applnk/System/ScreenSavers/distort.desktop
+%exclude %{tde_datadir}/applnk/System/ScreenSavers/endgame.desktop
+%exclude %{tde_datadir}/applnk/System/ScreenSavers/engine.desktop
+%exclude %{tde_datadir}/applnk/System/ScreenSavers/fiberlamp.desktop
+%exclude %{tde_datadir}/applnk/System/ScreenSavers/flipflop.desktop
+%exclude %{tde_datadir}/applnk/System/ScreenSavers/flipscreen3d.desktop
+%exclude %{tde_datadir}/applnk/System/ScreenSavers/flyingtoasters.desktop
+%exclude %{tde_datadir}/applnk/System/ScreenSavers/fuzzyflakes.desktop
+%exclude %{tde_datadir}/applnk/System/ScreenSavers/galaxy.desktop
+%exclude %{tde_datadir}/applnk/System/ScreenSavers/gears.desktop
+%exclude %{tde_datadir}/applnk/System/ScreenSavers/gflux.desktop
+%exclude %{tde_datadir}/applnk/System/ScreenSavers/glblur.desktop
+%exclude %{tde_datadir}/applnk/System/ScreenSavers/gleidescope.desktop
+%exclude %{tde_datadir}/applnk/System/ScreenSavers/glknots.desktop
+%exclude %{tde_datadir}/applnk/System/ScreenSavers/glslideshow.desktop
+%exclude %{tde_datadir}/applnk/System/ScreenSavers/glsnake.desktop
+%exclude %{tde_datadir}/applnk/System/ScreenSavers/gltext.desktop
+%exclude %{tde_datadir}/applnk/System/ScreenSavers/hypertorus.desktop
+%exclude %{tde_datadir}/applnk/System/ScreenSavers/jigglypuff.desktop
+%exclude %{tde_datadir}/applnk/System/ScreenSavers/lavalite.desktop
+%exclude %{tde_datadir}/applnk/System/ScreenSavers/metaballs.desktop
+%exclude %{tde_datadir}/applnk/System/ScreenSavers/mirrorblob.desktop
+%exclude %{tde_datadir}/applnk/System/ScreenSavers/moebius.desktop
+%exclude %{tde_datadir}/applnk/System/ScreenSavers/molecule.desktop
+%exclude %{tde_datadir}/applnk/System/ScreenSavers/morph3d.desktop
+%exclude %{tde_datadir}/applnk/System/ScreenSavers/penrose.desktop
+%exclude %{tde_datadir}/applnk/System/ScreenSavers/pipes.desktop
+%exclude %{tde_datadir}/applnk/System/ScreenSavers/polyhedra.desktop
+%exclude %{tde_datadir}/applnk/System/ScreenSavers/polytopes.desktop
+%exclude %{tde_datadir}/applnk/System/ScreenSavers/popsquares.desktop
+%exclude %{tde_datadir}/applnk/System/ScreenSavers/pulsar.desktop
+%exclude %{tde_datadir}/applnk/System/ScreenSavers/queens.desktop
+%exclude %{tde_datadir}/applnk/System/ScreenSavers/ripples.desktop
+%exclude %{tde_datadir}/applnk/System/ScreenSavers/shadebobs.desktop
+%exclude %{tde_datadir}/applnk/System/ScreenSavers/sierpinski3d.desktop
+%exclude %{tde_datadir}/applnk/System/ScreenSavers/slidescreen.desktop
+%exclude %{tde_datadir}/applnk/System/ScreenSavers/sonar.desktop
+%exclude %{tde_datadir}/applnk/System/ScreenSavers/spheremonics.desktop
+%exclude %{tde_datadir}/applnk/System/ScreenSavers/stonerview.desktop
+%exclude %{tde_datadir}/applnk/System/ScreenSavers/superquadrics.desktop
+%exclude %{tde_datadir}/applnk/System/ScreenSavers/swirl.desktop
+%exclude %{tde_datadir}/applnk/System/ScreenSavers/xlyap.desktop
+%exclude %{tde_datadir}/applnk/System/ScreenSavers/m6502.desktop
+%exclude %{tde_datadir}/applnk/System/ScreenSavers/glschool.desktop
+%exclude %{tde_datadir}/applnk/System/ScreenSavers/moebiusgears.desktop
+%exclude %{tde_datadir}/applnk/System/ScreenSavers/glcells.desktop
+%exclude %{tde_datadir}/applnk/System/ScreenSavers/abstractile.desktop
+%exclude %{tde_datadir}/applnk/System/ScreenSavers/lockward.desktop
+%exclude %{tde_datadir}/applnk/System/ScreenSavers/cwaves.desktop
+%exclude %{tde_datadir}/applnk/System/ScreenSavers/topblock.desktop
+%exclude %{tde_datadir}/applnk/System/ScreenSavers/voronoi.desktop
+%if 0%{?rhel} >= 6 || 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?suse_version}
+%exclude %{tde_datadir}/applnk/System/ScreenSavers/cubicgrid.desktop
+%exclude %{tde_datadir}/applnk/System/ScreenSavers/hypnowheel.desktop
+%exclude %{tde_datadir}/applnk/System/ScreenSavers/lcdscrub.desktop
+%exclude %{tde_datadir}/applnk/System/ScreenSavers/photopile.desktop
+%exclude %{tde_datadir}/applnk/System/ScreenSavers/skytentacles.desktop
+%endif
+%if 0%{?rhel} == 5
+%exclude %{tde_datadir}/applnk/System/ScreenSavers/bubbles.desktop
+%exclude %{tde_datadir}/applnk/System/ScreenSavers/critical.desktop
+%exclude %{tde_datadir}/applnk/System/ScreenSavers/flag.desktop
+%exclude %{tde_datadir}/applnk/System/ScreenSavers/forest.desktop
+%exclude %{tde_datadir}/applnk/System/ScreenSavers/glforestfire.desktop
+%exclude %{tde_datadir}/applnk/System/ScreenSavers/hyperball.desktop
+%exclude %{tde_datadir}/applnk/System/ScreenSavers/hypercube.desktop
+%exclude %{tde_datadir}/applnk/System/ScreenSavers/juggle.desktop
+%exclude %{tde_datadir}/applnk/System/ScreenSavers/laser.desktop
+%exclude %{tde_datadir}/applnk/System/ScreenSavers/lightning.desktop
+%exclude %{tde_datadir}/applnk/System/ScreenSavers/lisa.desktop
+%exclude %{tde_datadir}/applnk/System/ScreenSavers/lissie.desktop
+%exclude %{tde_datadir}/applnk/System/ScreenSavers/lmorph.desktop
+%exclude %{tde_datadir}/applnk/System/ScreenSavers/mismunch.desktop
+%exclude %{tde_datadir}/applnk/System/ScreenSavers/rotor.desktop
+%exclude %{tde_datadir}/applnk/System/ScreenSavers/sphere.desktop
+%exclude %{tde_datadir}/applnk/System/ScreenSavers/spiral.desktop
+%exclude %{tde_datadir}/applnk/System/ScreenSavers/t3d.desktop
+%exclude %{tde_datadir}/applnk/System/ScreenSavers/vines.desktop
+%exclude %{tde_datadir}/applnk/System/ScreenSavers/whirlygig.desktop
+%exclude %{tde_datadir}/applnk/System/ScreenSavers/worm.desktop
+%endif
+
+%exclude %{tde_datadir}/applnk/System/ScreenSavers/KBanner.desktop
+%exclude %{tde_datadir}/applnk/System/ScreenSavers/KBlob.desktop
+%exclude %{tde_datadir}/applnk/System/ScreenSavers/KClock.desktop
+%exclude %{tde_datadir}/applnk/System/ScreenSavers/KEuphoria.desktop
+%exclude %{tde_datadir}/applnk/System/ScreenSavers/KFiresaver.desktop
+%exclude %{tde_datadir}/applnk/System/ScreenSavers/KFlux.desktop
+%exclude %{tde_datadir}/applnk/System/ScreenSavers/KFountain.desktop
+%exclude %{tde_datadir}/applnk/System/ScreenSavers/KGravity.desktop
+%exclude %{tde_datadir}/applnk/System/ScreenSavers/KLines-saver.desktop
+%exclude %{tde_datadir}/applnk/System/ScreenSavers/KLorenz.desktop
+%exclude %{tde_datadir}/applnk/System/ScreenSavers/KPendulum.desktop
+%exclude %{tde_datadir}/applnk/System/ScreenSavers/KPolygon.desktop
+%exclude %{tde_datadir}/applnk/System/ScreenSavers/KRotation.desktop
+%exclude %{tde_datadir}/applnk/System/ScreenSavers/KScience.desktop
+%exclude %{tde_datadir}/applnk/System/ScreenSavers/KSlideshow.desktop
+%exclude %{tde_datadir}/applnk/System/ScreenSavers/KSolarWinds.desktop
+%exclude %{tde_datadir}/applnk/System/ScreenSavers/KVm.desktop
+%exclude %{tde_datadir}/applnk/System/ScreenSavers/KWave.desktop
+%exclude %{tde_datadir}/applnk/System/ScreenSavers/tdepartsaver.desktop
+
+%exclude %{tde_datadir}/applnk/System/ScreenSavers/KSpace.desktop
+%exclude %{tde_datadir}/applnk/System/ScreenSavers/KSwarm.desktop
+
+%{tde_datadir}/applnk/System/ScreenSavers/*.desktop
 
 ##########
 
@@ -796,18 +764,9 @@ chmod +x "%{?buildroot}%{tde_bindir}/xscreensaver-getimage"
 chmod +x "%{?buildroot}%{tde_bindir}/xscreensaver-getimage-file"
 %endif
 
-# Fix missing screensavers on Fedora 20
-%if 0%{?with_xscreensaver} &&  0%{?fedora} >= 20
-touch "%{?buildroot}%{tde_datadir}/applnk/System/ScreenSavers/projectiveplane.desktop"
-touch "%{?buildroot}%{tde_datadir}/applnk/System/ScreenSavers/tessellimage.desktop"
-touch "%{?buildroot}%{tde_datadir}/applnk/System/ScreenSavers/winduprobot.desktop"
-%endif
-
 
 %clean
 %__rm -rf %{buildroot}
 
 
 %changelog
-* Fri Jul 05 2013 Francois Andriot <francois.andriot@free.fr> - 14.0.0-1
-- Initial release for TDE R14.0.0
diff --git a/redhat/main/tdeartwork/tdeartwork-3.5.13.2.spec b/redhat/main/tdeartwork/tdeartwork-3.5.13.2.spec
index 87f00043e..e1d12b94c 100644
--- a/redhat/main/tdeartwork/tdeartwork-3.5.13.2.spec
+++ b/redhat/main/tdeartwork/tdeartwork-3.5.13.2.spec
@@ -1,8 +1,3 @@
-# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt".
-%if "%{?tde_prefix}" != "/usr"
-%define _variant .opt
-%endif
-
 %define tde_version 3.5.13.2
 
 # TDE specific building variables
@@ -23,7 +18,7 @@
 Name:			trinity-tdeartwork
 Summary:		Additional artwork (themes, sound themes, ...) for TDE
 Version:		%{tde_version}
-Release:		%{?!preversion:2}%{?preversion:1_%{preversion}}%{?dist}%{?_variant}
+Release:		%{?!preversion:2}%{?preversion:1_%{preversion}}%{?dist}
 
 License:	GPLv2
 Group:		User Interface/Desktops
@@ -747,8 +742,3 @@ export PATH="%{tde_bindir}:${PATH}"
 
 
 %changelog
-* Fri Aug 16 2013 Francois Andriot <francois.andriot@free.fr> - 3.5.13.2-2
-- Build for Fedora 19
-
-* Mon Jun 03 2013 Francois Andriot <francois.andriot@free.fr> - 3.5.13.2-1
-- Initial release for TDE 3.5.13.2