RPM: merge redhat directory with master branch

1 files changed, 8 insertions, 74 deletions

diff --git a/redhat/main/tdeaddons/tdeaddons-14.0.0.spec b/redhat/main/tdeaddons/tdeaddons-14.0.0.spec
index 2758ba766..5d546fb8e 100644
--- a/redhat/main/tdeaddons/tdeaddons-14.0.0.spec
+++ b/redhat/main/tdeaddons/tdeaddons-14.0.0.spec
@@ -1,5 +1,5 @@
 #
-# spec file for package tdeaddons
+# spec file for package tdeaddons (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 tdeaddons
 %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 - Plugins
 Version:	%{tde_version}
-Release:	%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}%{?_variant}
+Release:	%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}
 Group:		User Interface/Desktops
 URL:		http://www.trinitydesktop.org/
 
@@ -113,6 +110,9 @@ BuildRequires:	gamin-devel
 BuildRequires:	pcre-devel
 %endif
 
+# ACL support
+BuildRequires:	libacl-devel
+
 # DB4/DB5 support
 %if 0%{?rhel} || 0%{?fedora} || 0%{?suse_version} >= 1220 || 0%{?mdkversion} || 0%{?mgaversion}
 %define with_db 1
@@ -190,20 +190,6 @@ America and Europe.
 %{tde_datadir}/icons/hicolor/*/apps/atlantikdesigner.png
 %{tde_tdedocdir}/HTML/en/atlantikdesigner/
 
-%post -n trinity-atlantikdesigner
-for f in hicolor ; do
-  touch --no-create %{tde_datadir}/icons/${f} 2> /dev/null ||:
-  gtk-update-icon-cache -q %{tde_datadir}/icons/${f} 2> /dev/null ||:
-done
-update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
-
-%postun -n trinity-atlantikdesigner
-for f in hicolor ; do
-  touch --no-create %{tde_datadir}/icons/${f} 2> /dev/null ||:
-  gtk-update-icon-cache -q %{tde_datadir}/icons/${f} 2> /dev/null ||:
-done
-update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
-
 ##########
 
 %package -n trinity-kaddressbook-plugins
@@ -399,18 +385,6 @@ controls XMMS, install the xmms-kde-trinity package.
 %{tde_datadir}/icons/crystalsvg/*/apps/ktimemon.png
 %{tde_tdedocdir}/HTML/en/kicker-applets/
 
-%post -n trinity-kicker-applets
-for f in crystalsvg locolor ; do
-  touch --no-create %{tde_datadir}/icons/${f} 2> /dev/null ||:
-  gtk-update-icon-cache -q %{tde_datadir}/icons/${f} 2> /dev/null ||:
-done
-
-%postun -n trinity-kicker-applets
-for f in crystalsvg locolor ; do
-  touch --no-create %{tde_datadir}/icons/${f} 2> /dev/null ||:
-  gtk-update-icon-cache -q %{tde_datadir}/icons/${f} 2> /dev/null ||:
-done
-
 ##########
 
 %package -n trinity-knewsticker-scripts
@@ -597,18 +571,6 @@ graphical disk usage viewer and image conversions and transformations.
 %{tde_tdelibdir}/libadblock.so
 %{tde_tdedocdir}/HTML/en/konq-plugins/
 
-%post -n trinity-konq-plugins
-for f in crystalsvg hicolor locolor ; do
-  touch --no-create %{tde_datadir}/icons/${f} 2> /dev/null ||:
-  gtk-update-icon-cache -q %{tde_datadir}/icons/${f} 2> /dev/null ||:
-done
-
-%postun -n trinity-konq-plugins
-for f in crystalsvg hicolor locolor ; do
-  touch --no-create %{tde_datadir}/icons/${f} 2> /dev/null ||:
-  gtk-update-icon-cache -q %{tde_datadir}/icons/${f} 2> /dev/null ||:
-done
-
 ##########
 
 %package -n trinity-ksig
@@ -634,20 +596,6 @@ signatures in external mail clients such as KMail.
 %{tde_datadir}/icons/hicolor/*/apps/ksig.png
 %{tde_tdedocdir}/HTML/en/ksig/
 
-%post -n trinity-ksig
-for f in hicolor ; do
-  touch --no-create %{tde_datadir}/icons/${f} 2> /dev/null ||:
-  gtk-update-icon-cache -q %{tde_datadir}/icons/${f} 2> /dev/null ||:
-done
-update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
-
-%postun -n trinity-ksig
-for f in hicolor ; do
-  touch --no-create %{tde_datadir}/icons/${f} 2> /dev/null ||:
-  gtk-update-icon-cache -q %{tde_datadir}/icons/${f} 2> /dev/null ||:
-done
-update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
-
 ##########
 
 %package -n trinity-noatun-plugins
@@ -705,18 +653,6 @@ of user interfaces, playlists and visualisation plugins.
 %{tde_datadir}/apps/noatun/*
 %{tde_datadir}/icons/crystalsvg/16x16/apps/synaescope.png
 
-%post -n trinity-noatun-plugins
-for f in crystalsvg ; do
-  touch --no-create %{tde_datadir}/icons/${f} 2> /dev/null ||:
-  gtk-update-icon-cache -q %{tde_datadir}/icons/${f} 2> /dev/null ||:
-done
-
-%postun -n trinity-noatun-plugins
-for f in crystalsvg ; do
-  touch --no-create %{tde_datadir}/icons/${f} 2> /dev/null ||:
-  gtk-update-icon-cache -q %{tde_datadir}/icons/${f} 2> /dev/null ||:
-done
-
 ##########
 
 %if 0%{?pclinuxos} || 0%{?suse_version} && 0%{?opensuse_bs} == 0
@@ -812,5 +748,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