RPM: massive update and cleanup

2 files changed, 3 insertions, 128 deletions

diff --git a/redhat/applications/kiosktool/kiosktool-3.5.13.2.spec b/redhat/applications/kiosktool/kiosktool-3.5.13.2.spec
deleted file mode 100644
index 68c088ba5..000000000
--- a/redhat/applications/kiosktool/kiosktool-3.5.13.2.spec
+++ /dev/null
@@ -1,125 +0,0 @@
-# Default version for this component
-%define tde_pkg kiosktool
-%define tde_version 3.5.13.2
-
-# 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 tde_appdir %{tde_datadir}/applications
-
-%define tde_tdeappdir %{tde_appdir}/kde
-%define tde_tdedocdir %{tde_docdir}/tde
-%define tde_tdeincludedir %{tde_includedir}/tde
-%define tde_tdelibdir %{tde_libdir}/trinity
-
-%define _docdir %{tde_docdir}
-
-
-Name:			trinity-%{tde_pkg}
-Version:		1.0
-Release:		%{?!preversion:6}%{?preversion:5_%{preversion}}%{?dist}
-Summary:		tool to configure the TDE kiosk framework
-
-License:		GPLv2+
-Group:			Applications/Multimedia
-
-Vendor:			Trinity Project
-Packager:		Francois Andriot <francois.andriot@free.fr>
-URL:			http://www.trinitydesktop.org/
-
-
-Source0:		%{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
-BuildRoot:		%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-BuildRequires:	trinity-tqtinterface-devel >= %{tde_version}
-BuildRequires:	trinity-arts-devel >= 1:1.5.10
-BuildRequires:	trinity-tdelibs-devel >= %{tde_version}
-BuildRequires:	trinity-tdebase-devel >= %{tde_version}
-BuildRequires:	desktop-file-utils
-
-BuildRequires:	gettext
-
-
-%description
-A Point&Click tool for system administrators to enable 
-TDE's KIOSK features or otherwise preconfigure TDE for 
-groups of users.
-
-
-%if 0%{?suse_version} || 0%{?pclinuxos}
-%debug_package
-%endif
-
-
-%prep
-%setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}}
-
-%__cp "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in"
-%__cp "/usr/share/libtool/"*"/ltmain.sh" "admin/ltmain.sh" || %__cp "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh"
-%__make -f "admin/Makefile.common"
-
-
-%build
-unset QTDIR || : ; source /etc/profile.d/qt3.sh
-export PATH="%{tde_bindir}:${PATH}"
-
-%configure \
-  --prefix=%{tde_prefix} \
-  --exec-prefix=%{tde_prefix} \
-  --bindir=%{tde_bindir} \
-  --datadir=%{tde_datadir} \
-  --includedir=%{tde_tdeincludedir} \
-  --libdir=%{tde_libdir} \
-  --mandir=%{tde_mandir} \
-  \
-  --disable-dependency-tracking \
-  --disable-debug \
-  --enable-new-ldflags \
-  --enable-final \
-  --enable-closure \
-  --enable-rpath
-
-%__make %{?_smp_mflags}
-
-
-%install
-export PATH="%{tde_bindir}:${PATH}"
-%__rm -rf $RPM_BUILD_ROOT
-%__make install DESTDIR=$RPM_BUILD_ROOT
-
-%find_lang %{tde_pkg}
-
-
-%clean
-%__rm -rf $RPM_BUILD_ROOT
-
-
-%post
-touch --no-create %{tde_datadir}/icons/crystalsvg ||:
-gtk-update-icon-cache -q %{tde_datadir}/icons/crystalsvg 2> /dev/null ||:
-update-desktop-database >& /dev/null ||:
-
-%postun
-touch --no-create %{tde_datadir}/icons/crystalsvg ||:
-gtk-update-icon-cache -q %{tde_datadir}/icons/crystalsvg 2> /dev/null ||:
-update-desktop-database >& /dev/null ||:
-
-
-
-%files -f %{tde_pkg}.lang
-%defattr(-,root,root,-)
-%doc ChangeLog COPYING README TODO
-%{tde_bindir}/kiosktool
-%{tde_bindir}/kiosktool-kdedirs
-%{tde_tdeappdir}/kiosktool.desktop
-%{tde_datadir}/apps/kiosktool/*.png
-%{tde_tdedocdir}/HTML/en/kiosktool/
-%{tde_datadir}/icons/crystalsvg/*/apps/kiosktool.png
-%{tde_datadir}/apps/kiosktool/kiosk_data.xml
-%{tde_datadir}/apps/kiosktool/kiosktoolui.rc
-
-%changelog
diff --git a/redhat/applications/kiosktool/kiosktool.spec b/redhat/applications/kiosktool/kiosktool.spec
index 3112132a4..083103000 100644
--- a/redhat/applications/kiosktool/kiosktool.spec
+++ b/redhat/applications/kiosktool/kiosktool.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 kiosktool
 %define tde_prefix /opt/trinity
@@ -157,7 +157,7 @@ EOF
 # Updates applications categories for openSUSE
 echo "OnlyShowIn=TDE;" >>"%{?buildroot}%{tde_tdeappdir}/%{tde_pkg}.desktop"
 %if 0%{?suse_version}
-%suse_update_desktop_file %{tde_pkg} System SystemSetup
+%suse_update_desktop_file "%{?buildroot}%{tde_tdeappdir}/%{tde_pkg}.desktop" System SystemSetup
 %endif
 
 
@@ -179,7 +179,7 @@ echo "OnlyShowIn=TDE;" >>"%{?buildroot}%{tde_tdeappdir}/%{tde_pkg}.desktop"
 %lang(pt) %{tde_tdedocdir}/HTML/pt/kiosktool/
 %lang(sv) %{tde_tdedocdir}/HTML/sv/kiosktool/
 %{tde_datadir}/icons/crystalsvg/*/apps/kiosktool.png
-%{tde_confdir}/kiosktoolrc
+%config(noreplace) %{tde_confdir}/kiosktoolrc
 %{tde_mandir}/man1/*.1*