Compare commits

...

5 Commits

2 changed files with 68 additions and 68 deletions

View File

@ -1,11 +0,0 @@
--- kdesvn-1.5.5.orig/src/svnfrontend/graphtree/revgraphview.h
+++ kdesvn-1.5.5/src/svnfrontend/graphtree/revgraphview.h
@@ -49,7 +49,7 @@ typedef svn::SharedPointer<KTemporaryFil
/**
@author Rajko Albrecht <ral@alwins-world.de>
*/
-class RevGraphView : virtual public QGraphicsView
+class RevGraphView : public QGraphicsView
{
Q_OBJECT
public:

View File

@ -4,42 +4,61 @@
%define libname lib%{name}
Name: kdesvn
Version: 1.6.0
Release: 4mamba
Version: 2.1.0
Release: 3mamba
Summary: A subversion client for KDE
Group: Graphical Desktop/Applications/Development
Vendor: openmamba
Distribution: openmamba
Packager: Silvan Calarco <silvan.calarco@mambasoft.it>
URL: http://kdesvn.alwins-world.de
Source: http://kdesvn.alwins-world.de/downloads/kdesvn-%{version}.tar.bz2
Patch0: %{name}-1.5.5-qt-4.8.patch
URL: https://kdesvn.alwins-world.de/
Source: http://kde.mirror.anlx.net/stable/kdesvn/%{version}/kdesvn-%{version}.tar.xz
License: LGPL
## AUTOBUILDREQ-BEGIN
BuildRequires: glibc-devel
BuildRequires: kdelibs-devel
BuildRequires: libX11-devel
BuildRequires: libapr-devel
BuildRequires: libaprutil-devel
BuildRequires: libdb47-devel
BuildRequires: libdb53-devel
BuildRequires: libexpat-devel
BuildRequires: libgcc
BuildRequires: libgdbm-devel
BuildRequires: libkauth-devel
BuildRequires: libkbookmarks-devel
BuildRequires: libkcodecs-devel
BuildRequires: libkcompletion-devel
BuildRequires: libkconfig-devel
BuildRequires: libkconfigwidgets-devel
BuildRequires: libkcoreaddons-devel
BuildRequires: libkdbusaddons-devel
BuildRequires: libki18n-devel
BuildRequires: libkiconthemes-devel
BuildRequires: libkio-devel
BuildRequires: libkitemviews-devel
BuildRequires: libkjobwidgets-devel
BuildRequires: libknotifications-devel
BuildRequires: libkparts-devel
BuildRequires: libkservice-devel
BuildRequires: libktextwidgets-devel
BuildRequires: libkwallet-devel
BuildRequires: libkwidgetsaddons-devel
BuildRequires: libkwindowsystem-devel
BuildRequires: libkxmlgui-devel
BuildRequires: libopenldap-devel
BuildRequires: libqt4-devel
BuildRequires: libsoprano-devel
BuildRequires: libsolid-devel
BuildRequires: libsonnet-devel
BuildRequires: libstdc++6-devel
BuildRequires: libuuid-devel
BuildRequires: libxcrypt-devel
BuildRequires: qt5-qtbase-devel
BuildRequires: subversion-devel
## AUTOBUILDREQ-END
BuildRequires: cmake
BuildRequires: libpng-devel
BuildRequires: libjpeg-devel
BuildRequires: libneon-devel >= 0.24.7
Requires: kdelibs >= %{kdever}
Requires: subversion >= 1.2.3
Requires: kdiff3
Requires: %{libname} = %{?epoch:%epoch:}%{version}-%{release}
BuildRoot: %{_tmppath}/%{name}-%{version}-root
%description
KDESvn is a frontend to the subversion vcs.
@ -55,8 +74,7 @@ Requires: %{name} = %{?epoch:%epoch:}%{version}-%{release}
KDESvn is a frontend to the subversion vcs.
In difference to most other tools it uses the subversion C-Api direct via a c++ wrapper made by Rapid SVN and doesn't parse the output of the subversion client.
So it is a real client itself instead of a frontend to the command line tool.
This package contains static libraries and header files need for development
This package contains static libraries and header files needed for development
%package -n %{libname}
Group: Graphical Desktop/Libraries/KDE
@ -69,12 +87,13 @@ So it is a real client itself instead of a frontend to the command line tool.
This package contains the shared library needed to run kdesvn.
%debug_package
%prep
%setup -q
#%patch0 -p1
%build
%cmake_kde4 \
%cmake_kde5 \
-DCMAKE_BUILD_TYPE=release
%make
@ -83,18 +102,7 @@ This package contains the shared library needed to run kdesvn.
[ "%{buildroot}" != / ] && rm -rf "%{buildroot}"
%makeinstall DESTDIR=%{buildroot}
%find_lang %{name}
## these files conflict with kdesdk >= 3.5.3
#rm -f %{buildroot}%{_kdedatadir}/services/svn+file.protocol
#rm -f %{buildroot}%{_kdedatadir}/services/svn+http.protocol
#rm -f %{buildroot}%{_kdedatadir}/services/svn+https.protocol
#rm -f %{buildroot}%{_kdedatadir}/services/svn+ssh.protocol
#rm -f %{buildroot}%{_kdedatadir}/services/svn.protocol
install -d %{buildroot}%{_mandir}/man1
mv %{buildroot}%{_kde4_sharedir}/man/man1/*.1 \
%{buildroot}%{_mandir}/man1/
%find_lang %{name} --with-man --with-html --all-name
%clean
[ "%{buildroot}" != / ] && rm -rf "%{buildroot}"
@ -104,40 +112,43 @@ mv %{buildroot}%{_kde4_sharedir}/man/man1/*.1 \
%files -f %{name}.lang
%defattr(-,root,root)
%{_kde4_bindir}/kdesvn
%{_kde4_bindir}/kdesvnaskpass
%{_kde4_libdir}/libsvnqt.so.*
%{_kde4_libdir}/kde4/*.so
%{_kde4_datadir}/kconf_update/kdesvn*
%{_kde4_datadir}/kdesvn
%{_kde4_datadir}/kdesvnpart/kdesvn_part.rc
%{_kde4_sharedir}/config.kcfg/kdesvn_part.kcfg
%{_kde4_htmldir}/en
%lang(nl) %{_kde4_htmldir}/nl
%{_kde4_icondir}/hicolor
%{_kde4_xdgappsdir}/kdesvn.desktop
%{_kde4_servicesdir}/ServiceMenus/kdesvn_subversion*.desktop
%{_kde4_servicesdir}/kded/kdesvnd.desktop
%{_kde4_servicesdir}/kdesvnpart.desktop
%{_kde4_servicesdir}/*.protocol
%{_kde5_bindir}/kdesvn
%{_kde5_bindir}/kdesvnaskpass
%{_libdir}/qt5/plugins/kdesvnpart.so
%{_libdir}/qt5/plugins/kf5/kded/kdesvnd.so
%{_libdir}/qt5/plugins/kio_ksvn.so
%{_kde5_datadir}/kconf_update/kdesvn*
%{_kde5_datadir}/kdesvn
%{_kde5_sharedir}/config.kcfg/kdesvn_part.kcfg
%{_kde5_icondir}/hicolor
%{_datadir}/applications/org.kde.kdesvn.desktop
%{_datadir}/metainfo/org.kde.kdesvn.appdata.xml
%{_kde5_servicesdir}/ServiceMenus/kdesvn_subversion*.desktop
%{_kde5_servicesdir}/kdesvnpart.desktop
%{_kde5_servicesdir}/*.protocol
%{_datadir}/dbus-1/interfaces/kf5_org.kde.kdesvnd.xml
%{_datadir}/dbus-1/services/org.kde.kdesvnd.service
%{_datadir}/kxmlgui5/kdesvn/*.rc
%{_mandir}/man1/kdesvn.1*
%{_mandir}/man1/kdesvnaskpass.1*
%{_kde4_sharedir}/svnqt/i18n/*.qm
%{_datadir}/dbus-1/interfaces/org.kde.kdesvnd.xml
%doc AUTHORS COPYING
%files devel
%defattr(-,root,root)
%{_kde4_libdir}/libsvnqt.so
%{_kde4_includedir}/svnqt/cache/*.h
%{_kde4_includedir}/svnqt/repoparameter.cpp
%{_kde4_includedir}/svnqt/*.h
%doc ChangeLog TODO
%files -n %{libname}
%defattr(-,root,root)
%changelog
* Fri Mar 01 2024 Silvan Calarco <silvan.calarco@mambasoft.it> 2.1.0-3mamba
- rebuilt to remove requirement for db47
* Wed Sep 09 2020 Silvan Calarco <silvan.calarco@mambasoft.it> 2.1.0-2mamba
- removed requirement for kdelibs; added debug package
* Sun Aug 18 2019 Automatic Build System <autodist@mambasoft.it> 2.1.0-1mamba
- automatic version update by autodist
* Sun Dec 11 2016 Automatic Build System <autodist@mambasoft.it> 2.0.0-1mamba
- automatic version update by autodist
* Sat Jan 23 2016 Silvan Calarco <silvan.calarco@mambasoft.it> 1.7.0-1mamba
- update to 1.7.0
* Tue Apr 14 2015 Silvan Calarco <silvan.calarco@mambasoft.it> 1.6.0-4mamba
- require kdiff3