From f8a1f6d44d2763bf529826c47114e5eb6fea104f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20Esser?= Date: Mon, 31 Jul 2017 23:40:41 +0200 Subject: [PATCH] Apply patches only on fc25+ or el8+ --- libyui-gtk.spec | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/libyui-gtk.spec b/libyui-gtk.spec index 3a0a016..a735f14 100644 --- a/libyui-gtk.spec +++ b/libyui-gtk.spec @@ -7,13 +7,14 @@ Name: libyui-gtk Version: 2.44.9 -Release: 7%{?dist} +Release: 8%{?dist} Summary: Gtk3 User Interface for libyui License: LGPLv2 or LGPLv3 URL: https://github.com/libyui/%{name} Source0: %{url}/archive/v%{version}.tar.gz#/%{name}-%{version}.tar.gz +%if 0%{?fedora} >= 25 || 0%{?rhel} >= 8 # Patches submitted upstream. # See: https://github.com/libyui/libyui-gtk/pull/58 Patch10: https://github.com/besser82/libyui-gtk/commit/cc3ac74b1186b33bd9e6dcd532e189b5b4cb29bb.patch#/libyui-gtk-2.44.9-fix_misleading_indentation.patch @@ -30,6 +31,7 @@ Patch20: https://github.com/besser82/libyui-gtk/commit/1191d564180b0a2ca489fdc76 Patch21: https://github.com/besser82/libyui-gtk/commit/355cbac51273f87b68e19430f591cee2c16766ed.patch#/libyui-gtk-2.44.9-fix_gtk_tree_view_set_rules_hint.patch Patch22: https://github.com/besser82/libyui-gtk/commit/509292d88c1cf4bf198aab2d7e5e5d075f301722.patch#/libyui-gtk-2.44.9-fix_gtk_arrow_new.patch Patch23: https://github.com/besser82/libyui-gtk/commit/a7eb80016ca13d33872b558cdb00eac353b3cde1.patch#/libyui-gtk-2.44.9-fix_display_get_device_manager_gdk_device_manager_get_client_pointer.patch +%endif # 0%%{?fedora} >= 25 || 0%%{?rhel} >= 8 BuildRequires: boost-devel BuildRequires: cmake @@ -136,6 +138,9 @@ popd %changelog +* Mon Jul 31 2017 Björn Esser - 2.44.9-8 +- Apply patches only on fc25+ or el8+ + * Sun Jul 30 2017 Björn Esser - 2.44.9-7 - Require cmake-filesystem