RPM: merge redhat directory with master branch

2 files changed, 13 insertions, 88 deletions

diff --git a/redhat/main/tdetoys/tdetoys-14.0.0.spec b/redhat/main/tdetoys/tdetoys-14.0.0.spec
index 28f168bb5..26898ec16 100644
--- a/redhat/main/tdetoys/tdetoys-14.0.0.spec
+++ b/redhat/main/tdetoys/tdetoys-14.0.0.spec
@@ -1,5 +1,5 @@
 #
-# spec file for package tdetoys (version R14.0.0)
+# spec file for package tdetoys (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:
@@ -20,7 +20,9 @@
 #  Having KDE libraries may cause FTBFS here !
 
 # TDE variables
+%if "%{?tde_version}" == ""
 %define tde_version 14.0.0
+%endif
 %define tde_pkg tdetoys
 %define tde_prefix /opt/trinity
 %define tde_bindir %{tde_prefix}/bin
@@ -33,16 +35,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:	Trinity Desktop Environment - Toys and Amusements
 Version:	%{tde_version}
-Release:	%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}%{?_variant}
+Release:	%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}
 Group:		Amusements/Graphics
 URL:		http://www.trinitydesktop.org/
 
@@ -93,9 +90,16 @@ BuildRequires:	libidn-devel
 BuildRequires:	gamin-devel
 %endif
 
+# ACL support
+BuildRequires:	libacl-devel
+
 # PCRE support
 BuildRequires:	pcre-devel
 
+# OPENSSL support
+BuildRequires:	openssl-devel
+
+
 Obsoletes:		trinity-kdetoys < %{version}-%{release}
 Provides:		trinity-kdetoys = %{version}-%{release}
 
@@ -155,16 +159,6 @@ This package is part of Trinity, and a component of the TDE toys module.
 %{tde_tdedocdir}/HTML/en/amor/
 %doc AUTHORS COPYING README
 
-%post -n trinity-amor
-touch --no-create %{tde_datadir}/icons/hicolor ||:
-gtk-update-icon-cache -q %{tde_datadir}/icons/hicolor 2> /dev/null ||:
-update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
-
-%postun -n trinity-amor
-touch --no-create %{tde_datadir}/icons/hicolor ||:
-gtk-update-icon-cache -q %{tde_datadir}/icons/hicolor 2> /dev/null ||:
-update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
-
 ##########
 
 %package -n trinity-eyesapplet
@@ -229,14 +223,6 @@ This package is part of Trinity, and a component of the TDE toys module.
 %{tde_tdedocdir}/HTML/en/kmoon/
 %doc AUTHORS COPYING README
 
-%post -n trinity-kmoon
-touch --no-create %{tde_datadir}/icons/hicolor ||:
-gtk-update-icon-cache -q %{tde_datadir}/icons/hicolor 2> /dev/null ||:
-
-%postun
-touch --no-create %{tde_datadir}/icons/hicolor ||:
-gtk-update-icon-cache -q %{tde_datadir}/icons/hicolor 2> /dev/null ||:
-
 ##########
 
 %package -n trinity-kodo
@@ -259,16 +245,6 @@ This package is part of Trinity, and a component of the TDE toys module.
 %{tde_tdedocdir}/HTML/en/kodo/
 %doc AUTHORS COPYING README
 
-%post -n trinity-kodo
-touch --no-create %{tde_datadir}/icons/hicolor ||:
-gtk-update-icon-cache -q %{tde_datadir}/icons/hicolor 2> /dev/null ||:
-update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
-
-%postun -n trinity-kodo
-touch --no-create %{tde_datadir}/icons/hicolor ||:
-gtk-update-icon-cache -q %{tde_datadir}/icons/hicolor 2> /dev/null ||:
-update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
-
 ##########
 
 %package -n trinity-kteatime
@@ -298,16 +274,6 @@ This package is part of Trinity, and a component of the TDE toys module.
 %{tde_tdedocdir}/HTML/en/kteatime/
 %doc AUTHORS COPYING README
 
