pool/kdiff3
SHA256
2
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 704043 from KDE:Extra

Browse Source 
OBS-URL: https://build.opensuse.org/request/show/704043
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/kdiff3?expand=0&rev=30
This commit is contained in:
Dominique Leuenberger 2019-06-18 12:55:51 +00:00 committed by Git OBS Bridge
commit e6b6ce4979
4 changed files with 82 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
kdiff3-0.9.98.tar.gz
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:802c1ababa02b403a5dca15955c01592997116a24909745016931537210fd668
size 1762715

3
kdiff3-1.8.1.tar.xz Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:7877c0f38d24f35edc6c61353fe6e12790aaa285663fe403133e4fc00bcf436e
size 897692

27
kdiff3.changes
View File

@ -1,3 +1,30 @@
-------------------------------------------------------------------
Sun May 19 10:48:23 UTC 2019 - wbauer@tmo.at
- Update to 1.8.1:
* Fix enabling of delta movement (kde#407562)
-------------------------------------------------------------------
Tue May 14 10:22:41 UTC 2019 - wbauer@tmo.at
- Update to 1.8:
* Ported to Qt5/KDE Frameworks 5
* Bugfix: Show Identical files setting not applied after rescan
* Change parameter errors to use dialog on Linux as well as
console output
* Don't sort twice when sorting in reverse order
* Fix memory leak introduced in 0.9.91
* Implement Cut/Paste
* Don't enable "Choose C for Everything" on two way merge
* Cleanup code
- Update package summary and description
- Run spec-cleaner
-------------------------------------------------------------------
Thu Dec 8 19:58:01 UTC 2016 - fabian@ritter-vogt.de
- Revert kde4_runtime_requires change
-------------------------------------------------------------------
Tue Nov 29 07:20:36 UTC 2016 - olaf@aepfle.de

87
kdiff3.spec
View File

@ -1,7 +1,7 @@
#
# spec file for package kdiff3
#
# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany.
# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@ -12,24 +12,36 @@
# license that conforms to the Open Source Definition (Version 1.9)
# published by the Open Source Initiative.
# Please submit bugfixes or comments via http://bugs.opensuse.org/
# Please submit bugfixes or comments via https://bugs.opensuse.org/
#
%bcond_without lang
Name: kdiff3
Version: 0.9.98
Version: 1.8.1
Release: 0
Summary: Feature-Rich Code Comparison Utility
License: GPL-2.0+
Summary: Code Comparison Utility
License: GPL-2.0-or-later
Group: Development/Tools/Version Control
Url: http://kdiff3.sourceforge.net/
Source0: %{name}-%{version}.tar.gz
URL: http://kdiff3.sourceforge.net/
Source0: https://download.kde.org/stable/%{name}/%{name}-%{version}.tar.xz
BuildRequires: extra-cmake-modules
BuildRequires: fdupes
BuildRequires: libkde4-devel
BuildRequires: libkonq-devel
BuildRequires: kf5-filesystem
BuildRequires: update-desktop-files
BuildRequires: cmake(KF5CoreAddons)
BuildRequires: cmake(KF5Crash)
BuildRequires: cmake(KF5DocTools)
BuildRequires: cmake(KF5I18n)
BuildRequires: cmake(KF5IconThemes)
BuildRequires: cmake(KF5KIO)
BuildRequires: cmake(KF5Parts)
BuildRequires: cmake(KF5WidgetsAddons)
BuildRequires: cmake(Qt5Core) >= 5.7.0
BuildRequires: cmake(Qt5Gui)
BuildRequires: cmake(Qt5PrintSupport)
BuildRequires: cmake(Qt5Widgets)
Recommends: %{name}-lang = %{version}
BuildRoot: %{_tmppath}/%{name}-%{version}-build
%{?kde4_runtime_requires}
%description
KDiff3 is a program that:
@ -39,44 +51,49 @@ KDiff3 is a program that:
* Shows the differences line-by-line and character-by-character
* Provides an automatic merge facility and an integrated editor for
comfortably solving merge conflicts
solving merge conflicts
* Supports KIO on KDE (allows accessing ftp, sftp, fish, smb, etc.)
* Has an intuitive graphical user interface
* Supports KDE's KIO framework (allows accessing ftp, sftp, fish, smb, etc.)
%lang_package
%prep
%setup -q
%build
%cmake_kde4 -d build
%cmake_kf5 -d build
%make_jobs
%install
pushd build
make DESTDIR=%{buildroot} install
popd
%suse_update_desktop_file -r kdiff3 Qt KDE Utility TextEditor X-KDE-Utilities-File
%kde_post_install
%find_lang %{name} %{name}.lang
%find_lang kdiff3plugin %{name}.lang
%kf5_makeinstall -C build
%suse_update_desktop_file -r org.kde.kdiff3 Qt KDE Utility TextEditor X-KDE-Utilities-File
%if %{with lang}
%find_lang %{name} %{name}.lang --with-man
%find_lang diff_ext %{name}.lang
%find_lang kdiff3fileitemactionplugin %{name}.lang
rm %{buildroot}%{_kde4_htmldir}/*/kdiff3/common
%fdupes -s %{buildroot}
%kf5_find_htmldocs
%endif
%fdupes %{buildroot}
%files
%defattr(-,root,root)
%doc COPYING
%{_kde4_applicationsdir}/kdiff3.desktop
%{_kde4_appsdir}/kdiff3/
%{_kde4_appsdir}/kdiff3part/
%{_kde4_bindir}/kdiff3
%{_kde4_iconsdir}/??color/*/apps/kdiff3.png
%{_kde4_modulesdir}/kdiff3fileitemaction.so
%{_kde4_servicesdir}/kdiff3part.desktop
%{_kde4_servicesdir}/kdiff3fileitemaction.desktop
%license COPYING
%{_kf5_applicationsdir}/org.kde.kdiff3.desktop
%{_kf5_appstreamdir}/org.kde.kdiff3.appdata.xml
%{_kf5_bindir}/kdiff3
%dir %{_kf5_iconsdir}/hicolor/256x256
%dir %{_kf5_iconsdir}/hicolor/256x256/apps
%{_kf5_iconsdir}/hicolor/*/apps/kdiff3.png
%{_kf5_iconsdir}/hicolor/scalable/apps/kdiff3.svgz
%{_kf5_kxmlguidir}/kdiff3/
%{_kf5_kxmlguidir}/kdiff3part/
%{_kf5_plugindir}/kf5/parts/
%{_kf5_plugindir}/kf5/kfileitemaction/
%{_kf5_servicesdir}/kdiff3part.desktop
%doc %lang(en) %{_kf5_mandir}/man1/kdiff3.1%{?ext_man}
%doc %lang(en) %{_kf5_htmldir}/en/kdiff3
%if %{with lang}
%files lang -f %{name}.lang
%endif
%changelog