diff --git a/_service b/_service index e6ea661..a880825 100644 --- a/_service +++ b/_service @@ -1,11 +1,10 @@ - 1.9.0 + 1.9.1 https://invent.kde.org/sdk/kdiff3 - refs/tags/1.9.0 + refs/tags/1.9.1 git kdiff3 - windows_installer diff --git a/kdiff3-1.9.0.tar.xz b/kdiff3-1.9.0.tar.xz deleted file mode 100644 index 140aa3f..0000000 --- a/kdiff3-1.9.0.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:8edc549cbbe42fab85cbea682701aebe141a400f7240fd5ff13e2d3f12eec9a4 -size 422752 diff --git a/kdiff3-1.9.1.tar.xz b/kdiff3-1.9.1.tar.xz new file mode 100644 index 0000000..a930b15 --- /dev/null +++ b/kdiff3-1.9.1.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:561210c312e248396051404d33d5fd36818b6fe396724621ceadb0c822f8a2fb +size 422892 diff --git a/kdiff3-lang.tar.xz b/kdiff3-lang.tar.xz index b3cfaff..8e85058 100644 --- a/kdiff3-lang.tar.xz +++ b/kdiff3-lang.tar.xz @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:2a43b5b429f95e74eb1da80a398414d9f6e85e8891b25605e693d2471aab0779 -size 631052 +oid sha256:62a836dd279250259ac9b2585cbf87a75d2f12ece3233ffa2e9307731c460ac1 +size 631460 diff --git a/kdiff3.changes b/kdiff3.changes index 738a215..b2bcc5a 100644 --- a/kdiff3.changes +++ b/kdiff3.changes @@ -1,3 +1,17 @@ +------------------------------------------------------------------- +Sat May 15 11:24:25 UTC 2021 - Wolfgang Bauer + +- 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 + +- Update URL. + ------------------------------------------------------------------- Mon May 3 06:37:18 UTC 2021 - Christophe Giboudeaux diff --git a/kdiff3.spec b/kdiff3.spec index 2496018..1adacd0 100644 --- a/kdiff3.spec +++ b/kdiff3.spec @@ -18,12 +18,12 @@ %bcond_without lang Name: kdiff3 -Version: 1.9.0 +Version: 1.9.1 Release: 0 Summary: Code Comparison Utility License: GPL-2.0-or-later Group: Development/Tools/Version Control -URL: http://kdiff3.sourceforge.net/ +URL: https://apps.kde.org/kdiff3 Source0: %{name}-%{version}.tar.xz Source1: kdiff3-lang.tar.xz BuildRequires: boost-devel @@ -36,7 +36,6 @@ BuildRequires: cmake(KF5CoreAddons) BuildRequires: cmake(KF5Crash) BuildRequires: cmake(KF5DocTools) BuildRequires: cmake(KF5I18n) -BuildRequires: cmake(KF5IconThemes) BuildRequires: cmake(KF5KIO) BuildRequires: cmake(KF5Parts) BuildRequires: cmake(KF5WidgetsAddons)