From e09877ee43090e3b9ca199fc1b66acb4af77c071 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fran=C3=A7ois=20Andriot?= <albator78@libertysurf.fr>
Date: Mon, 12 Oct 2020 23:46:33 +0200
Subject: RPM: add package tdedocker

---
 redhat/Makefile                                    |  2 +-
 redhat/applications/tdedocker/tdedocker.spec       | 18 +++++++++++-------
 redhat/extras/trinity-desktop/trinity-desktop.spec |  1 +
 3 files changed, 13 insertions(+), 8 deletions(-)

diff --git a/redhat/Makefile b/redhat/Makefile
index 70e485959..b1befdaa7 100644
--- a/redhat/Makefile
+++ b/redhat/Makefile
@@ -510,7 +510,7 @@ tastymenu:
 	$(call buildpkg,applications/tastymenu)
 
 tdedocker:	tdebase
-#	$(call buildpkg,applications/tdedocker)
+	$(call buildpkg,applications/tdedocker)
 
 tde-guidance:	tdebase pytdeextensions
 	$(call buildpkg,applications/tde-guidance)
diff --git a/redhat/applications/tdedocker/tdedocker.spec b/redhat/applications/tdedocker/tdedocker.spec
index 73621093b..3669aca04 100644
--- a/redhat/applications/tdedocker/tdedocker.spec
+++ b/redhat/applications/tdedocker/tdedocker.spec
@@ -89,7 +89,7 @@ BuildRequires:	brp-check-trinity
 
 
 %description
-KDocker will help you dock any application into the system tray.
+tdedocker will help you dock any application into the system tray.
 This means you can dock openoffice, xmms, firefox, thunderbird,
 anything! Just point and click. Works for all NET WM compliant
 window managers - that includes TDE, KDE, GNOME, Xfce, Fluxbox
@@ -148,19 +148,23 @@ export PATH="%{tde_bindir}:${PATH}"
 %__rm -rf %{buildroot}
 %__make install DESTDIR=%{buildroot} -C build
 
-%find_lang kdocker
+%find_lang %{tde_pkg}
+
 
 %clean
 %__rm -rf %{buildroot}
 
 
-%files -f kdocker.lang
+%files -f %{tde_pkg}.lang
 %defattr(-,root,root,-)
 %doc AUTHORS BUGS ChangeLog COPYING CREDITS HACKING INSTALL README TODO VERSION
-%{tde_bindir}/kdocker
-%{tde_tdeappdir}/kdocker.desktop
-%{tde_datadir}/apps/kdocker/icons/kdocker.png
-%{tde_datadir}/apps/kdocker/icons/question.png
+%{tde_bindir}/tdedocker
+%{tde_tdeappdir}/tdedocker.desktop
+%{tde_datadir}/apps/tdedocker/icons/question.xpm
+%{tde_datadir}/apps/tdedocker/icons/tdedocker.xpm
+%{tde_datadir}/icons/hicolor/*/apps/tdedocker.png
+%{tde_datadir}/apps/tdedocker/icons/question.png
+%{tde_mandir}/man1/tdedocker.1*
 
 
 %changelog
diff --git a/redhat/extras/trinity-desktop/trinity-desktop.spec b/redhat/extras/trinity-desktop/trinity-desktop.spec
index a22540fd1..225516825 100644
--- a/redhat/extras/trinity-desktop/trinity-desktop.spec
+++ b/redhat/extras/trinity-desktop/trinity-desktop.spec
@@ -190,6 +190,7 @@ Requires: trinity-tde-style-ia-ora
 Requires: trinity-tde-style-lipstik
 Requires: trinity-tde-style-qtcurve
 Requires: trinity-tde-systemsettings
+Requires: trinity-tdedocker
 Requires: trinity-tdeio-apt
 Requires: trinity-tdeio-ftps
 Requires: trinity-tdeio-locate
-- 
cgit v1.2.3