Optimized Supplements: to be not too generic

Spec-file cosmetics

libyui-gtk.spec

@@ -1,64 +1,62 @@
-# Define libsuffix, minimum libyui-devel version
-# and so-version of libyui.
-%global libsuffix yui
-%global libname lib%{libsuffix}
-%global devel_min_ver 3.0.4
-
 # 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}
+%global _cmake_build_subdir build-%{_target_platform}
 
-Name:			%{libname}-gtk
-Version:		2.44.8
-Release:		2%{?dist}
-Summary:		Gtk3 User Interface for %{libname}
 
-License:		LGPLv2 or LGPLv3
+Name:		libyui-gtk
-URL:			https://github.com/%{libname}/%{name}
+Version:	2.44.8
-Source0:		%{url}/archive/v%{version}.tar.gz#/%{name}-%{version}.tar.gz
+Release:	3%{?dist}
+Summary:	Gtk3 User Interface for libyui
 
-BuildRequires:		boost-devel
+License:	LGPLv2 or LGPLv3
-BuildRequires:		cmake				>= 2.8
+URL:		https://github.com/libyui/%{name}
-BuildRequires:		gtk3-devel
+Source0:	%{url}/archive/v%{version}.tar.gz#/%{name}-%{version}.tar.gz
-BuildRequires:		%{libname}-devel		>= %{devel_min_ver}
 
-Supplements:		(libyui%{?_isa} and gtk3%{?_isa} and cairo%{?_isa})
+BuildRequires:	boost-devel
+BuildRequires:	cmake
+BuildRequires:	gtk3-devel
+BuildRequires:	libyui-devel
+
+# For Cinnamon.
+Supplements:	(libyui%{?_isa} and cinnamon%{?_isa})
+# For LXDE.
+Supplements:	(libyui%{?_isa} and lxsession%{?_isa})
+# For MATE.
+Supplements:	(libyui%{?_isa} and mate-desktop%{?_isa})
+# For XFCE.
+Supplements:	(libyui%{?_isa} and xfdesktop%{?_isa})
 
 %description
 This package contains the Gtk3 user interface component
-for %{libname}.
+for libyui.
 
 
 %package devel
-Summary:		Files needed for developing with %{name}
+Summary:	Files needed for developing with %{name}
 
-Requires:		gtk3-devel%{?_isa}
+Requires:	gtk3-devel%{?_isa}
-Requires:		%{libname}-devel%{?_isa}	>= %{devel_min_ver}
+Requires:	libyui-devel%{?_isa}
-Requires:		%{name}%{?_isa}			== %{version}-%{release}
+Requires:	%{name}%{?_isa}		== %{version}-%{release}
-
-%if 0%{?fedora} && 0%{?fedora} <= 22
-Obsoletes:		%{name}-devel-common		<= %{version}-%{release}
-%endif #0%{?fedora} && 0%{?fedora} <= 22
 
 %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}.
+You do NOT need this package for developing with libyui.
-Using%{libname}-devel is sufficient for such purpose. This
+Usinglibyui-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}
+Summary:	Documentation files for %{name}
-BuildArch:		noarch
+BuildArch:	noarch
 
-BuildRequires:		doxygen
+BuildRequires:	doxygen
-BuildRequires:		graphviz
+BuildRequires:	graphviz
-BuildRequires:		hardlink
+BuildRequires:	hardlink
 
 %description doc
 This package includes the developer's documentation as HTML
@@ -81,14 +79,14 @@ pushd %{_cmake_build_subdir}
 	-DRESPECT_FLAGS=ON				\
 	..
 
-%{__make} %{?_smp_mflags}
+%make_build
-%{__make} %{?_smp_mflags} docs
+%make_build docs
 popd
 
 
 %install
 pushd %{_cmake_build_subdir}
-%{__mkdir} -p	%{buildroot}%{_libdir}/%{libsuffix}	\
+%{__mkdir} -p	%{buildroot}%{_libdir}/yui		\
 		%{buildroot}%{_datadir}/%{name}/theme
 
 %make_install
@@ -110,12 +108,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}/*
+%{_includedir}/yui/*
-%{_libdir}/%{libsuffix}/%{name}.so
+%{_libdir}/yui/%{name}.so
 %{_libdir}/pkgconfig/%{name}.pc
 %{_libdir}/cmake
 
@@ -127,6 +125,10 @@ popd
 
 
 %changelog
+* Wed Apr 12 2017 Björn Esser <besser82@fedoraproject.org> - 2.44.8-3
+- Optimized Supplements: to be not too generic
+- Spec-file cosmetics
+
 * Mon Apr 10 2017 Björn Esser <besser82@fedoraproject.org> - 2.44.8-2
 - Use rich-dependencies instead of virtual provides
 - Get major so-ver from macro