François Andriot
10 years ago
parent
b61f82ab27
commit
cb13775f3a
@ -1,11 +0,0 @@
|
||||
--- kdesvn/src/kdesvnd/CMakeLists.txt.ORI 2012-05-01 23:53:03.503449741 +0200
|
||||
+++ kdesvn/src/kdesvnd/CMakeLists.txt 2012-05-01 23:53:09.754340075 +0200
|
||||
@@ -23,7 +23,7 @@
|
||||
|
||||
SET_TARGET_PROPERTIES(kded_kdesvnd
|
||||
PROPERTIES
|
||||
- LINK_FLAGS "${LINK_NO_UNDEFINED} ${_BASE_LDADD} ${APR_EXTRA_LIBFLAGS} ${APU_EXTRA_LIBFLAGS} -module")
|
||||
+ LINK_FLAGS "${LINK_NO_UNDEFINED} ${_BASE_LDADD} ${APR_EXTRA_LIBFLAGS} ${APU_EXTRA_LIBFLAGS}")
|
||||
|
||||
INSTALL(TARGETS kded_kdesvnd
|
||||
RUNTIME DESTINATION ${BIN_INSTALL_DIR}
|
||||
@ -1,127 +0,0 @@
|
||||
--- kdesvn/src/svnqt/cache/LogCache.cpp.stringliteral 2011-08-17 23:41:23.000000000 +0200
|
||||
+++ kdesvn/src/svnqt/cache/LogCache.cpp 2012-08-05 12:44:59.038119225 +0200
|
||||
@@ -187,7 +187,7 @@
|
||||
TQDataBase db = TQSqlDatabase::addDatabase(SQLTYPE,_key);
|
||||
db->setDatabaseName(m_BasePath+"/maindb.db");
|
||||
if (!db->open()) {
|
||||
- qWarning("Failed to open main database: " + db->lastError().text());
|
||||
+ qWarning("%s", (TQString("Failed to open main database: " + db->lastError().text())).ascii());
|
||||
} else {
|
||||
m_mainDB.setLocalData(new ThreadDBStore);
|
||||
m_mainDB.localData()->key = _key;
|
||||
@@ -269,12 +269,12 @@
|
||||
#endif
|
||||
TQDataBase mainDB = m_CacheData->getMainDB();
|
||||
if (!mainDB || !mainDB->open()) {
|
||||
- qWarning("Failed to open main database: " + (mainDB?mainDB->lastError().text():"No database object."));
|
||||
+ qWarning("%s", ("Failed to open main database: " + (mainDB?mainDB->lastError().text():"No database object.")).ascii());
|
||||
} else {
|
||||
TQSqlQuery q(TQString(), mainDB);
|
||||
mainDB->transaction();
|
||||
if (!q.exec("CREATE TABLE IF NOT EXISTS \""+TQString(SQLMAINTABLE)+"\" (\"reposroot\" TEXT,\"id\" INTEGER PRIMARY KEY NOT NULL);")) {
|
||||
- qWarning("Failed create main database: " + mainDB->lastError().text());
|
||||
+ qWarning("%s", ("Failed create main database: " + mainDB->lastError().text()).ascii());
|
||||
}
|
||||
mainDB->commit();
|
||||
}
|
||||
@@ -321,7 +321,7 @@
|
||||
TQSqlQuery cur(TQString(),mainDB);
|
||||
cur.prepare(s_q);
|
||||
if (!cur.exec()) {
|
||||
- qDebug(cur.lastError().text().TOUTF8().data());
|
||||
+ qDebug("%s", (TQString(cur.lastError().text().TOUTF8().data())).ascii());
|
||||
throw svn::cache::DatabaseException(TQString("Could not retrieve values: ")+cur.lastError().text());
|
||||
return _res;
|
||||
}
|
||||
--- kdesvn/src/svnqt/cache/ReposLog.cpp.ORI 2012-08-05 12:50:50.352685697 +0200
|
||||
+++ kdesvn/src/svnqt/cache/ReposLog.cpp 2012-08-05 12:55:39.515888432 +0200
|
||||
@@ -68,7 +68,7 @@
|
||||
TQString q("select revision from 'logentries' order by revision DESC limit 1");
|
||||
TQSqlQuery _q(TQString(), m_Database);
|
||||
if (!_q.exec(q)) {
|
||||
- qDebug(_q.lastError().text().TOUTF8().data());
|
||||
+ qDebug("%s", (TQString(_q.lastError().text().TOUTF8().data())).ascii());
|
||||
return svn::Revision::UNDEFINED;
|
||||
}
|
||||
int _r;
|
||||
@@ -76,7 +76,7 @@
|
||||
//qDebug("Sel result: %s",_q.value(0).toString().TOUTF8().data());
|
||||
_r = _q.value(0).toInt();
|
||||
} else {
|
||||
- qDebug(_q.lastError().text().TOUTF8().data());
|
||||
+ qDebug("%s", (TQString(_q.lastError().text().TOUTF8().data())).ascii());
|
||||
return svn::Revision::UNDEFINED;
|
||||
}
|
||||
return _r;
|
||||
@@ -197,7 +197,7 @@
|
||||
bcount.bindValue(0,TQ_LLONG(end.revnum()));
|
||||
bcount.bindValue(1,TQ_LLONG(start.revnum()));
|
||||
if (!bcount.exec()) {
|
||||
- qDebug(bcount.lastError().text().TOUTF8().data());
|
||||
+ qDebug("%s", (TQString(bcount.lastError().text().TOUTF8().data())).ascii());
|
||||
throw svn::cache::DatabaseException(TQString("Could not retrieve count: ")+bcount.lastError().text());
|
||||
return false;
|
||||
}
|
||||
@@ -211,7 +211,7 @@
|
||||
bcur.bindValue(1,TQ_LLONG(start.revnum()));
|
||||
|
||||
if (!bcur.exec()) {
|
||||
- qDebug(bcur.lastError().text().TOUTF8().data());
|
||||
+ qDebug("%s", (TQString(bcur.lastError().text().TOUTF8().data())).ascii());
|
||||
throw svn::cache::DatabaseException(TQString("Could not retrieve values: ")+bcur.lastError().text());
|
||||
return false;
|
||||
}
|
||||
@@ -220,7 +220,7 @@
|
||||
revision = bcur.value(0).toLongLong();
|
||||
cur.bindValue(0,revision);
|
||||
if (!cur.exec()) {
|
||||
- qDebug(cur.lastError().text().TOUTF8().data());
|
||||
+ qDebug("%s", (TQString(cur.lastError().text().TOUTF8().data())).ascii());
|
||||
throw svn::cache::DatabaseException(TQString("Could not retrieve values: ")+cur.lastError().text()
|
||||
,cur.lastError().number());
|
||||
return false;
|
||||
@@ -264,7 +264,7 @@
|
||||
TQSqlQuery query("select revision,date from logentries order by revision desc limit 1",m_Database);
|
||||
|
||||
if (query.lastError().type()!=TQSqlError::None) {
|
||||
- qDebug(query.lastError().text().TOUTF8().data());
|
||||
+ qDebug("%s", (TQString(query.lastError().text().TOUTF8().data())).ascii());
|
||||
}
|
||||
bool must_remote=!noNetwork;
|
||||
if (query.next()) {
|
||||
@@ -283,7 +283,7 @@
|
||||
query.bindValue(0,TQ_LLONG(aRev.date()));
|
||||
query.exec();
|
||||
if (query.lastError().type()!=TQSqlError::None) {
|
||||
- qDebug(query.lastError().text().TOUTF8().data());
|
||||
+ qDebug("%s", (TQString(query.lastError().text().TOUTF8().data())).ascii());
|
||||
}
|
||||
if (query.next()) {
|
||||
return query.value(0).toInt();
|
||||
@@ -320,7 +320,7 @@
|
||||
if (!_q.exec()) {
|
||||
m_Database->rollback();
|
||||
qDebug("Could not insert values: %s",_q.lastError().text().TOUTF8().data());
|
||||
- qDebug(_q.lastQuery().TOUTF8().data());
|
||||
+ qDebug("%s", (TQString(_q.lastQuery().TOUTF8().data())).ascii());
|
||||
throw svn::cache::DatabaseException(TQString("Could not insert values: ")+_q.lastError().text(),_q.lastError().number());
|
||||
}
|
||||
_q.prepare(qPathes);
|
||||
@@ -334,7 +334,7 @@
|
||||
if (!_q.exec()) {
|
||||
m_Database->rollback();
|
||||
qDebug("Could not insert values: %s",_q.lastError().text().TOUTF8().data());
|
||||
- qDebug(_q.lastQuery().TOUTF8().data());
|
||||
+ qDebug("%s", (TQString(_q.lastQuery().TOUTF8().data())).ascii());
|
||||
throw svn::cache::DatabaseException(TQString("Could not insert values: ")+_q.lastError().text(),_q.lastError().number());
|
||||
}
|
||||
}
|
||||
@@ -375,7 +375,7 @@
|
||||
_q.prepare(query_string);
|
||||
if (!_q.exec()) {
|
||||
qDebug("Could not select values: %s",_q.lastError().text().TOUTF8().data());
|
||||
- qDebug(_q.lastQuery().TOUTF8().data());
|
||||
+ qDebug("%s", (TQString(_q.lastQuery().TOUTF8().data())).ascii());
|
||||
throw svn::cache::DatabaseException(TQString("Could not select values: ")+_q.lastError().text(),_q.lastError().number());
|
||||
}
|
||||
while(_q.next()) {
|
||||
@ -1,287 +0,0 @@
|
||||
# Default version for this component
|
||||
%define kdecomp kdesvn
|
||||
|
||||
# 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 3.5.13 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-%{kdecomp}
|
||||
Summary: subversion client with tight KDE integration [Trinity]
|
||||
Version: 1.0.4
|
||||
Release: 4%{?dist}%{?_variant}
|
||||
|
||||
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: %{kdecomp}-3.5.13.1.tar.gz
|
||||
|
||||
# [kdesvn] Fix "not a string literal" error
|
||||
Patch2: kdesvn-3.5.13-fix_not_a_string_literal_error.patch
|
||||
|
||||
BuildRequires: trinity-tqtinterface-devel >= 3.5.13.1
|
||||
BuildRequires: trinity-tdelibs-devel >= 3.5.13.1
|
||||
BuildRequires: trinity-tdebase-devel >= 3.5.13.1
|
||||
BuildRequires: desktop-file-utils
|
||||
BuildRequires: gettext
|
||||
|
||||
BuildRequires: subversion-devel
|
||||
Requires: trinity-kdesvn-kio-plugins = %{version}-%{release}
|
||||
|
||||
|
||||
%description
|
||||
KDESvn is a graphical client for the subversion revision control
|
||||
system (svn).
|
||||
|
||||
Besides offering common and advanced svn operations, it features
|
||||
a tight integration into KDE and can be embedded into other KDE
|
||||
applications like konqueror via the KDE 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 kio-plugins
|
||||
Group: Development/Libraries
|
||||
Conflicts: trinity-kdesdk-kio-plugins
|
||||
Summary: subversion I/O slaves for Trinity
|
||||
|
||||
%description kio-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 KDE application.
|
||||
|
||||
This package is part of tdesvn-trinity.
|
||||
|
||||
|
||||
%if 0%{?suse_version} || 0%{?pclinuxos}
|
||||
%debug_package
|
||||
%endif
|
||||
|
||||
|
||||
%prep
|
||||
%setup -q -n %{kdecomp}-3.5.13.1
|
||||
%patch2 -p1 -b .stringliteral
|
||||
|
||||
# Ugly hack to modify TQT include directory inside autoconf files.
|
||||
# If TQT detection fails, it fallbacks to TQT4 instead of TQT3 !
|
||||
find . -name CMakeLists.txt -exec %__sed -i {} \
|
||||
-e "s,/usr/include/tqt,%{tde_includedir}/tqt,g" \
|
||||
-e "s,/usr/bin/tmoc,%{tde_bindir}/tmoc,g" \
|
||||
-e "s,/usr/bin/uic-tqt,%{tde_bindir}/uic-tqt,g" \
|
||||
\;
|
||||
|
||||
# More ugly hack to add TQT include directory in CMakeLists.txt
|
||||
%__sed -i CMakeLists.txt \
|
||||
-e "s,^\(INCLUDE_DIRECTORIES (\)$,\1\n%{tde_includedir}/tqt,"
|
||||
|
||||
# Moves HTML files to the correect location
|
||||
find . -name "*.cmake" -exec %__sed -i {} \
|
||||
-e "s,/doc/HTML,/doc/kde/HTML,g" \
|
||||
\;
|
||||
|
||||
%build
|
||||
unset QTDIR; . /etc/profile.d/qt3.sh
|
||||
export PATH="%{tde_bindir}:${QTDIR}/bin:${PATH}"
|
||||
export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}"
|
||||
|
||||
export CMAKE_INCLUDE_PATH="%{tde_tdeincludedir}"
|
||||
|
||||
%if 0%{?rhel} || 0%{?fedora} || 0%{?suse_version}
|
||||
%__mkdir_p build
|
||||
cd build
|
||||
%endif
|
||||
|
||||
%cmake \
|
||||
-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} \
|
||||
-DCMAKE_SKIP_RPATH="OFF" \
|
||||
..
|
||||
|
||||
# SMP safe !
|
||||
%__make %{?_smp_mflags}
|
||||
|
||||
|
||||
%install
|
||||
export PATH="%{_bindir}:${PATH}"
|
||||
%__rm -rf %{buildroot}
|
||||
%__make install DESTDIR=%{buildroot} -C build
|
||||
|
||||
|
||||
%find_lang %{kdecomp} || touch %{kdecomp}.lang
|
||||
|
||||
# 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
|
||||
%__ln_s /etc/alternatives/svn+file.protocol %{?buildroot}%{tde_datadir}/services/svn+file.protocol
|
||||
%__ln_s /etc/alternatives/svn+http.protocol %{?buildroot}%{tde_datadir}/services/svn+http.protocol
|
||||
%__ln_s /etc/alternatives/svn+https.protocol %{?buildroot}%{tde_datadir}/services/svn+https.protocol
|
||||
%__ln_s /etc/alternatives/svn+ssh.protocol %{?buildroot}%{tde_datadir}/services/svn+ssh.protocol
|
||||
%__ln_s /etc/alternatives/svn.protocol %{?buildroot}%{tde_datadir}/services/svn.protocol
|
||||
|
||||
|
||||
%clean
|
||||
%__rm -rf %{buildroot}
|
||||
|
||||
|
||||
%post
|
||||
touch --no-create %{_datadir}/icons/hicolor || :
|
||||
gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
|
||||
|
||||
%postun
|
||||
touch --no-create %{_datadir}/icons/hicolor || :
|
||||
gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
|
||||
|
||||
%post -n trinity-libsvnqt
|
||||
/sbin/ldconfig || :
|
||||
|
||||
%post kio-plugins
|
||||
for proto in svn+file svn+http svn+https svn+ssh svn; do
|
||||
%if 0%{?suse_version}
|
||||
update-alternatives --install \
|
||||
%else
|
||||
alternatives --install \
|
||||
%endif
|
||||
%{tde_datadir}/services/${proto}.protocol \
|
||||
${proto}.protocol \
|
||||
%{tde_datadir}/services/${proto}.protocol_tdesvn \
|
||||
20
|
||||
done
|
||||
|
||||
%preun kio-plugins
|
||||
if [ $1 -eq 0 ]; then
|
||||
for proto in svn+file svn+http svn+https svn+ssh svn; do
|
||||
%if 0%{?suse_version}
|
||||
update-alternatives --remove \
|
||||
%else
|
||||
alternatives --remove \
|
||||
%endif
|
||||
${proto}.protocol \
|
||||
%{tde_datadir}/services/${proto}.protocol_tdesvn
|
||||
done
|
||||
fi
|
||||
|
||||
|
||||
|
||||
%postun -n trinity-libsvnqt
|
||||
/sbin/ldconfig || :
|
||||
|
||||
|
||||
%files -f %{kdecomp}.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
|
||||
%{tde_libdir}/libsvnqt.so.4
|
||||
%{tde_libdir}/libsvnqt.so.4.2.2
|
||||
|
||||
%files -n trinity-libsvnqt-devel
|
||||
%{tde_includedir}/svnqt
|
||||
%{tde_libdir}/libsvnqt.so
|
||||
|
||||
%files kio-plugins
|
||||
%{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
|
||||
%{tde_datadir}/services/svn+http.protocol
|
||||
%{tde_datadir}/services/svn+https.protocol
|
||||
%{tde_datadir}/services/svn+ssh.protocol
|
||||
%{tde_datadir}/services/svn.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
|
||||
* 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
|
||||
@ -1,274 +0,0 @@
|
||||
# Default version for this component
|
||||
%define kdecomp kdesvn
|
||||
|
||||
# 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 3.5.13 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}/kde
|
||||
%define tde_tdeincludedir %{tde_includedir}/kde
|
||||
%define tde_tdelibdir %{tde_libdir}/trinity
|
||||
|
||||
%define _docdir %{tde_docdir}
|
||||
|
||||
|
||||
Name: trinity-%{kdecomp}
|
||||
Summary: subversion client with tight KDE integration [Trinity]
|
||||
Version: 1.0.4
|
||||
Release: 3%{?dist}%{?_variant}
|
||||
|
||||
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: %{kdecomp}-3.5.13.tar.gz
|
||||
|
||||
# [kdesvn] Fix compilation with GCC 4.7
|
||||
Patch1: kdesvn-3.5.13-fix_gcc47_compilation.patch
|
||||
# [kdesvn] Fix "not a string literal" error
|
||||
Patch2: kdesvn-3.5.13-fix_not_a_string_literal_error.patch
|
||||
|
||||
BuildRequires: tqtinterface-devel
|
||||
BuildRequires: trinity-tdelibs-devel
|
||||
BuildRequires: trinity-tdebase-devel
|
||||
BuildRequires: desktop-file-utils
|
||||
BuildRequires: gettext
|
||||
|
||||
BuildRequires: subversion-devel
|
||||
Requires: trinity-kdesvn-kio-plugins = %{version}-%{release}
|
||||
|
||||
|
||||
%description
|
||||
KDESvn is a graphical client for the subversion revision control
|
||||
system (svn).
|
||||
|
||||
Besides offering common and advanced svn operations, it features
|
||||
a tight integration into KDE and can be embedded into other KDE
|
||||
applications like konqueror via the KDE 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 kio-plugins
|
||||
Group: Development/Libraries
|
||||
Conflicts: trinity-kdesdk-kio-plugins
|
||||
Summary: subversion I/O slaves for Trinity
|
||||
|
||||
%description kio-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 KDE application.
|
||||
|
||||
This package is part of tdesvn-trinity.
|
||||
|
||||
|
||||
%prep
|
||||
%setup -q -n applications/%{kdecomp}
|
||||
%patch1 -p1
|
||||
%patch2 -p1 -b .stringliteral
|
||||
|
||||
# Ugly hack to modify TQT include directory inside autoconf files.
|
||||
# If TQT detection fails, it fallbacks to TQT4 instead of TQT3 !
|
||||
find . -name CMakeLists.txt -exec %__sed -i {} \
|
||||
-e "s,/usr/include/tqt,%{tde_includedir}/tqt,g" \
|
||||
-e "s,/usr/bin/tmoc,%{tde_bindir}/tmoc,g" \
|
||||
-e "s,/usr/bin/uic-tqt,%{tde_bindir}/uic-tqt,g" \
|
||||
\;
|
||||
|
||||
# More ugly hack to add TQT include directory in CMakeLists.txt
|
||||
%__sed -i CMakeLists.txt \
|
||||
-e "s,^\(INCLUDE_DIRECTORIES (\)$,\1\n%{tde_includedir}/tqt,"
|
||||
|
||||
# Moves HTML files to the correect location
|
||||
find . -name "*.cmake" -exec %__sed -i {} \
|
||||
-e "s,/doc/HTML,/doc/kde/HTML,g" \
|
||||
\;
|
||||
|
||||
%build
|
||||
unset QTDIR; . /etc/profile.d/qt.sh
|
||||
export PATH="%{tde_bindir}:${QTDIR}/bin:${PATH}"
|
||||
export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}"
|
||||
|
||||
export CMAKE_INCLUDE_PATH="%{tde_tdeincludedir}"
|
||||
|
||||
%if 0%{?rhel} || 0%{?fedora}
|
||||
%__mkdir_p build
|
||||
cd build
|
||||
%endif
|
||||
|
||||
%cmake \
|
||||
-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} \
|
||||
-DCMAKE_SKIP_RPATH="OFF" \
|
||||
..
|
||||
|
||||
# SMP safe !
|
||||
%__make %{?_smp_mflags}
|
||||
|
||||
|
||||
%install
|
||||
export PATH="%{_bindir}:${PATH}"
|
||||
%__rm -rf %{buildroot}
|
||||
%__make install DESTDIR=%{buildroot} -C build
|
||||
|
||||
|
||||
%find_lang %{kdecomp} || touch %{kdecomp}.lang
|
||||
|
||||
# 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
|
||||
%__ln_s /etc/alternatives/svn+file.protocol %{?buildroot}%{tde_datadir}/services/svn+file.protocol
|
||||
%__ln_s /etc/alternatives/svn+http.protocol %{?buildroot}%{tde_datadir}/services/svn+http.protocol
|
||||
%__ln_s /etc/alternatives/svn+https.protocol %{?buildroot}%{tde_datadir}/services/svn+https.protocol
|
||||
%__ln_s /etc/alternatives/svn+ssh.protocol %{?buildroot}%{tde_datadir}/services/svn+ssh.protocol
|
||||
%__ln_s /etc/alternatives/svn.protocol %{?buildroot}%{tde_datadir}/services/svn.protocol
|
||||
|
||||
|
||||
%clean
|
||||
%__rm -rf %{buildroot}
|
||||
|
||||
|
||||
%post
|
||||
touch --no-create %{_datadir}/icons/hicolor || :
|
||||
gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
|
||||
|
||||
%postun
|
||||
touch --no-create %{_datadir}/icons/hicolor || :
|
||||
gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
|
||||
|
||||
%post -n trinity-libsvnqt
|
||||
/sbin/ldconfig || :
|
||||
|
||||
%post kio-plugins
|
||||
for proto in svn+file svn+http svn+https svn+ssh svn; do
|
||||
alternatives --install \
|
||||
%{tde_datadir}/services/${proto}.protocol \
|
||||
${proto}.protocol \
|
||||
%{tde_datadir}/services/${proto}.protocol_tdesvn \
|
||||
20
|
||||
done
|
||||
|
||||
%preun kio-plugins
|
||||
if [ $1 -eq 0 ]; then
|
||||
for proto in svn+file svn+http svn+https svn+ssh svn; do
|
||||
alternatives --remove \
|
||||
${proto}.protocol \
|
||||
%{tde_datadir}/services/${proto}.protocol_tdesvn
|
||||
done
|
||||
fi
|
||||
|
||||
|
||||
|
||||
%postun -n trinity-libsvnqt
|
||||
/sbin/ldconfig || :
|
||||
|
||||
|
||||
%files -f %{kdecomp}.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
|
||||
%{tde_libdir}/libsvnqt.so.4
|
||||
%{tde_libdir}/libsvnqt.so.4.2.2
|
||||
|
||||
%files -n trinity-libsvnqt-devel
|
||||
%{tde_includedir}/svnqt
|
||||
%{tde_libdir}/libsvnqt.so
|
||||
|
||||
%files kio-plugins
|
||||
%{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
|
||||
%{tde_datadir}/services/svn+http.protocol
|
||||
%{tde_datadir}/services/svn+https.protocol
|
||||
%{tde_datadir}/services/svn+ssh.protocol
|
||||
%{tde_datadir}/services/svn.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
|
||||
* 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
|
||||
Loading…
Reference in new issue