From 6581dc50b83f203d65eac61c00a159ab2a6ddb5d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fran=C3=A7ois=20Andriot?= <albator78@libertysurf.fr>
Date: Sat, 30 Jan 2021 14:34:02 +0100
Subject: RPM: massive update and cleanup

---
 .../fusion-icon/fusion-icon-14.0.0.spec            | 92 ----------------------
 .../fusion-icon-3.5.13-fix_python_sitelib.patch    | 17 ----
 redhat/applications/fusion-icon/fusion-icon.spec   | 10 +--
 3 files changed, 5 insertions(+), 114 deletions(-)
 delete mode 100644 redhat/applications/fusion-icon/fusion-icon-14.0.0.spec
 delete mode 100644 redhat/applications/fusion-icon/fusion-icon-3.5.13-fix_python_sitelib.patch

(limited to 'redhat/applications/fusion-icon')

diff --git a/redhat/applications/fusion-icon/fusion-icon-14.0.0.spec b/redhat/applications/fusion-icon/fusion-icon-14.0.0.spec
deleted file mode 100644
index 8f2e0cd6d..000000000
--- a/redhat/applications/fusion-icon/fusion-icon-14.0.0.spec
+++ /dev/null
@@ -1,92 +0,0 @@
-# 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
-
-
-# TDE specific building variables
-%define tde_bindir %{tde_prefix}/bin
-%define tde_datadir %{tde_prefix}/share
-%define tde_docdir %{tde_datadir}/doc
-%define tde_includedir %{tde_prefix}/include
-%define tde_libdir %{tde_prefix}/%{_lib}
-%define tde_mandir %{tde_datadir}/man
-
-%define _docdir %{tde_docdir}
-
-
-Name:		trinity-%{tde_pkg}
-Summary:	tray icon to launch and manage Compiz Fusion [Trinity]
-Version:	0.0.0+git20071028
-Release:	2%{?dist}
-
-License:	GPLv2+
-Group:		Applications/Utilities
-
-Vendor:		Trinity Project
-Packager:	Francois Andriot <francois.andriot@free.fr>
-URL:		http://www.trinitydesktop.org/
-
-Prefix:    %{_prefix}
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-Source0:		%{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
-
-BuildRequires:	tqtinterface-devel
-BuildRequires:	trinity-tdelibs-devel
-BuildRequires:	trinity-tdebase-devel
-BuildRequires:	desktop-file-utils
-BuildRequires:	python
-Requires:		python
-Requires:		trinity-compizconfig-backend-kconfig
-
-%description
-The OpenCompositing Project brings 3D desktop visual effects that
-improve the usability and eye candy of the X Window System and provide
-increased productivity.
-
-This package contains a tray icon that can launch Compiz and its
-decorators.
-
-
-%prep
-%setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}}
-
-
-%build
-unset QTDIR QTINC QTLIB
-export PATH="%{tde_bindir}:${PATH}"
-
-%__make
-
-
-%install
-export PATH="%{tde_bindir}:${PATH}"
-%__rm -rf %{buildroot}
-%__make install \
-  DESTDIR=%{buildroot} \
-  PREFIX=%{tde_prefix}
-
-# Removes 'egg-info'
-find "%{?buildroot}%{python2_sitelib}" -name "*.egg-info" -delete
-
-
-%clean
-%__rm -rf %{buildroot}
-
-
-%files
-%defattr(-,root,root,-)
-%{tde_bindir}/fusion-icon
-%{python2_sitelib}/FusionIcon/
-%{tde_datadir}/applications/fusion-icon.desktop
-%{tde_datadir}/icons/hicolor/*/apps/fusion-icon.png
-%{tde_datadir}/icons/hicolor/scalable/apps/fusion-icon.svg
-
-
-%changelog
diff --git a/redhat/applications/fusion-icon/fusion-icon-3.5.13-fix_python_sitelib.patch b/redhat/applications/fusion-icon/fusion-icon-3.5.13-fix_python_sitelib.patch
deleted file mode 100644
index 6ad5c045c..000000000
--- a/redhat/applications/fusion-icon/fusion-icon-3.5.13-fix_python_sitelib.patch
+++ /dev/null
@@ -1,17 +0,0 @@
---- fusion-icon/Makefile.ori	2012-08-04 11:13:26.208733002 +0200
-+++ fusion-icon/Makefile	2012-08-04 11:16:13.354858961 +0200
-@@ -1,12 +1,13 @@
- PREFIX = '/usr'
- DESTDIR = '/'
-+PYTHON_SITELIB = '/usr/lib/python2.7/site-packages'
- #interfaces = 'gtk qt4'
- 
- all:
- 	@python setup.py build
- 
- install:
--	@python setup.py install --prefix=${PREFIX} --root=${DESTDIR}
-+	@python setup.py install --prefix=${PREFIX} --root=${DESTDIR} --install-lib=${PYTHON_SITELIB}
- 
- uninstall:
- 	@python setup.py uninstall
diff --git a/redhat/applications/fusion-icon/fusion-icon.spec b/redhat/applications/fusion-icon/fusion-icon.spec
index 99f8992ff..e3f8bf5cb 100644
--- a/redhat/applications/fusion-icon/fusion-icon.spec
+++ b/redhat/applications/fusion-icon/fusion-icon.spec
@@ -1,6 +1,6 @@
 # Default version for this component
 %define tde_pkg fusion-icon
-%define tde_version 14.0.0
+%define tde_version 14.1.0
 
 %if "%{?python2_sitelib}" == ""
 %define python2_sitelib    %(python2 -c "from distutils.sysconfig import get_python_lib; print(get_python_lib())")
@@ -23,10 +23,10 @@
 %define _docdir %{tde_docdir}
 
 
-Name:		trinity-%{tde_pkg}
-Summary:	tray icon to launch and manage Compiz Fusion [Trinity]
-Version:	0.0.0+git20071028
-Release:	2%{?dist}
+Name:			trinity-%{tde_pkg}
+Summary:		tray icon to launch and manage Compiz Fusion [Trinity]
+Version:		0.0.0+git20071028
+Release:		%{?tde_version}_%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}
 
 License:	GPLv2+
 Group:		Applications/Utilities
-- 
cgit v1.2.3