RPM: massive update and cleanup

2 files changed, 2 insertions, 175 deletions

diff --git a/redhat/applications/katapult/katapult-3.5.13.2.spec b/redhat/applications/katapult/katapult-3.5.13.2.spec
deleted file mode 100644
index c26f46fbd..000000000
--- a/redhat/applications/katapult/katapult-3.5.13.2.spec
+++ /dev/null
@@ -1,173 +0,0 @@
-# Default version for this component
-%define tde_pkg katapult
-%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}
-Summary:		Faster access to applications, bookmarks, and other items.
-Version:		0.3.2.1
-Release:		%{?!preversion:7}%{?preversion:6_%{preversion}}%{?dist}
-
-License:		GPLv2+
-Group:			Applications/Utilities
-
-Vendor:			Trinity Project
-Packager:		Francois Andriot <[email protected]>
-URL:			http://www.trinitydesktop.org/
-
-Prefix:			%{tde_prefix}
-BuildRoot:		%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-Source0:		%{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
-
-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
-
-
-%description
-Katapult is an application for TDE, designed to allow faster access to
-applications, bookmarks, and other items. It is plugin-based, so it can
-launch anything that is has a plugin for. Its display is driven by
-plugins as well, so its appearance is completely customizable. It was
-inspired by Quicksilver for OS X. 
-
-
-%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; . /etc/profile.d/qt3.sh
-export PATH="%{tde_bindir}:${PATH}"
-
-%configure \
-  --prefix=%{tde_prefix} \
-  --exec-prefix=%{tde_prefix} \
-  --bindir=%{tde_bindir} \
-  --libdir=%{tde_libdir} \
-  --datadir=%{tde_datadir} \
-  --includedir=%{tde_tdeincludedir} \
-  \
-  --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 %{buildroot}
-%__make install DESTDIR=%{buildroot}
-
-%find_lang %{tde_pkg}
-
-# Removes useless files (-devel ?)
-%__rm -f %{?buildroot}%{tde_libdir}/*.so
-%__rm -f %{?buildroot}%{tde_libdir}/*.la
-
-%clean
-%__rm -rf %{buildroot}
-
-
-%post
-for f in crystalsvg hicolor ; do
-  touch --no-create %{tde_datadir}/icons/${f} || :
-  gtk-update-icon-cache --quiet %{tde_datadir}/icons/${f} || :
-done
-/sbin/ldconfig || :
-update-desktop-database %{tde_appdir} &> /dev/null
-
-%postun
-for f in crystalsvg hicolor ; do
-  touch --no-create %{tde_datadir}/icons/${f} || :
-  gtk-update-icon-cache --quiet %{tde_datadir}/icons/${f} || :
-done
-/sbin/ldconfig || :
-update-desktop-database %{tde_appdir} &> /dev/null
-
-
-%files -f %{tde_pkg}.lang
-%defattr(-,root,root,-)
-%doc AUTHORS COPYING
-%{tde_bindir}/katapult
-%{tde_libdir}/libkatapult.so.2
-%{tde_libdir}/libkatapult.so.2.0.0
-%{tde_tdelibdir}/katapult_amarokcatalog.la
-%{tde_tdelibdir}/katapult_amarokcatalog.so
-%{tde_tdelibdir}/katapult_bookmarkcatalog.la
-%{tde_tdelibdir}/katapult_bookmarkcatalog.so
-%{tde_tdelibdir}/katapult_calculatorcatalog.la
-%{tde_tdelibdir}/katapult_calculatorcatalog.so
-%{tde_tdelibdir}/katapult_documentcatalog.la
-%{tde_tdelibdir}/katapult_documentcatalog.so
-%{tde_tdelibdir}/katapult_execcatalog.la
-%{tde_tdelibdir}/katapult_execcatalog.so
-%{tde_tdelibdir}/katapult_glassdisplay.la
-%{tde_tdelibdir}/katapult_glassdisplay.so
-%{tde_tdelibdir}/katapult_googlecatalog.la
-%{tde_tdelibdir}/katapult_googlecatalog.so
-%{tde_tdelibdir}/katapult_o2display.la
-%{tde_tdelibdir}/katapult_o2display.so
-%{tde_tdelibdir}/katapult_programcatalog.la
-%{tde_tdelibdir}/katapult_programcatalog.so
-%{tde_tdelibdir}/katapult_puredisplay.la
-%{tde_tdelibdir}/katapult_puredisplay.so
-%{tde_tdelibdir}/katapult_spellcatalog.la
-%{tde_tdelibdir}/katapult_spellcatalog.so
-%{tde_tdeappdir}/katapult.desktop
-%{tde_datadir}/icons/crystalsvg/128x128/actions/katapultspellcheck.png
-%{tde_datadir}/icons/crystalsvg/scalable/actions/katapultspellcheck.svgz
-%{tde_datadir}/icons/hicolor/128x128/actions/checkmark.png
-%{tde_datadir}/icons/hicolor/128x128/actions/no.png
-%{tde_datadir}/icons/hicolor/128x128/apps/xcalc.png
-%{tde_datadir}/icons/hicolor/*/apps/katapult.png
-%{tde_datadir}/icons/hicolor/scalable/apps/katapult.svgz
-%{tde_datadir}/services/katapult_amarokcatalog.desktop
-%{tde_datadir}/services/katapult_bookmarkcatalog.desktop
-%{tde_datadir}/services/katapult_calculatorcatalog.desktop
-%{tde_datadir}/services/katapult_documentcatalog.desktop
-%{tde_datadir}/services/katapult_execcatalog.desktop
-%{tde_datadir}/services/katapult_glassdisplay.desktop
-%{tde_datadir}/services/katapult_googlecatalog.desktop
-%{tde_datadir}/services/katapult_o2display.desktop
-%{tde_datadir}/services/katapult_programcatalog.desktop
-%{tde_datadir}/services/katapult_puredisplay.desktop
-%{tde_datadir}/services/katapult_spellcatalog.desktop
-%{tde_datadir}/servicetypes/katapultcatalog.desktop
-%{tde_datadir}/servicetypes/katapultdisplay.desktop
-%{tde_tdedocdir}/HTML/en/katapult/
-
-
-%changelog
diff --git a/redhat/applications/katapult/katapult.spec b/redhat/applications/katapult/katapult.spec
index f0e281a27..1e71f52d7 100644
--- a/redhat/applications/katapult/katapult.spec
+++ b/redhat/applications/katapult/katapult.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 katapult
 %define tde_prefix /opt/trinity
@@ -153,7 +153,7 @@ export PATH="%{tde_bindir}:${PATH}"
 # Fix desktop files (openSUSE only)
 echo "OnlyShowIn=TDE;" >>"%{?buildroot}%{tde_tdeappdir}/%{tde_pkg}.desktop"
 %if 0%{?suse_version}
-%suse_update_desktop_file -G "Application Launcher" katapult DesktopUtility
+%suse_update_desktop_file -G "Application Launcher" "%{?buildroot}%{tde_tdeappdir}/%{tde_pkg}.desktop" DesktopUtility
 %endif