From f128e8eb821ab1b4fd3d97d814a74c80bc360695 Mon Sep 17 00:00:00 2001 From: Stefan Hundhammer Date: Tue, 15 Dec 2020 14:41:28 +0100 Subject: [PATCH 1/3] Don't complain about licenses in SVG icons --- Rakefile | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/Rakefile b/Rakefile index 3950f8d2..3b84e41f 100644 --- a/Rakefile +++ b/Rakefile @@ -6,3 +6,12 @@ # MIT license #++ require "libyui/rake" + +Libyui::Tasks.configuration do |conf| + include Libyui::Tasks::Helpers + + conf.skip_license_check << /^Makefile\.repo$/ + conf.skip_license_check << /^src\/.*\.h\.in$/ + conf.skip_license_check << /^src\/icons\/.*\.svg$/ + conf.skip_license_check << /CMakeLists\.txt$/ +end From 4e65e07593c108540ce09db8109a6831d655b1f0 Mon Sep 17 00:00:00 2001 From: Martin Vidner Date: Fri, 22 Jan 2021 10:54:17 +0100 Subject: [PATCH 2/3] Fix dependencies: move yui_backend to the correct RPM (bsc#FIXME) --- package/libyui-qt.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/libyui-qt.spec b/package/libyui-qt.spec index 0fe09abc..8f5e405f 100644 --- a/package/libyui-qt.spec +++ b/package/libyui-qt.spec @@ -39,7 +39,6 @@ BuildRequires: pkgconfig(Qt5Widgets) BuildRequires: pkgconfig(Qt5Svg) BuildRequires: pkgconfig(Qt5X11Extras) BuildRequires: pkgconfig(Qt5Svg) -Provides: yui_backend = %{so_version} Url: http://github.com/libyui/ Summary: Libyui - Qt User Interface @@ -54,6 +53,7 @@ component for libYUI. %package -n %{bin_name} Requires: libyui%{so_version} +Provides: yui_backend = %{so_version} Provides: %{name} = %{version} Provides: yast2-qt = %{version} Obsoletes: yast2-qt < 2.51.0 From 96249522163ef09672f1b0d0e52d24c685cc0c85 Mon Sep 17 00:00:00 2001 From: Martin Vidner Date: Thu, 28 Jan 2021 13:30:36 +0100 Subject: [PATCH 3/3] version + changelog --- VERSION.cmake | 2 +- package/libyui-qt-doc.spec | 2 +- package/libyui-qt.changes | 6 ++++++ package/libyui-qt.spec | 2 +- 4 files changed, 9 insertions(+), 3 deletions(-) diff --git a/VERSION.cmake b/VERSION.cmake index 6d15a18d..bb9da3b0 100644 --- a/VERSION.cmake +++ b/VERSION.cmake @@ -1,6 +1,6 @@ SET(VERSION_MAJOR "2") SET(VERSION_MINOR "56") -SET(VERSION_PATCH "4") +SET(VERSION_PATCH "5") SET( VERSION "${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_PATCH}${GIT_SHA1_VERSION}" ) ##### This is needed for the libyui-qt core ONLY. diff --git a/package/libyui-qt-doc.spec b/package/libyui-qt-doc.spec index dae4dda3..a8f516c4 100644 --- a/package/libyui-qt-doc.spec +++ b/package/libyui-qt-doc.spec @@ -21,7 +21,7 @@ Name: %{parent}-doc # DO NOT manually bump the version here; instead, use rake version:bump -Version: 2.56.4 +Version: 2.56.5 Release: 0 Source: %{parent}-%{version}.tar.bz2 diff --git a/package/libyui-qt.changes b/package/libyui-qt.changes index a5f8ca57..2ceeef91 100644 --- a/package/libyui-qt.changes +++ b/package/libyui-qt.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Thu Jan 28 12:29:33 UTC 2021 - Martin Vidner + +- Fix dependencies: move yui_backend to the correct RPM (bsc#FIXME) +- 2.56.5 + ------------------------------------------------------------------- Tue Dec 1 13:03:25 UTC 2020 - José Iván López González diff --git a/package/libyui-qt.spec b/package/libyui-qt.spec index 8f5e405f..c15a4c44 100644 --- a/package/libyui-qt.spec +++ b/package/libyui-qt.spec @@ -18,7 +18,7 @@ Name: libyui-qt # DO NOT manually bump the version here; instead, use rake version:bump -Version: 2.56.4 +Version: 2.56.5 Release: 0 Source: %{name}-%{version}.tar.bz2