summaryrefslogtreecommitdiffstats
path: root/redhat/main/tdeartwork
diff options
context:
space:
mode:
authorFrançois Andriot <albator78@libertysurf.fr>2015-08-30 12:27:30 +0200
committerFrançois Andriot <albator78@libertysurf.fr>2015-08-30 12:27:30 +0200
commit972e86c4ebf80d36fffc6c9d02a3d1596ca61fb2 (patch)
treeab6620583bc880bd61cceb0058ecc1f7e896b992 /redhat/main/tdeartwork
parente5f2386a7884932cffd7c862b6ddedbd2e8a6810 (diff)
downloadtde-packaging-972e86c4ebf80d36fffc6c9d02a3d1596ca61fb2.tar.gz
tde-packaging-972e86c4ebf80d36fffc6c9d02a3d1596ca61fb2.zip
RPM packaging: massive update SPEC files
Diffstat (limited to 'redhat/main/tdeartwork')
-rw-r--r--redhat/main/tdeartwork/tdeartwork-14.0.0.spec14
-rw-r--r--redhat/main/tdeartwork/tdeartwork-3.5.13.2.spec7
2 files changed, 8 insertions, 13 deletions
diff --git a/redhat/main/tdeartwork/tdeartwork-14.0.0.spec b/redhat/main/tdeartwork/tdeartwork-14.0.0.spec
index 899dfdab3..2cb253234 100644
--- a/redhat/main/tdeartwork/tdeartwork-14.0.0.spec
+++ b/redhat/main/tdeartwork/tdeartwork-14.0.0.spec
@@ -37,16 +37,11 @@
%define tde_tdeincludedir %{tde_includedir}/tde
%define tde_tdelibdir %{tde_libdir}/trinity
-# 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
-
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/
@@ -749,13 +744,18 @@ This package is part of Trinity, and a component of the TDE artwork module.
%{tde_datadir}/applnk/System/ScreenSavers/tessellimage.desktop
%endif
-%if 0%{?fedora} >= 20
+%if 0%{?fedora} >= 20 || 0%{?pclinuxos}
%{tde_datadir}/applnk/System/ScreenSavers/winduprobot.desktop
%{tde_datadir}/applnk/System/ScreenSavers/binaryring.desktop
%{tde_datadir}/applnk/System/ScreenSavers/cityflow.desktop
%{tde_datadir}/applnk/System/ScreenSavers/geodesicgears.desktop
%endif
+%if 0%{?pclinuxos} || 0%{?fedora} >= 21
+%{tde_datadir}/applnk/System/ScreenSavers/romanboy.desktop
+%{tde_datadir}/applnk/System/ScreenSavers/splitflap.desktop
+%endif
+
%endif
##########
diff --git a/redhat/main/tdeartwork/tdeartwork-3.5.13.2.spec b/redhat/main/tdeartwork/tdeartwork-3.5.13.2.spec
index 87f00043e..02f892fae 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