Dominique Leuenberger 2021-05-15 21:16:19 +00:00 committed by Git OBS Bridge
commit 4fe4e2be17
6 changed files with 23 additions and 11 deletions

View File

@ -1,11 +1,10 @@
<services> <services>
<service name="tar_scm" mode="disabled"> <service name="tar_scm" mode="disabled">
<param name="version">1.9.0</param> <param name="version">1.9.1</param>
<param name="url">https://invent.kde.org/sdk/kdiff3</param> <param name="url">https://invent.kde.org/sdk/kdiff3</param>
<param name="revision">refs/tags/1.9.0</param> <param name="revision">refs/tags/1.9.1</param>
<param name="scm">git</param> <param name="scm">git</param>
<param name="filename">kdiff3</param> <param name="filename">kdiff3</param>
<!-- This folder will be dropped in the next release -->
<param name="exclude">windows_installer</param> <param name="exclude">windows_installer</param>
</service> </service>
<service name="recompress" mode="disabled"> <service name="recompress" mode="disabled">

View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:8edc549cbbe42fab85cbea682701aebe141a400f7240fd5ff13e2d3f12eec9a4
size 422752

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

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:561210c312e248396051404d33d5fd36818b6fe396724621ceadb0c822f8a2fb
size 422892

View File

@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1 version https://git-lfs.github.com/spec/v1
oid sha256:2a43b5b429f95e74eb1da80a398414d9f6e85e8891b25605e693d2471aab0779 oid sha256:62a836dd279250259ac9b2585cbf87a75d2f12ece3233ffa2e9307731c460ac1
size 631052 size 631460

View File

@ -1,3 +1,17 @@
-------------------------------------------------------------------
Sat May 15 11:24:25 UTC 2021 - Wolfgang Bauer <wbauer@tmo.at>
- Update to 1.9.1
* Hotfix for possible display problems (kde#436958)
* Add default shortcut for "Go to [Previous/Next] Unsolved
Conflict" (kde#436003)
* Port away from KIconThemes
-------------------------------------------------------------------
Wed May 5 06:11:10 UTC 2021 - Christophe Giboudeaux <christophe@krop.fr>
- Update URL.
------------------------------------------------------------------- -------------------------------------------------------------------
Mon May 3 06:37:18 UTC 2021 - Christophe Giboudeaux <christophe@krop.fr> Mon May 3 06:37:18 UTC 2021 - Christophe Giboudeaux <christophe@krop.fr>

View File

@ -18,12 +18,12 @@
%bcond_without lang %bcond_without lang
Name: kdiff3 Name: kdiff3
Version: 1.9.0 Version: 1.9.1
Release: 0 Release: 0
Summary: Code Comparison Utility Summary: Code Comparison Utility
License: GPL-2.0-or-later License: GPL-2.0-or-later
Group: Development/Tools/Version Control Group: Development/Tools/Version Control
URL: http://kdiff3.sourceforge.net/ URL: https://apps.kde.org/kdiff3
Source0: %{name}-%{version}.tar.xz Source0: %{name}-%{version}.tar.xz
Source1: kdiff3-lang.tar.xz Source1: kdiff3-lang.tar.xz
BuildRequires: boost-devel BuildRequires: boost-devel
@ -36,7 +36,6 @@ BuildRequires: cmake(KF5CoreAddons)
BuildRequires: cmake(KF5Crash) BuildRequires: cmake(KF5Crash)
BuildRequires: cmake(KF5DocTools) BuildRequires: cmake(KF5DocTools)
BuildRequires: cmake(KF5I18n) BuildRequires: cmake(KF5I18n)
BuildRequires: cmake(KF5IconThemes)
BuildRequires: cmake(KF5KIO) BuildRequires: cmake(KF5KIO)
BuildRequires: cmake(KF5Parts) BuildRequires: cmake(KF5Parts)
BuildRequires: cmake(KF5WidgetsAddons) BuildRequires: cmake(KF5WidgetsAddons)