RPM: massive update and cleanup

2 files changed, 1 insertions, 174 deletions

diff --git a/redhat/applications/kpilot/kpilot-3.5.13.2.spec b/redhat/applications/kpilot/kpilot-3.5.13.2.spec
deleted file mode 100644
index 4bfb1a46e..000000000
--- a/redhat/applications/kpilot/kpilot-3.5.13.2.spec
+++ /dev/null
@@ -1,173 +0,0 @@
-# Default version for this component
-%define tde_pkg kpilot
-%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:		TDE Palm Pilot hot-sync tool
-Version:		0.7
-Release:		%{?!preversion:6}%{?preversion:5_%{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
-
-BuildRequires:	flex-devel
-BuildRequires:	gettext
-BuildRequires:	pilot-link-devel >= 0.12
-BuildRequires:	trinity-tdepim-devel >= %{tde_version}
-
-%description
-KPilot is an application that synchronizes your Palm Pilot or similar device
-(like the Handspring Visor) with your TDE desktop, much like the Palm HotSync
-software does for Windows.  KPilot can back-up and restore your Palm Pilot
-and synchronize the built-in applications with their TDE counterparts.
-
-
-%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 QTINC QTLIB
-. /etc/profile.d/qt3.sh
-export PATH="%{tde_bindir}:${PATH}"
-
-%configure \
-  --prefix=%{tde_prefix} \
-  --exec-prefix=%{tde_prefix} \
-  --bindir=%{tde_bindir} \
-  --datadir=%{tde_datadir} \
-  --libdir=%{tde_libdir} \
-  --mandir=%{tde_mandir} \
-  --includedir=%{tde_tdeincludedir} \
-  \
-  --disable-dependency-tracking \
-  --disable-debug \
-  --enable-new-ldflags \
-  --enable-final \
-  --enable-closure \
-  --enable-rpath
-
-# SMP safe !
-%__make %{?_smp_mflags}
-
-
-%install
-export PATH="%{tde_bindir}:${PATH}"
-%__rm -rf %{buildroot}
-%__make install DESTDIR=%{buildroot}
-
-# Unwanted files
-%__rm -f %{?buildroot}%{tde_libdir}/libkpilot.so
-
-
-
-%clean
-%__rm -rf %{buildroot}
-
-
-%post
-update-desktop-database %{tde_appdir} > /dev/null
-for f in hicolor locolor crystalsvg; do
-  touch --no-create %{tde_datadir}/icons/${f} || :
-  gtk-update-icon-cache --quiet %{tde_datadir}/icons/${f} || :
-done
-/sbin/ldconfig || :
-
-%postun
-update-desktop-database %{tde_appdir} > /dev/null
-for f in hicolor locolor crystalsvg; do
-  touch --no-create %{tde_datadir}/icons/${f} || :
-  gtk-update-icon-cache --quiet %{tde_datadir}/icons/${f} || :
-done
-/sbin/ldconfig || :
-
-
-%files
-%defattr(-,root,root,-)
-%{tde_bindir}/kpalmdoc
-%{tde_bindir}/kpilot
-%{tde_bindir}/kpilotDaemon
-%{tde_tdeincludedir}/kpilot
-%{tde_libdir}/libkpilot.la
-%{tde_libdir}/libkpilot.so.0
-%{tde_libdir}/libkpilot.so.0.0.0
-%{tde_tdelibdir}/conduit_address.la
-%{tde_tdelibdir}/conduit_address.so
-%{tde_tdelibdir}/conduit_doc.la
-%{tde_tdelibdir}/conduit_doc.so
-%{tde_tdelibdir}/conduit_knotes.la
-%{tde_tdelibdir}/conduit_knotes.so
-%{tde_tdelibdir}/conduit_memofile.la
-%{tde_tdelibdir}/conduit_memofile.so
-%{tde_tdelibdir}/conduit_notepad.la
-%{tde_tdelibdir}/conduit_notepad.so
-%{tde_tdelibdir}/conduit_popmail.la
-%{tde_tdelibdir}/conduit_popmail.so
-%{tde_tdelibdir}/conduit_sysinfo.la
-%{tde_tdelibdir}/conduit_sysinfo.so
-%{tde_tdelibdir}/conduit_time.la
-%{tde_tdelibdir}/conduit_time.so
-%{tde_tdelibdir}/conduit_todo.la
-%{tde_tdelibdir}/conduit_todo.so
-%{tde_tdelibdir}/conduit_vcal.la
-%{tde_tdelibdir}/conduit_vcal.so
-%{tde_tdelibdir}/kcm_kpilot.la
-%{tde_tdelibdir}/kcm_kpilot.so
-%{tde_tdeappdir}/kpalmdoc.desktop
-%{tde_tdeappdir}/kpilot.desktop
-%{tde_tdeappdir}/kpilotdaemon.desktop
-%{tde_datadir}/apps/kaddressbook/contacteditorpages/KPilotCustomFieldEditor.ui
-%{tde_datadir}/apps/kconf_update/kpalmdoc.upd
-%{tde_datadir}/apps/kconf_update/kpilot.upd
-%{tde_datadir}/apps/kpilot
-%{tde_datadir}/config.kcfg/*.kcfg
-%{tde_datadir}/icons/crystalsvg/*/apps/*.png
-%{tde_datadir}/icons/hicolor/*/apps/*.png
-%{tde_datadir}/icons/locolor/*/apps/*.png
-%{tde_datadir}/services/*.desktop
-%{tde_datadir}/servicetypes/kpilotconduit.desktop
-
-
-%changelog
diff --git a/redhat/applications/kpilot/kpilot.spec b/redhat/applications/kpilot/kpilot.spec
index 179e464d2..c8cc0e565 100644
--- a/redhat/applications/kpilot/kpilot.spec
+++ b/redhat/applications/kpilot/kpilot.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 kpilot
 %define tde_prefix /opt/trinity