RPM: merge redhat directory with master branch

2 files changed, 6 insertions, 33 deletions

diff --git a/redhat/applications/fusion-icon/fusion-icon-14.0.0.spec b/redhat/applications/fusion-icon/fusion-icon-14.0.0.spec
index afb74de02..8f2e0cd6d 100644
--- a/redhat/applications/fusion-icon/fusion-icon-14.0.0.spec
+++ b/redhat/applications/fusion-icon/fusion-icon-14.0.0.spec
@@ -1,17 +1,14 @@
 # Default version for this component
 %define tde_pkg fusion-icon
+%if "%{?tde_version}" == ""
 %define tde_version 14.0.0
+%endif
 
 %if "%{?python2_sitelib}" == ""
 %define python2_sitelib    %(python2 -c "from distutils.sysconfig import get_python_lib; print(get_python_lib())")
 %endif
 
 
-# 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
-
 # TDE specific building variables
 %define tde_bindir %{tde_prefix}/bin
 %define tde_datadir %{tde_prefix}/share
@@ -26,7 +23,7 @@
 Name:		trinity-%{tde_pkg}
 Summary:	tray icon to launch and manage Compiz Fusion [Trinity]
 Version:	0.0.0+git20071028
-Release:	2%{?dist}%{?_variant}
+Release:	2%{?dist}
 
 License:	GPLv2+
 Group:		Applications/Utilities
@@ -83,15 +80,6 @@ find "%{?buildroot}%{python2_sitelib}" -name "*.egg-info" -delete
 %__rm -rf %{buildroot}
 
 
-%post
-touch --no-create %{tde_datadir}/icons/hicolor || :
-gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || :
-
-%postun
-touch --no-create %{tde_datadir}/icons/hicolor || :
-gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || :
-
-
 %files
 %defattr(-,root,root,-)
 %{tde_bindir}/fusion-icon
@@ -101,9 +89,4 @@ gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || :
 %{tde_datadir}/icons/hicolor/scalable/apps/fusion-icon.svg
 
 
-%Changelog
-* Sat Aug 04 2012 Francois Andriot <francois.andriot@free.fr> - 0.0.0+git20071028-2
-- Fix python module installation
-
-* Sat Nov 19 2011 Francois Andriot <francois.andriot@free.fr> - 0.0.0+git20071028-1
-- Initial release for RHEL 5, RHEL 6, Fedora 15, Fedora 16
+%changelog
diff --git a/redhat/applications/fusion-icon/fusion-icon.spec b/redhat/applications/fusion-icon/fusion-icon.spec
index 729590bfe..99f8992ff 100644
--- a/redhat/applications/fusion-icon/fusion-icon.spec
+++ b/redhat/applications/fusion-icon/fusion-icon.spec
@@ -7,11 +7,6 @@
 %endif
 
 
-# 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
-
 # TDE specific building variables
 %define tde_bindir %{tde_prefix}/bin
 %define tde_datadir %{tde_prefix}/share
@@ -31,7 +26,7 @@
 Name:		trinity-%{tde_pkg}
 Summary:	tray icon to launch and manage Compiz Fusion [Trinity]
 Version:	0.0.0+git20071028
-Release:	2%{?dist}%{?_variant}
+Release:	2%{?dist}
 
 License:	GPLv2+
 Group:		Applications/Utilities
@@ -112,9 +107,4 @@ gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || :
 %{tde_datadir}/icons/hicolor/scalable/apps/fusion-icon.svg
 
 
-%Changelog
-* Sat Aug 04 2012 Francois Andriot <francois.andriot@free.fr> - 0.0.0+git20071028-2
-- Fix python module installation
-
-* Sat Nov 19 2011 Francois Andriot <francois.andriot@free.fr> - 0.0.0+git20071028-1
-- Initial release for RHEL 5, RHEL 6, Fedora 15, Fedora 16
+%changelog