RPM: massive update and cleanup

3 files changed, 2 insertions, 316 deletions

diff --git a/redhat/applications/tdesvn/tdesvn-14.0.0.patch b/redhat/applications/tdesvn/tdesvn-14.0.0.patch
deleted file mode 100644
index b22e7f2e4..000000000
--- a/redhat/applications/tdesvn/tdesvn-14.0.0.patch
+++ /dev/null
@@ -1,57 +0,0 @@
---- trinity-tdesvn-14.0.0~pre185+fddfb277/src/svnqt/CMakeLists.txt.sqlite3	2013-12-30 17:57:05.867723485 +0100
-+++ trinity-tdesvn-14.0.0~pre185+fddfb277/src/svnqt/CMakeLists.txt	2014-09-16 21:49:29.774968683 +0200
-@@ -45,19 +45,6 @@
-     cache/DatabaseException.cpp
-     )
- 
--#     IF (SQLITE_FOUND)
--        MESSAGE(STATUS "Build own sqlite3 database modul")
--        SET(SOURCES
--            ${SOURCES}
--            cache/sqlite3/qsqlcachedresult.cpp
--            cache/sqlite3/qsql_sqlite3.cpp
--            cache/sqlite3/qsqlcachedresult.h
--            cache/sqlite3/qsql_sqlite3.h
--        )
--#     ELSE (SQLITE_FOUND)
--#         MESSAGE(SEND_ERROR "The QT3 version requires sqlite3 but could not found")
--#     ENDIF (SQLITE_FOUND)
--
- SET(CACHEINST_HEADERS
-     cache/LogCache.hpp
-     cache/ReposLog.hpp
-@@ -150,7 +137,7 @@
- 
- # IF (SQLITE_FOUND)
-     TARGET_LINK_LIBRARIES(${svnqt-name} ${SQLITE_LIBRARIES})
--    INCLUDE_DIRECTORIES(SQLITE_INCLUDE_DIR)
-+    INCLUDE_DIRECTORIES(${SQLITE_INCLUDE_DIR})
- # ELSE (SQLITE_FOUND)
- #     TARGET_LINK_LIBRARIES(${svnqt-name} ${QT_QTSQL_LIBRARY})
- # ENDIF (SQLITE_FOUND)
---- trinity-tdesvn-14.0.0~pre185+fddfb277/src/svnqt/cache/LogCache.cpp.sqlite3	2014-01-28 20:25:28.711539518 +0100
-+++ trinity-tdesvn-14.0.0~pre185+fddfb277/src/svnqt/cache/LogCache.cpp	2014-09-16 21:51:37.826387614 +0200
-@@ -10,9 +10,10 @@
- #include "svnqt/cache/DatabaseException.hpp"
- 
- #ifndef NO_SQLITE3
--#include "sqlite3/qsql_sqlite3.h"
-+#include <qsql_sqlite3.h>
- #define SQLTYPE "QSQLITE3"
- #else
-+#include <qsql_sqlite.h>
- #define SQLTYPE "QSQLITE"
- #endif
- 
-@@ -262,11 +263,6 @@
- 
- void LogCache::setupMainDb()
- {
--#ifndef NO_SQLITE3
--    if (!TQSqlDatabase::isDriverAvailable(SQLTYPE)) {
--        TQSqlDatabase::registerSqlDriver(SQLTYPE,new TQSqlDriverCreator<TQSQLite3Driver>);
--    }
--#endif
-     TQDataBase mainDB = m_CacheData->getMainDB();
-     if (!mainDB || !mainDB->open()) {
-         tqWarning("Failed to open main database: %s", (mainDB?mainDB->lastError().text().TOUTF8().data():"No database object."));
diff --git a/redhat/applications/tdesvn/tdesvn-3.5.13.2.spec b/redhat/applications/tdesvn/tdesvn-3.5.13.2.spec
deleted file mode 100644
index 06473162e..000000000
--- a/redhat/applications/tdesvn/tdesvn-3.5.13.2.spec
+++ /dev/null
@@ -1,255 +0,0 @@
-# Default version for this component
-%define tde_pkg tdesvn
-%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:		subversion client with tight TDE integration [Trinity]
-Version:		1.0.4
-Release:		%{?!preversion:7}%{?preversion:6_%{preversion}}%{?dist}
-
-License:		GPLv2+
-Group:			Applications/Utilities
-
-Vendor:			Trinity Project
-Packager:		Francois Andriot <francois.andriot@free.fr>
-URL:			http://www.elliptique.net/~ken/kima/
-
-Prefix:			%{_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:	subversion-devel
-Requires:		%{name}-tdeio-plugins = %{version}-%{release}
-
-Obsoletes:	trinity-kdesvn < %{version}-%{release}
-Provides:	trinity-kdesvn = %{version}-%{release}
-
-%description
-TDESvn is a graphical client for the subversion revision control
-system (svn).
-
-Besides offering common and advanced svn operations, it features
-a tight integration into TDE and can be embedded into other TDE 
-applications like konqueror via the TDE component technology KParts.
-
-
-%package -n trinity-libsvnqt
-Group:			Development/Libraries
-Summary:		Qt wrapper library for subversion [Trinity]
-
-%description -n trinity-libsvnqt
-This package provides svnqt, a Qt wrapper library around the 
-subversion library.
-
-It is based on the RapidSvn SvnCpp library, a subversion client API 
-written in C++.
-
-%package -n trinity-libsvnqt-devel
-Group:			Development/Libraries
-Requires:		trinity-libsvnqt = %{version}-%{release}
-Requires:		qt-devel
-Requires:		subversion-devel
-Summary:		Qt wrapper library for subversion (development files) [Trinity]
-
-%description -n trinity-libsvnqt-devel
-This package contains the header files and symbolic links that developers
-using svnqt will need.
-
-
-%package tdeio-plugins
-Group:			Development/Libraries
-Conflicts:	trinity-kdesdk-tdeio-plugins
-Summary:		subversion I/O slaves for Trinity
-
-Obsoletes:	trinity-kdesvn-kio-plugins < %{version}-%{release}
-Provides:	trinity-kdesvn-kio-plugins = %{version}-%{release}
-Obsoletes:	trinity-tdesvn-kio-plugins < %{version}-%{release}
-Provides:	trinity-tdesvn-kio-plugins = %{version}-%{release}
-
-%description tdeio-plugins
-This packages includes KIO slaves for svn, svn+file, svn+http, 
-svn+https, svn+ssh. This allows you to access subversion repositories 
-inside any KIO enabled TDE application.
-
-This package is part of tdesvn-trinity.
-
-
-%if 0%{?suse_version} || 0%{?pclinuxos}
-%debug_package
-%endif
-
-
-%prep
-%setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}}
-
-# Moves HTML files to the correect location
-find . -name "*.cmake" -exec %__sed -i {} \
-  -e "s,/doc/HTML,/doc/tde/HTML,g" \
-  \;
-
-
-%build
-unset QTDIR QTINC QTLIB
-. /etc/profile.d/qt3.sh
-export PATH="%{tde_bindir}:${QTDIR}/bin:${PATH}"
-export CMAKE_INCLUDE_PATH="%{tde_tdeincludedir}"
-
-if ! rpm -E %%cmake|grep -q "cd build"; then
-  %__mkdir_p build
-  cd build
-fi
-
-%cmake \
-  -DCMAKE_BUILD_TYPE="RelWithDebInfo" \
-  -DCMAKE_C_FLAGS="${RPM_OPT_FLAGS} -DNDEBUG" \
-  -DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS} -DNDEBUG" \
-  -DCMAKE_SKIP_RPATH=OFF \
-  -DCMAKE_INSTALL_RPATH="%{tde_libdir}" \
-  -DCMAKE_VERBOSE_MAKEFILE=ON \
-  \
-  -DCMAKE_INSTALL_PREFIX=%{tde_prefix} \
-  -DBIN_INSTALL_DIR=%{tde_bindir} \
-  -DINCLUDE_INSTALL_DIR=%{tde_includedir} \
-  -DLIB_INSTALL_DIR=%{tde_libdir} \
-  -DMAN_INSTALL_DIR=%{tde_mandir}/man1 \
-  -DDATA_INSTALL_DIR=%{tde_datadir} \
-  -DPKGCONFIG_INSTALL_DIR=%{tde_tdelibdir}/pkgconfig \
-  -DSHARE_INSTALL_PREFIX=%{tde_datadir} \
-  \
-  -DBUILD_DOC=ON \
-  -DBUILD_TRANSLATIONS=ON \
-  ..
-
-# SMP safe !
-%__make %{?_smp_mflags} || %__make
-
-
-%install
-export PATH="%{_bindir}:${PATH}"
-%__rm -rf %{buildroot}
-%__make install DESTDIR=%{buildroot} -C build
-
-# Installs SVN protocols as alternatives
-%__mv -f %{?buildroot}%{tde_datadir}/services/svn+file.protocol %{?buildroot}%{tde_datadir}/services/svn+file.protocol_tdesvn
-%__mv -f %{?buildroot}%{tde_datadir}/services/svn+http.protocol %{?buildroot}%{tde_datadir}/services/svn+http.protocol_tdesvn
-%__mv -f %{?buildroot}%{tde_datadir}/services/svn+https.protocol %{?buildroot}%{tde_datadir}/services/svn+https.protocol_tdesvn
-%__mv -f %{?buildroot}%{tde_datadir}/services/svn+ssh.protocol %{?buildroot}%{tde_datadir}/services/svn+ssh.protocol_tdesvn
-%__mv -f %{?buildroot}%{tde_datadir}/services/svn.protocol %{?buildroot}%{tde_datadir}/services/svn.protocol_tdesvn
-
-# Locales
-%find_lang kdesvn
-
-
-%clean
-%__rm -rf %{buildroot}
-
-
-%post
-touch --no-create %{tde_datadir}/icons/hicolor || :
-gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || :
-
-%postun
-touch --no-create %{tde_datadir}/icons/hicolor || :
-gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || :
-
-%post -n trinity-libsvnqt
-/sbin/ldconfig || :
-
-%post tdeio-plugins
-for proto in svn+file svn+http svn+https svn+ssh svn; do
-  update-alternatives --install \
-    %{tde_datadir}/services/${proto}.protocol \
-    ${proto}.protocol \
-    %{tde_datadir}/services/${proto}.protocol_tdesvn \
-    20
-done
-
-%preun tdeio-plugins
-if [ $1 -eq 0 ]; then
-  for proto in svn+file svn+http svn+https svn+ssh svn; do
-    update-alternatives --remove \
-      ${proto}.protocol \
-      %{tde_datadir}/services/${proto}.protocol_tdesvn
-  done
-fi
-
-
-
-%postun -n trinity-libsvnqt
-/sbin/ldconfig || :
-
-
-%files -f kdesvn.lang
-%defattr(-,root,root,-)
-%doc AUTHORS ChangeLog COPYING NEWS README TODO
-%{tde_bindir}/kdesvn
-%{tde_bindir}/kdesvnaskpass
-%{tde_tdelibdir}/libkdesvnpart.la
-%{tde_tdelibdir}/libkdesvnpart.so
-%{tde_datadir}/applications/kde/kdesvn.desktop
-%{tde_datadir}/apps/kconf_update/kdesvn-use-external-update.sh
-%{tde_datadir}/apps/kconf_update/kdesvnpartrc-use-external.upd
-%{tde_datadir}/apps/kdesvn/kdesvnui.rc
-%{tde_datadir}/apps/kdesvnpart/kdesvn_part.rc
-%{tde_datadir}/apps/konqueror/servicemenus/kdesvn_subversion.desktop
-%{tde_datadir}/config.kcfg/kdesvn_part.kcfg
-%{tde_datadir}/icons/hicolor/*/*/*.png
-%{tde_datadir}/icons/hicolor/*/*/*.svgz
-%{tde_mandir}/man1/kdesvn.1
-%{tde_mandir}/man1/kdesvnaskpass.1
-%{tde_tdedocdir}/HTML/*/
-
-%files -n trinity-libsvnqt
-%defattr(-,root,root,-)
-%{tde_libdir}/libsvnqt.so.4
-%{tde_libdir}/libsvnqt.so.4.2.2
-
-%files -n trinity-libsvnqt-devel
-%defattr(-,root,root,-)
-%{tde_includedir}/svnqt
-%{tde_libdir}/libsvnqt.so
-
-%files tdeio-plugins
-%defattr(-,root,root,-)
-%{tde_datadir}/services/kded/kdesvnd.desktop
-%{tde_datadir}/services/ksvn+file.protocol
-%{tde_datadir}/services/ksvn+http.protocol
-%{tde_datadir}/services/ksvn+https.protocol
-%{tde_datadir}/services/ksvn+ssh.protocol
-%{tde_datadir}/services/ksvn.protocol
-%{tde_datadir}/services/svn+file.protocol_tdesvn
-%{tde_datadir}/services/svn+http.protocol_tdesvn
-%{tde_datadir}/services/svn+https.protocol_tdesvn
-%{tde_datadir}/services/svn+ssh.protocol_tdesvn
-%{tde_datadir}/services/svn.protocol_tdesvn
-%{tde_tdelibdir}/kio_ksvn.la
-%{tde_tdelibdir}/kio_ksvn.so
-%{tde_tdelibdir}/kded_kdesvnd.la
-%{tde_tdelibdir}/kded_kdesvnd.so
-
-
-%changelog
diff --git a/redhat/applications/tdesvn/tdesvn-14.0.0.spec b/redhat/applications/tdesvn/tdesvn.spec
index 675f25b7f..5b418701a 100644
--- a/redhat/applications/tdesvn/tdesvn-14.0.0.spec
+++ b/redhat/applications/tdesvn/tdesvn.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 tdesvn
 %define tde_prefix /opt/trinity
@@ -55,7 +55,6 @@ Prefix:		%{tde_prefix}
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Source0:		%{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
-Patch0:			%{tde_pkg}-14.0.0.patch
 
 BuildRequires:	trinity-tdelibs-devel >= %{tde_version}
 BuildRequires:	trinity-tdebase-devel >= %{tde_version}
@@ -247,10 +246,9 @@ fi
 
 %prep
 %setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}}
-%patch0 -p1
 
 rm -f src/svnqt/CMakeLists.txt.orig
-rm -fr src/svnqt/cache/sqlite3/
+#rm -fr src/svnqt/cache/sqlite3/
 
 
 %build