Accepting request 1200500 from KDE:Applications

KDE release gear 24.08.1 (forwarded request 1199910 from krop)

OBS-URL: https://build.opensuse.org/request/show/1200500
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/libkomparediff2?expand=0&rev=129

0001-Add-changes-to-allow-coinstallation.patch

@@ -1,75 +0,0 @@
-From 851f2fc1bf33dd61a6a07aeaf5e1ae22c742783a Mon Sep 17 00:00:00 2001
-From: Christophe Marin <christophe@krop.fr>
-Date: Sat, 10 Feb 2024 17:31:47 +0100
-Subject: [PATCH] Add changes to allow coinstallation
-
-kompare and kdevelop need different libkomparediff versions, we need a couple changes:
-- Bump soversion to 5.95 (upstream will use 6 in release gear 24.05)
-- Bump version to 5.95.0
-- rename CMake config files (https://invent.kde.org/sdk/libkomparediff2/-/commit/f7e9f9ef2)
----
- CMakeLists.txt                                              | 2 +-
- metainfo.yaml                                               | 2 +-
- src/CMakeLists.txt                                          | 6 +++---
- ...pareDiff2Config.cmake.in => KompareDiff2Config.cmake.in} | 0
- 4 files changed, 5 insertions(+), 5 deletions(-)
- rename src/{LibKompareDiff2Config.cmake.in => KompareDiff2Config.cmake.in} (100%)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 98c9352..bc563e6 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -1,6 +1,6 @@
- cmake_minimum_required(VERSION 3.16)
- 
--project(LibKompareDiff2 VERSION "5.4.0")
-+project(LibKompareDiff2 VERSION "5.95.0")
- 
- set(QT_MIN_VERSION "5.15.2")
- set(KF_MIN_VERSION "5.91.0")
-diff --git a/metainfo.yaml b/metainfo.yaml
-index 7008ea5..8f9b330 100644
---- a/metainfo.yaml
-+++ b/metainfo.yaml
-@@ -11,4 +11,4 @@ platforms:
- release: true
- libraries:
-     - cmake: "KompareDiff2"
--cmakename: LibKompareDiff2
-+cmakename: KompareDiff2
-diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
-index de1d480..6be2171 100644
---- a/src/CMakeLists.txt
-+++ b/src/CMakeLists.txt
-@@ -1,5 +1,5 @@
- set(KOMPAREDIFF2_INSTALL_INCLUDEDIR "${KDE_INSTALL_INCLUDEDIR}/KompareDiff2")
--set(KOMPAREDIFF2_CMAKECONFIG_NAME "LibKompareDiff2")
-+set(KOMPAREDIFF2_CMAKECONFIG_NAME "KompareDiff2")
- 
- add_definitions(-DTRANSLATION_DOMAIN=\"libkomparediff2\")
- 
-@@ -8,7 +8,7 @@ ecm_setup_version(PROJECT
-     VERSION_HEADER       "komparediff2_version.h"
-     PACKAGE_VERSION_FILE "${CMAKE_CURRENT_BINARY_DIR}/${KOMPAREDIFF2_CMAKECONFIG_NAME}ConfigVersion.cmake"
-     COMPATIBILITY        SameMajorVersion
--    SOVERSION            5
-+    SOVERSION            5.95
- )
- 
- add_library(komparediff2 SHARED)
-@@ -177,7 +177,7 @@ ecm_qt_install_logging_categories(
- set(_LibKompareDiff2_CONFIG_DEST "${KDE_INSTALL_CMAKEPACKAGEDIR}/${KOMPAREDIFF2_CMAKECONFIG_NAME}")
- 
- configure_package_config_file(
--    "${CMAKE_CURRENT_SOURCE_DIR}/LibKompareDiff2Config.cmake.in"
-+    "${CMAKE_CURRENT_SOURCE_DIR}/KompareDiff2Config.cmake.in"
-     "${CMAKE_CURRENT_BINARY_DIR}/${KOMPAREDIFF2_CMAKECONFIG_NAME}Config.cmake"
-     INSTALL_DESTINATION  "${_LibKompareDiff2_CONFIG_DEST}"
- )
-diff --git a/src/LibKompareDiff2Config.cmake.in b/src/KompareDiff2Config.cmake.in
-similarity index 100%
-rename from src/LibKompareDiff2Config.cmake.in
-rename to src/KompareDiff2Config.cmake.in
--- 
-2.43.0
-

_multibuild

@@ -1,3 +0,0 @@
-<multibuild>
-  <package>libkomparediff2-kf5</package>
-</multibuild>

libkomparediff2-24.02.2.tar.xz

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

libkomparediff2-24.02.2.tar.xz.sig

@@ -1,16 +0,0 @@
------BEGIN PGP SIGNATURE-----
-
-iQIzBAABCgAdFiEE2BwMs463Je9mkcOFu0YzUNbvMe8FAmYU0m4ACgkQu0YzUNbv
-Me/KMA//dzRYl+sNgU9S0F772QJEwD35QYa6ZiR8AG1nRuR+PBvCC5krRJGkpEFT
-vJ6E8iw+BWf5uKdU3LqDBhlriNKlMYxOpZYsIu/w6PEs5bLZrlps+WlY68yx/V55
-ZXvOtvk2PlDrgmfjwXAZOCO9nlSBGYlev5VOxntUtWlneNpopNtRAGJjC57uk/jc
-1i5J0et4+gRbrARNvIrtzVz/EkNW6EdbG9FCYB0iR414y9UAJvbVwpgT4i6Fp1AN
-xp1BNgB8sk+o+ErDIrS0/QH7E00IJMY84G3OocmjBHycPgNvCBdpqD7bBmCXKPhl
-oVvytEOkPAzgiVPNT54YYi2nsg/lE/MkYBgPnr4sI252tkj9tpwTuwNKaPLUtXn0
-ttWFTMRtdJz+Um3JQ5tKucbdr07B9b6uRvRKRnmBlX1ulJClAIrDeLfCtwn/cavG
-Gm0DAABPe2XN7NU4bBKdoVDtwUhmE/WLTqEq6+aHpBDxSItLnlt6SYLP36mgdukZ
-kYgdarbvlJ31IcDJreX26S6MtV/T7IFYcm5jcDztLEfyAQ+nfY0mboByAJaiHCIk
-iE9VmCSSfzt6ZVcvKYTPyYb9tO4M+PVbLXswYExrPxykqlN1gEcn9qkdLFgka2iN
-dXdqvYSKiUVLg8Vs1pR55ZAM0JfEDPvIYLc23NVgbX/l4nyKBBM=
-=ZfGJ
------END PGP SIGNATURE-----

libkomparediff2-24.08.0.tar.xz

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

libkomparediff2-24.08.0.tar.xz.sig

@@ -1,16 +0,0 @@
------BEGIN PGP SIGNATURE-----
-
-iQIzBAABCgAdFiEE2BwMs463Je9mkcOFu0YzUNbvMe8FAma+3wgACgkQu0YzUNbv
-Me9Iqg/9HW89hcsWT1bFT2rqQTZWdfTurwNWm3EQfVhfaJbQ6dYP+QMvfWAPpsCL
-7sQrlgBz58zTjYXGb0NBiSsyfEI8i/ldvdluVZ4/TDenFYi5svmQ+ciFz9pJbRVl
-4QQeKKk6VKIFKlgHTQCMz4kB/uwkrwD7xQ0AGaLv/vyngzJAYCsb48STWKOUP1Ly
-G5axA7g6iVPLQ0jGMPD3Qyg5PCFNK1ZlFe5lLu5Pxiy1pf2YMzvniCoQRpFUZX6A
-oLCqc7aRTyIH0HNwEdx5eDazhxMF6QDuyTkLzCuXShjTQ5QNhPBc9Vo2XPzZ5TrX
-LQ1Dg9k/Aa4NjW86YRFpS8M2a5PPj8AXQP7cUM1dvzp/f4YeQwoISvT1fagEPXgi
-olM39hlptfE8V2Nq2yaQwnm8vAfwm3IxKm1VJ/A8MDkjVDb3nu38VxdA+K5HwbK9
-YBRgmwaxkhHPk4T6cByhgC7jkUhlppGS1be1lcPrexs/pNwNLtyRdoR58dmPmRQ5
-MzPYCg/hndo9Cid7TA2ZiP4JMAKt9mx2+NCaFPzEyKLAareO8nSRu/Ok56uwCJES
-bwYI8CHgfLhcxdd4rDIXHMcfyiNZI2VvFv9aDTeJYPO1azrGGllZ4m/ENFD16VX7
-GpmppEjKH8aJ8KUgwZJBOParnsgRN1U9qcGqBu8Afums5Bmurk8=
-=ciRM
------END PGP SIGNATURE-----

libkomparediff2-kf5.spec

@@ -1,102 +0,0 @@
-#
-# spec file for package libkomparediff2-kf5
-#
-# Copyright (c) 2024 SUSE LLC
-#
-# All modifications and additions to the file contributed by third parties
-# remain the property of their copyright owners, unless otherwise agreed
-# upon. The license for this file, and modifications and additions to the
-# file, is the same license as for the pristine package itself (unless the
-# license for the pristine package is not an Open Source License, in which
-# case the license is the MIT License). An "Open Source License" is a
-# license that conforms to the Open Source Definition (Version 1.9)
-# published by the Open Source Initiative.
-
-# Please submit bugfixes or comments via https://bugs.opensuse.org/
-#
-
-
-%define kf5_version 5.91.0
-%define qt5_version 5.15.2
-
-%define rname libkomparediff2
-%bcond_without released
-Name:           libkomparediff2-kf5
-Version:        24.02.2
-Release:        0
-Summary:        A library to compare files and strings
-License:        (GPL-2.0-or-later AND LGPL-2.0-or-later) AND BSD-2-Clause
-URL:            https://www.kde.org
-Source:         %{rname}-%{version}.tar.xz
-%if %{with released}
-Source1:        %{rname}-%{version}.tar.xz.sig
-Source2:        applications.keyring
-%endif
-BuildRequires:  kf6-extra-cmake-modules
-BuildRequires:  cmake(KF5Codecs) >= %{kf5_version}
-BuildRequires:  cmake(KF5Config) >= %{kf5_version}
-BuildRequires:  cmake(KF5CoreAddons) >= %{kf5_version}
-BuildRequires:  cmake(KF5I18n) >= %{kf5_version}
-BuildRequires:  cmake(KF5KIO) >= %{kf5_version}
-BuildRequires:  cmake(KF5Parts) >= %{kf5_version}
-BuildRequires:  cmake(KF5XmlGui) >= %{kf5_version}
-BuildRequires:  cmake(Qt5Core) >= %{qt5_version}
-BuildRequires:  cmake(Qt5Test) >= %{qt5_version}
-BuildRequires:  cmake(Qt5Widgets) >= %{qt5_version}
-
-%description
-A library to compare files and strings, used in Kompare and KDevelop.
-
-%package -n libkomparediff2-5
-Summary:        A library to compare files and strings
-Requires:       (libkomparediff2-kf5 if kdebugsettings)
-Obsoletes:      libkomparediff2-lang < %{version}
-%description -n libkomparediff2-5
-A library to compare files and strings, used in Kompare and KDevelop.
-
-%package devel
-Summary:        Development package for libkomparediff2-kf5
-Requires:       libkomparediff2-5 = %{version}
-Requires:       cmake(KF5Config) >=  %{kf5_version}
-Requires:       cmake(KF5XmlGui) >=  %{kf5_version}
-Requires:       cmake(Qt5Core) >= %{qt5_version}
-Requires:       cmake(Qt5Widgets) >= %{qt5_version}
-# Package was renamed before submitting gear 6 to factory
-Provides:       libkomparediff2-devel = 23.08.4
-Obsoletes:      libkomparediff2-devel < 23.08.4
-
-%description devel
-Development package for libkomparediff2-kf5.
-
-%lang_package -n libkomparediff2-5
-
-%prep
-%autosetup -p1 -n %{rname}-%{version}
-
-%build
-%cmake_kf5 -d build -- -DQT_MAJOR_VERSION:STRING=5
-
-%cmake_build
-
-%install
-%kf5_makeinstall -C build
-
-%find_lang %{name} --all-name
-
-%ldconfig_scriptlets -n libkomparediff2-5
-
-%files
-%{_kf5_debugdir}/libkomparediff2.categories
-
-%files -n libkomparediff2-5
-%license COPYING*
-%{_kf5_libdir}/libkomparediff2.so.*
-
-%files devel
-%{_includedir}/KompareDiff2/
-%{_kf5_cmakedir}/LibKompareDiff2/
-%{_kf5_libdir}/libkomparediff2.so
-
-%files -n libkomparediff2-5-lang -f %{name}.lang
-
-%changelog