diff options
Diffstat (limited to 'redhat/applications/tdesvn')
-rw-r--r-- | redhat/applications/tdesvn/tdesvn-14.0.0.patch | 57 | ||||
-rw-r--r-- | redhat/applications/tdesvn/tdesvn-14.0.0.spec | 326 | ||||
-rw-r--r-- | redhat/applications/tdesvn/tdesvn-3.5.13.2.spec | 29 |
3 files changed, 241 insertions, 171 deletions
diff --git a/redhat/applications/tdesvn/tdesvn-14.0.0.patch b/redhat/applications/tdesvn/tdesvn-14.0.0.patch new file mode 100644 index 000000000..b22e7f2e4 --- /dev/null +++ b/redhat/applications/tdesvn/tdesvn-14.0.0.patch @@ -0,0 +1,57 @@ +--- 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-14.0.0.spec b/redhat/applications/tdesvn/tdesvn-14.0.0.spec index bff026e15..675f25b7f 100644 --- a/redhat/applications/tdesvn/tdesvn-14.0.0.spec +++ b/redhat/applications/tdesvn/tdesvn-14.0.0.spec @@ -1,58 +1,111 @@ -# Default version for this component -%define tde_pkg tdesvn +# +# spec file for package tdesvn (version R14) +# +# Copyright (c) 2014 Trinity Desktop Environment +# +# All modifications and additions to the file contributed by third parties +# remain the property of their copyright owners, unless otherwise agreed +# upon. The license for this file, and modifications and additions to the +# file, is the same license as for the pristine package itself (unless the +# license for the pristine package is not an Open Source License, in which +# case the license is the MIT License). An "Open Source License" is a +# license that conforms to the Open Source Definition (Version 1.9) +# published by the Open Source Initiative. +# +# Please submit bugfixes or comments via http://www.trinitydesktop.org/ +# + +# TDE variables +%define tde_epoch 2 +%if "%{?tde_version}" == "" %define tde_version 14.0.0 - -# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt". -%if "%{?tde_prefix}" != "/usr" -%define _variant .opt %endif - -# TDE specific building variables +%define tde_pkg tdesvn +%define tde_prefix /opt/trinity %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}/tde +%define tde_tdeappdir %{tde_datadir}/applications/tde %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:8}%{?preversion:7_%{preversion}}%{?dist}%{?_variant} +Name: trinity-%{tde_pkg} +Epoch: %{tde_epoch} +Version: 1.0.4 +Release: %{?tde_version}_%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist} +Summary: Subversion client with tight TDE integration +Group: Applications/Utilities +URL: http://www.elliptique.net/~ken/kima/ -License: GPLv2+ -Group: Applications/Utilities +%if 0%{?suse_version} +License: GPL-2.0+ +%else +License: GPLv2+ +%endif -Vendor: Trinity Project -Packager: Francois Andriot <francois.andriot@free.fr> -URL: http://www.elliptique.net/~ken/kima/ +#Vendor: Trinity Desktop +#Packager: Francois Andriot <francois.andriot@free.fr> -Prefix: %{_prefix} -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) +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-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: cmake libtool +BuildRequires: gcc-c++ +BuildRequires: pkgconfig +BuildRequires: fdupes + +# SUSE desktop files utility +%if 0%{?suse_version} +BuildRequires: update-desktop-files +%endif + +%if 0%{?opensuse_bs} && 0%{?suse_version} +# for xdg-menu script +BuildRequires: brp-check-trinity +%endif + +# SVN support BuildRequires: subversion-devel -Requires: %{name}-tdeio-plugins = %{version}-%{release} -Requires: trinity-libsvnqt = %{version}-%{release} -Obsoletes: trinity-kdesvn < %{version}-%{release} -Provides: trinity-kdesvn = %{version}-%{release} +# SQLITE support +BuildRequires: sqlite-devel +BuildRequires: libtqt3-mt-sqlite3 + +# ACL support +BuildRequires: libacl-devel + +# IDN support +BuildRequires: libidn-devel + +# GAMIN support +# Not on openSUSE. +%if 0%{?rhel} || 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion} +%define with_gamin 1 +BuildRequires: gamin-devel +%endif + +# OPENSSL support +BuildRequires: openssl-devel + + +Requires: %{name}-tdeio-plugins = %{?epoch:%{epoch}:}%{version}-%{release} +Requires: trinity-libsvnqt = %{?epoch:%{epoch}:}%{version}-%{release} + +Obsoletes: trinity-kdesvn < %{?epoch:%{epoch}:}%{version}-%{release} +Provides: trinity-kdesvn = %{?epoch:%{epoch}:}%{version}-%{release} + %description TDESvn is a graphical client for the subversion revision control @@ -62,6 +115,38 @@ 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. +%files -f %{tde_pkg}.lang +%defattr(-,root,root,-) +%doc AUTHORS ChangeLog COPYING NEWS README TODO +%{tde_bindir}/tdesvn +%{tde_bindir}/tdesvnaskpass +%{tde_tdelibdir}/tdesvnpart.la +%{tde_tdelibdir}/tdesvnpart.so +%{tde_datadir}/applications/tde/tdesvn.desktop +%{tde_datadir}/apps/tdeconf_update/tdesvn-use-external-update.sh +%{tde_datadir}/apps/tdeconf_update/tdesvnpartrc-use-external.upd +%{tde_datadir}/apps/tdesvn/ +%{tde_datadir}/apps/tdesvnpart/ +%{tde_datadir}/apps/konqueror/servicemenus/tdesvn_subversion.desktop +%{tde_datadir}/config.kcfg/tdesvn_part.kcfg +%{tde_datadir}/icons/hicolor/*/*/*.png +%{tde_datadir}/icons/hicolor/*/*/*.svgz +%{tde_mandir}/man1/tdesvn.1* +%{tde_mandir}/man1/tdesvnaskpass.1* +%lang(en) %{tde_tdedocdir}/HTML/en/tdesvn/ +%lang(nl) %{tde_tdedocdir}/HTML/nl/tdesvn/ +%{tde_libdir}/libksvnwidgets.la +%{tde_libdir}/libksvnwidgets.so +%{tde_libdir}/libsvnfrontend.la +%{tde_libdir}/libsvnfrontend.so +%{tde_libdir}/libtdesvncfgreader.la +%{tde_libdir}/libtdesvncfgreader.so +%{tde_libdir}/libtdesvnevents.la +%{tde_libdir}/libtdesvnevents.so +%{tde_libdir}/libtdesvnhelpers.la +%{tde_libdir}/libtdesvnhelpers.so + +########## %package -n trinity-libsvnqt Group: Development/Libraries @@ -74,9 +159,16 @@ subversion library. It is based on the RapidSvn SvnCpp library, a subversion client API written in C++. +%files -n trinity-libsvnqt +%defattr(-,root,root,-) +%{tde_libdir}/libsvnqt.so.4 +%{tde_libdir}/libsvnqt.so.4.2.2 + +########## + %package -n trinity-libsvnqt-devel Group: Development/Libraries -Requires: trinity-libsvnqt = %{version}-%{release} +Requires: trinity-libsvnqt = %{?epoch:%{epoch}:}%{version}-%{release} Requires: qt-devel Requires: subversion-devel Summary: Qt wrapper library for subversion (development files) [Trinity] @@ -85,42 +177,85 @@ Summary: Qt wrapper library for subversion (development files) [Trinity] This package contains the header files and symbolic links that developers using svnqt will need. +%files -n trinity-libsvnqt-devel +%defattr(-,root,root,-) +%{tde_includedir}/svnqt +%{tde_libdir}/libsvnqt.so + +########## %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} +Obsoletes: trinity-kdesvn-kio-plugins < %{?epoch:%{epoch}:}%{version}-%{release} +Provides: trinity-kdesvn-kio-plugins = %{?epoch:%{epoch}:}%{version}-%{release} +Obsoletes: trinity-tdesvn-kio-plugins < %{?epoch:%{epoch}:}%{version}-%{release} +Provides: trinity-tdesvn-kio-plugins = %{?epoch:%{epoch}:}%{version}-%{release} %description tdeio-plugins -This packages includes KIO slaves for svn, svn+file, svn+http, +This packages includes TDEIO slaves for svn, svn+file, svn+http, svn+https, svn+ssh. This allows you to access subversion repositories -inside any KIO enabled TDE application. +inside any TDEIO enabled TDE application. This package is part of tdesvn-trinity. +%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 + +%files tdeio-plugins +%defattr(-,root,root,-) +%{tde_datadir}/services/kded/tdesvnd.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}/tdeio_ksvn.la +%{tde_tdelibdir}/tdeio_ksvn.so +%{tde_tdelibdir}/kded_tdesvnd.la +%{tde_tdelibdir}/kded_tdesvnd.so + +########## -%if 0%{?suse_version} || 0%{?pclinuxos} +%if 0%{?pclinuxos} || 0%{?suse_version} && 0%{?opensuse_bs} == 0 %debug_package %endif +########## %prep %setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}} +%patch0 -p1 -# Moves HTML files to the correect location -find . -name "*.cmake" -exec %__sed -i {} \ - -e "s,/doc/HTML,/doc/tde/HTML,g" \ - \; +rm -f src/svnqt/CMakeLists.txt.orig +rm -fr src/svnqt/cache/sqlite3/ %build unset QTDIR QTINC QTLIB -export PATH="%{tde_bindir}:${QTDIR}/bin:${PATH}" +export PATH="%{tde_bindir}:${PATH}" export CMAKE_INCLUDE_PATH="%{tde_tdeincludedir}" if ! rpm -E %%cmake|grep -q "cd build"; then @@ -142,7 +277,6 @@ fi -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} \ \ @@ -169,108 +303,14 @@ export PATH="%{_bindir}:${PATH}" # Locales %find_lang %{tde_pkg} +# Updates applications categories for openSUSE +%if 0%{?suse_version} +%suse_update_desktop_file -G "SVN Client" %{tde_pkg} Development RevisionControl +%endif + %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 %{tde_pkg}.lang -%defattr(-,root,root,-) -%doc AUTHORS ChangeLog COPYING NEWS README TODO -%{tde_bindir}/tdesvn -%{tde_bindir}/tdesvnaskpass -%{tde_tdelibdir}/tdesvnpart.la -%{tde_tdelibdir}/tdesvnpart.so -%{tde_datadir}/applications/tde/tdesvn.desktop -%{tde_datadir}/tdeconf_update/tdesvn-use-external-update.sh -%{tde_datadir}/tdeconf_update/tdesvnpartrc-use-external.upd -%{tde_datadir}/tdesvn/tdesvnui.rc -%{tde_datadir}/tdesvnpart/tdesvn_part.rc -%{tde_datadir}/konqueror/servicemenus/tdesvn_subversion.desktop -%{tde_datadir}/config.kcfg/tdesvn_part.kcfg -%{tde_datadir}/icons/hicolor/*/*/*.png -%{tde_datadir}/icons/hicolor/*/*/*.svgz -%{tde_mandir}/man1/tdesvn.1* -%{tde_mandir}/man1/tdesvnaskpass.1* -%lang(en) %{tde_tdedocdir}/HTML/en/tdesvn/ -%lang(nl) %{tde_tdedocdir}/HTML/nl/tdesvn/ -%{tde_libdir}/libksvnwidgets.la -%{tde_libdir}/libksvnwidgets.so -%{tde_libdir}/libsvnfrontend.la -%{tde_libdir}/libsvnfrontend.so -%{tde_libdir}/libtdesvncfgreader.la -%{tde_libdir}/libtdesvncfgreader.so -%{tde_libdir}/libtdesvnevents.la -%{tde_libdir}/libtdesvnevents.so -%{tde_libdir}/libtdesvnhelpers.la -%{tde_libdir}/libtdesvnhelpers.so -#%{tde_datadir}/tdesvn/icons/hicolor/*/apps/tdesvn.png -#%{tde_datadir}/tdesvn/icons/hicolor/scalable/apps/tdesvn.svgz - -%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/tdesvnd.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}/tdeio_ksvn.la -%{tde_tdelibdir}/tdeio_ksvn.so -%{tde_tdelibdir}/kded_tdesvnd.la -%{tde_tdelibdir}/kded_tdesvnd.so - - %changelog -* Mon Jul 29 2013 Francois Andriot <francois.andriot@free.fr> - 1.0.4-8 -- Initial release for TDE 14.0.0 diff --git a/redhat/applications/tdesvn/tdesvn-3.5.13.2.spec b/redhat/applications/tdesvn/tdesvn-3.5.13.2.spec index 6f6a3625c..06473162e 100644 --- a/redhat/applications/tdesvn/tdesvn-3.5.13.2.spec +++ b/redhat/applications/tdesvn/tdesvn-3.5.13.2.spec @@ -2,11 +2,6 @@ %define tde_pkg tdesvn %define tde_version 3.5.13.2 -# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt". -%if "%{?tde_prefix}" != "/usr" -%define _variant .opt -%endif - # TDE specific building variables %define tde_bindir %{tde_prefix}/bin %define tde_datadir %{tde_prefix}/share @@ -27,7 +22,7 @@ Name: trinity-%{tde_pkg} Summary: subversion client with tight TDE integration [Trinity] Version: 1.0.4 -Release: %{?!preversion:7}%{?preversion:6_%{preversion}}%{?dist}%{?_variant} +Release: %{?!preversion:7}%{?preversion:6_%{preversion}}%{?dist} License: GPLv2+ Group: Applications/Utilities @@ -258,25 +253,3 @@ fi %changelog -* Fri Aug 16 2013 Francois Andriot <francois.andriot@free.fr> - 1.0.4-7 -- Build for Fedora 19 - -* Sun Jul 28 2013 Francois Andriot <francois.andriot@free.fr> - 1.0.4-6 -- Rebuild with NDEBUG option - -* Mon Jun 03 2013 Francois Andriot <francois.andriot@free.fr> - 1.0.4-5 -- Initial release for TDE 3.5.13.2 - -* Wed Oct 03 2012 Francois Andriot <francois.andriot@free.fr> - 1.0.4-4 -- Initial release for TDE 3.5.13.1 - -* Mon Jul 30 2012 Francois Andriot <francois.andriot@free.fr> - 1.0.4-3 -- Installs SVN protocols as alternative, avoids conlict with TDESDK - -* Tue May 01 2012 Francois Andriot <francois.andriot@free.fr> - 1.0.4-2 -- Rebuilt for Fedora 17 -- Fix post and postun -- Fix compilation with GCC 4.7 - -* Thu Dec 01 2011 Francois Andriot <francois.andriot@free.fr> - 1.0.4-1 -- Initial release for RHEL 5, RHEL 6, Fedora 15, Fedora 16 |