[libyui-qt] remove build of pdf-autodocs remove the devel-common subpkg minor improvents on spec

[Björn Esser]

commit 1810ab99e3d71d7c3a28e7e5ed63e51cb1190cdd
Author: Björn Esser <bjoern.esser at gmail.com>
Date:   Fri May 23 18:48:12 2014 +0200

    remove build of pdf-autodocs
    remove the devel-common subpkg
    minor improvents on spec

 libyui-qt.spec |  113 +++++++++++++++++++++++++++-----------------------------
 1 files changed, 54 insertions(+), 59 deletions(-)
---
diff --git a/libyui-qt.spec b/libyui-qt.spec
index 500e94c..1bf048b 100644
--- a/libyui-qt.spec
+++ b/libyui-qt.spec
@@ -1,82 +1,76 @@
 %global libsuffix yui
 %global libname lib%{libsuffix}
 %global devel_min_ver 3.0.4
-%global major_so_ver 5
+%global major_so_ver 6
 
-Name:		%{libname}-qt
-Version:	2.43.5
-Release:	2%{?dist}
-Summary:	Qt User Interface for %{libname}
+Name:			%{libname}-qt
+Version:		2.43.5
+Release:		2%{?dist}
+Summary:		Qt User Interface for %{libname}
 
-License:	LGPLv2 or LGPLv3
-URL:		https://github.com/%{libname}/%{name}
-Source0:	%{url}/archive/%{name}/master/%{version}.tar.gz#/%{name}-%{version}.tar.gz
+License:		LGPLv2 or LGPLv3
+URL:			https://github.com/%{libname}/%{name}
+Source0:		%{url}/archive/%{name}/master/%{version}.tar.gz#/%{name}-%{version}.tar.gz
 
-BuildRequires:	cmake
-BuildRequires:	doxygen-latex
-BuildRequires:	fdupes
-BuildRequires:	graphviz
-BuildRequires:	%{libname}-devel >= %{devel_min_ver}
-BuildRequires:	qt-devel
-
-Provides:	%{libsuffix}-ui%{?_isa} = %{major_so_ver}
+BuildRequires:		cmake				>= 2.8
+BuildRequires:		doxygen
+BuildRequires:		fdupes
+BuildRequires:		graphviz
+BuildRequires:		%{libname}-devel		>= %{devel_min_ver}
+BuildRequires:		qt-devel
 
+Provides:		%{libsuffix}-ui%{?_isa}		== %{major_so_ver}
 
 %description
-This package contains the qt user interface component for %{libname}.
+This package contains the qt user interface component
+for %{libname}.
 
 
 %package devel
-Summary:	Files needed for developing with %{name}
-
-Requires:	%{libname}-devel%{?_isa} >= %{devel_min_ver}
-Requires:	%{name}%{?_isa} = %{version}-%{release}
-Requires:	%{name}-devel-common = %{version}-%{release}
-Requires:	qt-devel%{?_isa}
-
-%description devel
-%{libname} 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}. Use of
-%{libname}-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.
+Summary:		Files needed for developing with %{name}
 
+Requires:		%{libname}-devel%{?_isa}	>= %{devel_min_ver}
+Requires:		%{name}%{?_isa}			== %{version}-%{release}
+Requires:		qt-devel%{?_isa}
 
-%package devel-common
-Summary:	Common files needed for developing with %{name}
+%if 0%{?fedora} && 0%{?fedora} <= 22
+Obsoletes:		%{name}-devel-common		<= %{version}-%{release}
+Provides:		%{name}-devel-common		== %{version}-%{release}
+%endif #0%{?fedora} && 0%{?fedora} <= 22
 
-BuildArch:	noarch
-Requires:	%{name}-devel = %{version}-%{release}
+%description devel
+%{libname} can be used independently of YaST for generic (C++)
+applications and has very few dependencies.
 
-%description devel-common
-%{summary}, e.g. headers and CMake-macros.
+You do NOT need this package for developing with %{libname}.
+Using %{libname}-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
 
 %description doc
-This package includes the developer's documentation as HTML and PDF
+This package includes the developer's documentation as HTML
 for %{name}.
 
 
 %prep
-%setup -q -n %{name}-%{name}-master-%{version}
+%setup -qn %{name}-%{name}-master-%{version}
 ./bootstrap.sh
 
 
 %build
 mkdir -p build
 pushd build
-%cmake .. \
-	-DPREFIX=%{_prefix} \
-	-DLIB_DIR=%{_libdir} \
-	-DCMAKE_BUILD_TYPE=RELEASE \
-	-DRESPECT_FLAGS=ON
+%cmake						\
+	-DPREFIX=%{_prefix}			\
+	-DLIB_DIR=%{_libdir}			\
+	-DCMAKE_BUILD_TYPE=RELEASE		\
+	-DRESPECT_FLAGS=ON			\
+	..
 
 make %{?_smp_mflags}
 make %{?_smp_mflags} docs
@@ -84,38 +78,39 @@ make %{?_smp_mflags} docs
 
 %install
 pushd build
+mkdir -p %{buildroot}%{_libdir}/%{libsuffix}	\
+	%{buildroot}%{_datadir}/%{name}/theme
+
 %make_install
 
-# remove preinstalled stuff in docdir
-# get's picked-up by -doc-pkg later
-rm -rf %{buildroot}%{_defaultdocdir} ../examples/CMake*
+rm -rf	%{buildroot}%{_defaultdocdir}		\
+	../examples/CMake*			\
+	doc/html/*.m*
 
-# prep docs
-mv ./doc/html ..
-mv ./doc/latex/refman.pdf ..
-rm -rf ../html/*.m*
-%fdupes ../html
+%fdupes doc/html
+popd
 
 
 %files
-%doc COPYING*
+%doc ChangeLog COPYING*
 %{_libdir}/%{libsuffix}/%{name}.so.%{major_so_ver}*
 
 %files devel
+%{_includedir}/%{libsuffix}/*
 %{_libdir}/%{libsuffix}/%{name}.so
 %{_libdir}/pkgconfig/%{name}.pc
 %{_libdir}/cmake
 
-%files devel-common
-%{_includedir}/%{libsuffix}/*
-
 %files doc
-%doc COPYING* ChangeLog *.pdf html/
+%doc ChangeLog COPYING* build/doc/html/
 
 
 %changelog
 * Tue Mar 18 2014 Björn Esser <bjoern.esser at gmail.com> - 2.43.5-2
 - rebuilt for libyui-3.0.13
+- remove build of pdf-autodocs
+- remove the devel-common subpkg
+- minor improvents on spec
 
 * Fri Aug 30 2013 Björn Esser <bjoern.esser at gmail.com> - 2.43.5-1
 - new upstream version