RPM: massive update and cleanup

1 files changed, 33 insertions, 8 deletions

diff --git a/redhat/applications/tdedocker/tdedocker.spec b/redhat/applications/tdedocker/tdedocker.spec
index 5685e4075..66e8c3132 100644
--- a/redhat/applications/tdedocker/tdedocker.spec
+++ b/redhat/applications/tdedocker/tdedocker.spec
@@ -18,7 +18,7 @@
 # TDE variables
 %define tde_epoch 2
 %if "%{?tde_version}" == ""
-%define tde_version 14.0.0
+%define tde_version 14.1.0
 %endif
 %define tde_pkg tdedocker
 %define tde_prefix /opt/trinity
@@ -77,6 +77,28 @@ BuildRequires:	openssl-devel
 # XKBFILES support
 BuildRequires:	libxkbfile-devel
 
+# XMU support
+%if 0%{?suse_version} == 1140
+BuildRequires:	xorg-x11-libXmu-devel
+%endif
+%if 0%{?rhel} || 0%{?fedora} || 0%{?suse_version} >= 1210
+BuildRequires: libXmu-devel
+%endif
+%if 0%{?mdkversion} || 0%{?mgaversion} >= 4
+BuildRequires: libxmu-devel
+%endif
+%if 0%{?mgaversion} == 2 || 0%{?mgaversion} == 3
+BuildRequires:	%{_lib}xmu%{?mgaversion:6}-devel
+%endif
+
+# XPM support
+%if 0%{?suse_version} || 0%{?rhel} || 0%{?fedora}
+BuildRequires:	libXpm-devel
+%endif
+%if 0%{?mdkversion} || 0%{?mgaversion}
+BuildRequires:	%{_lib}xpm-devel
+%endif
+
 # SUSE desktop files utility
 %if 0%{?suse_version}
 BuildRequires:	update-desktop-files
@@ -89,7 +111,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 +170,22 @@ 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/
+%{tde_datadir}/icons/hicolor/*/apps/tdedocker.png
+%{tde_datadir}/apps/tdedocker/icons/question.png
+%{tde_mandir}/man1/tdedocker.1*
 
 
 %changelog