-%post -n trinity-kteatime
-touch --no-create %{tde_datadir}/icons/hicolor ||:
-gtk-update-icon-cache -q %{tde_datadir}/icons/hicolor 2> /dev/null ||:
-update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
-
-%postun -n trinity-kteatime
-touch --no-create %{tde_datadir}/icons/hicolor ||:
-gtk-update-icon-cache -q %{tde_datadir}/icons/hicolor 2> /dev/null ||:
-update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
-
 ##########
 
 %package -n trinity-ktux
@@ -327,14 +293,6 @@ This package is part of Trinity, and a component of the TDE toys module.
 %{tde_datadir}/icons/hicolor/*/apps/ktux.png
 %doc AUTHORS COPYING README
 
-%post -n trinity-ktux
-touch --no-create %{tde_datadir}/icons/hicolor ||:
-gtk-update-icon-cache -q %{tde_datadir}/icons/hicolor 2> /dev/null ||:
-
-%postun -n trinity-ktux
-touch --no-create %{tde_datadir}/icons/hicolor ||:
-gtk-update-icon-cache -q %{tde_datadir}/icons/hicolor 2> /dev/null ||:
-
 ##########
 
 %package -n trinity-kweather
@@ -378,16 +336,6 @@ This package is part of Trinity, and a component of the TDE toys module.
 %{tde_tdedocdir}/HTML/en/kweather/
 %doc AUTHORS COPYING README
 
-%post -n trinity-kweather
-touch --no-create %{tde_datadir}/icons/hicolor ||:
-gtk-update-icon-cache -q %{tde_datadir}/icons/hicolor 2> /dev/null ||:
-update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
-
-%postun -n trinity-kweather
-touch --no-create %{tde_datadir}/icons/hicolor ||:
-gtk-update-icon-cache -q %{tde_datadir}/icons/hicolor 2> /dev/null ||:
-update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
-
 ##########
 
 %package -n trinity-kworldclock
@@ -420,16 +368,6 @@ This package is part of Trinity, and a component of the TDE toys module.
 %{tde_tdedocdir}/HTML/en/kworldclock/
 %doc AUTHORS COPYING README
 
-%post -n trinity-kworldclock
-touch --no-create %{tde_datadir}/icons/hicolor ||:
-gtk-update-icon-cache -q %{tde_datadir}/icons/hicolor 2> /dev/null ||:
-update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
-
-%postun -n trinity-kworldclock
-touch --no-create %{tde_datadir}/icons/hicolor ||:
-gtk-update-icon-cache -q %{tde_datadir}/icons/hicolor 2> /dev/null ||:
-update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
-
 ##########
 
 %if 0%{?pclinuxos} || 0%{?suse_version} && 0%{?opensuse_bs} == 0
@@ -497,5 +435,3 @@ export PATH="%{tde_bindir}:${PATH}"
 
 
 %changelog
-* Fri Jul 05 2013 Francois Andriot <francois.andriot@free.fr> - 14.0.0-1
-- Initial release for TDE 14.0.0
diff --git a/redhat/main/tdetoys/tdetoys-3.5.13.2.spec b/redhat/main/tdetoys/tdetoys-3.5.13.2.spec
index aa31d8b07..28542f0b2 100644
--- a/redhat/main/tdetoys/tdetoys-3.5.13.2.spec
+++ b/redhat/main/tdetoys/tdetoys-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
@@ -24,7 +19,7 @@ Summary:	Trinity Desktop Environment - Toys and Amusements
 Name:		trinity-tdetoys
 Group:		Amusements/Graphics
 Version:	%{tde_version}
-Release:	%{?!preversion:2}%{?preversion:1_%{preversion}}%{?dist}%{?_variant}
+Release:	%{?!preversion:2}%{?preversion:1_%{preversion}}%{?dist}
 
 License:	GPLv2+
 Source0:	%{name}-%{version}%{?preversion:~%{preversion}}.tar.gz
@@ -433,9 +428,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
-