From 1859836aa6b33059412a7eb02dbbcfb22055b760f0b3d88d39c3c7fffef89bf1 Mon Sep 17 00:00:00 2001 From: Luca Beltrame Date: Fri, 22 Jan 2021 07:45:47 +0000 Subject: [PATCH 1/3] Accepting request 865654 from home:wolfi323:branches:KDE:Extra - Update to 1.8.5: * Fix url handling for drag and drop (kde#417189) * Fix regression in handling paste from clipboard to blank diff window (kde#426823) * Fix link detection via KIO * Drop custom event filter in OpenDialog. We now use FileNameLineEdit instead as in the main window. * Fix url/path handling bugs for remote files * Don't ignore stat errors unless it tells us the file was not found OBS-URL: https://build.opensuse.org/request/show/865654 OBS-URL: https://build.opensuse.org/package/show/KDE:Extra/kdiff3?expand=0&rev=18 --- kdiff3-1.8.4.tar.xz | 3 --- kdiff3-1.8.5.tar.xz | 3 +++ kdiff3.changes | 14 ++++++++++++++ kdiff3.spec | 4 ++-- 4 files changed, 19 insertions(+), 5 deletions(-) delete mode 100644 kdiff3-1.8.4.tar.xz create mode 100644 kdiff3-1.8.5.tar.xz diff --git a/kdiff3-1.8.4.tar.xz b/kdiff3-1.8.4.tar.xz deleted file mode 100644 index 1ded24e..0000000 --- a/kdiff3-1.8.4.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:76e18e097a078c1a440a32562734391d71d12446fcd3b2afeece87c136f43bb8 -size 1040492 diff --git a/kdiff3-1.8.5.tar.xz b/kdiff3-1.8.5.tar.xz new file mode 100644 index 0000000..1e1147a --- /dev/null +++ b/kdiff3-1.8.5.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:bc92f7d04eb123f9c56dbe3047af67bf715240fa99487ac1d1ccf2a45e0854c1 +size 1045812 diff --git a/kdiff3.changes b/kdiff3.changes index 2dafeb6..5717f35 100644 --- a/kdiff3.changes +++ b/kdiff3.changes @@ -1,3 +1,17 @@ +------------------------------------------------------------------- +Fri Jan 22 06:40:24 UTC 2021 - wbauer@tmo.at + +- Update to 1.8.5: + * Fix url handling for drag and drop (kde#417189) + * Fix regression in handling paste from clipboard to blank diff + window (kde#426823) + * Fix link detection via KIO + * Drop custom event filter in OpenDialog. We now use + FileNameLineEdit instead as in the main window. + * Fix url/path handling bugs for remote files + * Don't ignore stat errors unless it tells us the file was not + found + ------------------------------------------------------------------- Thu Sep 3 11:53:51 UTC 2020 - wbauer@tmo.at diff --git a/kdiff3.spec b/kdiff3.spec index 1ae5d5f..a3e1a69 100644 --- a/kdiff3.spec +++ b/kdiff3.spec @@ -1,7 +1,7 @@ # # spec file for package kdiff3 # -# Copyright (c) 2020 SUSE LLC +# Copyright (c) 2021 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -18,7 +18,7 @@ %bcond_without lang Name: kdiff3 -Version: 1.8.4 +Version: 1.8.5 Release: 0 Summary: Code Comparison Utility License: GPL-2.0-or-later From bb6cb0c9201466a6239f184bae72a5fad84d30c8e851e1989ae1010ad73cccbe Mon Sep 17 00:00:00 2001 From: Christophe Giboudeaux Date: Fri, 5 Mar 2021 09:05:36 +0000 Subject: [PATCH 2/3] Exclude files OBS-URL: https://build.opensuse.org/package/show/KDE:Extra/kdiff3?expand=0&rev=19 --- _service | 16 ++++++++++++++++ kdiff3-1.8.5.tar.xz | 4 ++-- kdiff3.changes | 5 +++++ kdiff3.spec | 4 +++- 4 files changed, 26 insertions(+), 3 deletions(-) create mode 100644 _service diff --git a/_service b/_service new file mode 100644 index 0000000..8468680 --- /dev/null +++ b/_service @@ -0,0 +1,16 @@ + + + 1.8.5 + https://invent.kde.org/sdk/kdiff3 + refs/tags/1.8.5 + git + kdiff3 + + windows_installer + + + *.tar + xz + + + diff --git a/kdiff3-1.8.5.tar.xz b/kdiff3-1.8.5.tar.xz index 1e1147a..eaa0a90 100644 --- a/kdiff3-1.8.5.tar.xz +++ b/kdiff3-1.8.5.tar.xz @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:bc92f7d04eb123f9c56dbe3047af67bf715240fa99487ac1d1ccf2a45e0854c1 -size 1045812 +oid sha256:858387c68e022a724c5fb2415579f3d05dba749a286197de0f9790e9ed2144a8 +size 424356 diff --git a/kdiff3.changes b/kdiff3.changes index 5717f35..c9c4625 100644 --- a/kdiff3.changes +++ b/kdiff3.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Fri Mar 5 09:03:31 UTC 2021 - Christophe Giboudeaux + +- Use a _service file to exclude the windows_installer folder. + ------------------------------------------------------------------- Fri Jan 22 06:40:24 UTC 2021 - wbauer@tmo.at diff --git a/kdiff3.spec b/kdiff3.spec index a3e1a69..6076216 100644 --- a/kdiff3.spec +++ b/kdiff3.spec @@ -24,7 +24,9 @@ Summary: Code Comparison Utility License: GPL-2.0-or-later Group: Development/Tools/Version Control URL: http://kdiff3.sourceforge.net/ -Source0: https://download.kde.org/stable/%{name}/%{name}-%{version}.tar.xz +# Drop the _service file and restore the line below for the next release +# Source0: https://download.kde.org/stable/%%{name}/%%{name}-%%{version}.tar.xz +Source0: %{name}-%{version}.tar.xz BuildRequires: extra-cmake-modules BuildRequires: fdupes BuildRequires: kf5-filesystem From 70679aa94734006cc5b17b7db6c7a7a647cc2b2b15fc0eb73a9015b44925d3a1 Mon Sep 17 00:00:00 2001 From: Christophe Giboudeaux Date: Fri, 5 Mar 2021 09:10:19 +0000 Subject: [PATCH 3/3] OBS-URL: https://build.opensuse.org/package/show/KDE:Extra/kdiff3?expand=0&rev=20 --- kdiff3-lang.tar.xz | 3 +++ kdiff3.spec | 3 ++- 2 files changed, 5 insertions(+), 1 deletion(-) create mode 100644 kdiff3-lang.tar.xz diff --git a/kdiff3-lang.tar.xz b/kdiff3-lang.tar.xz new file mode 100644 index 0000000..0b0d95e --- /dev/null +++ b/kdiff3-lang.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:6d38ce966e2658ede79fd6e69b10f107693883ac3ca25063fa9d45f8a0e09d47 +size 626552 diff --git a/kdiff3.spec b/kdiff3.spec index 6076216..eb73770 100644 --- a/kdiff3.spec +++ b/kdiff3.spec @@ -27,6 +27,7 @@ URL: http://kdiff3.sourceforge.net/ # Drop the _service file and restore the line below for the next release # Source0: https://download.kde.org/stable/%%{name}/%%{name}-%%{version}.tar.xz Source0: %{name}-%{version}.tar.xz +Source1: kdiff3-lang.tar.xz BuildRequires: extra-cmake-modules BuildRequires: fdupes BuildRequires: kf5-filesystem @@ -60,7 +61,7 @@ KDiff3 is a program that: %lang_package %prep -%setup -q +%autosetup -p1 -a1 %build %cmake_kf5 -d build