From 0da5f2fb40cc8e03edecc64a117171c8d57b1f86 Mon Sep 17 00:00:00 2001
From: Björn Esser <besser82@fedoraproject.org>
Date: Apr 12 2017 12:20:24 +0000
Subject: Optimized Supplements: to be not too generic

Spec-file cosmetics

---

diff --git a/libyui-qt.spec b/libyui-qt.spec
index d7416da..e10e7eb 100644
--- a/libyui-qt.spec
+++ b/libyui-qt.spec
@@ -1,72 +1,68 @@
-# Define libsuffix, minimum libyui-devel version
-# and so-version of libyui.
-%global libsuffix yui
-%global libname lib%{libsuffix}
-%global devel_min_ver 3.1.2
-
 # Setup _pkgdocdir if not defined already.
 %{!?_pkgdocdir:%global _pkgdocdir %{_docdir}/%{name}-%{version}}
 
 # CMake-builds go out-of-tree.
-%global _cmake_build_subdir build-%{?_arch}%{?dist}
-
-Name:			%{libname}-qt
-Version:		2.47.1
-Release:		1%{?dist}
-Summary:		Qt User Interface for %{libname}
-
-License:		LGPLv2 or LGPLv3
-URL:			https://github.com/%{libname}/%{name}
-Source0:		%{url}/archive/v%{version}.tar.gz#/%{name}-%{version}.tar.gz
-
-BuildRequires:		boost-devel
-BuildRequires:		cmake				>= 2.8
-BuildRequires:		fontconfig-devel
-BuildRequires:		%{libname}-devel		>= %{devel_min_ver}
-BuildRequires:		pkgconfig(Qt5Core)
-BuildRequires:		pkgconfig(Qt5Gui)
-BuildRequires:		pkgconfig(Qt5Svg)
-BuildRequires:		pkgconfig(Qt5Widgets)
-BuildRequires:		pkgconfig(Qt5X11Extras)
-
-Supplements:		(libyui%{?_isa} and qt5-qtbase-gui%{?_isa})
+%global _cmake_build_subdir build-%{_target_platform}
+
+
+Name:		libyui-qt
+Version:	2.47.1
+Release:	2%{?dist}
+Summary:	Qt 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
+
+BuildRequires:	boost-devel
+BuildRequires:	cmake
+BuildRequires:	fontconfig-devel
+BuildRequires:	libyui-devel
+BuildRequires:	pkgconfig(Qt5Core)
+BuildRequires:	pkgconfig(Qt5Gui)
+BuildRequires:	pkgconfig(Qt5Svg)
+BuildRequires:	pkgconfig(Qt5Widgets)
+BuildRequires:	pkgconfig(Qt5X11Extras)
+
+# For Hawaii.
+Supplements:	(libyui%{?_isa} and hawaii-workspace%{?_isa})
+# For LXQt.
+Supplements:	(libyui%{?_isa} and lxqt-session%{?_isa})
+# For KDE.
+Supplements:	(libyui%{?_isa} and plasma-desktop%{?_isa})
 
 %description
 This package contains the qt user interface component
-for %{libname}.
+for libyui.
 
 
 %package devel
-Summary:		Files needed for developing with %{name}
-
-Requires:		fontconfig-devel%{?_isa}
-Requires:		%{libname}-devel%{?_isa}	>= %{devel_min_ver}
-Requires:		%{name}%{?_isa}			== %{version}-%{release}
-Requires:		qt5-qtbase-devel%{?_isa}
-Requires:		qt5-qtsvg-devel%{?_isa}
-Requires:		qt5-qtx11extras-devel%{?_isa}
+Summary:	Files needed for developing with %{name}
 
-%if 0%{?fedora} && 0%{?fedora} <= 22
-Obsoletes:		%{name}-devel-common		<= %{version}-%{release}
-%endif #0%{?fedora} && 0%{?fedora} <= 22
+Requires:	fontconfig-devel%{?_isa}
+Requires:	libyui-devel%{?_isa}
+Requires:	%{name}%{?_isa}			== %{version}-%{release}
+Requires:	qt5-qtbase-devel%{?_isa}
+Requires:	qt5-qtsvg-devel%{?_isa}
+Requires:	qt5-qtx11extras-devel%{?_isa}
 
 %description devel
-%{libname} can be used independently of YaST for generic (C++)
+libyui can be used independently of YaST for generic (C++)
 applications and has very few dependencies.
 
-You do NOT need this package for developing with %{libname}.
-Using %{libname}-devel is sufficient for such purpose.  This
+You do NOT need this package for developing with libyui.
+Using libyui-devel is sufficient for such purpose.  This
 package is only needed when you want to develop an extension
 for %{name} which is not covered within the UI-plugin.
 
 
 %package doc
-Summary:		Documentation files for %{name}
-BuildArch:		noarch
+Summary:	Documentation files for %{name}
+BuildArch:	noarch
 
-BuildRequires:		doxygen
-BuildRequires:		graphviz
-BuildRequires:		hardlink
+BuildRequires:	doxygen
+BuildRequires:	graphviz
+BuildRequires:	hardlink
 
 %description doc
 This package includes the developer's documentation as HTML
@@ -96,7 +92,7 @@ popd
 
 %install
 pushd %{_cmake_build_subdir}
-%{__mkdir} -p	%{buildroot}%{_libdir}/%{libsuffix}	\
+%{__mkdir} -p	%{buildroot}%{_libdir}/yui		\
 		%{buildroot}%{_datadir}/%{name}/theme
 
 %make_install
@@ -118,12 +114,12 @@ popd
 %files
 %doc %dir %{?_pkgdocdir}
 %license COPYING*
-%{_libdir}/%{libsuffix}/%{name}.so.%{_libyui_major_so_ver}*
+%{_libdir}/yui/%{name}.so.%{_libyui_major_so_ver}*
 
 %files devel
 %doc %{?_pkgdocdir}/%{name}.changes
-%{_includedir}/%{libsuffix}/*
-%{_libdir}/%{libsuffix}/%{name}.so
+%{_includedir}/yui/*
+%{_libdir}/yui/%{name}.so
 %{_libdir}/pkgconfig/%{name}.pc
 %{_libdir}/cmake
 
@@ -135,6 +131,10 @@ popd
 
 
 %changelog
+* Wed Apr 12 2017 Björn Esser <besser82@fedoraproject.org> - 2.47.1-2
+- Optimized Supplements: to be not too generic
+- Spec-file cosmetics
+
 * Tue Apr 11 2017 Björn Esser <besser82@fedoraproject.org> - 2.47.1-1
 - New upstream release