[libyui-qt/f18: 2/2] new upstream version restructured spec to match with libyui

[Björn Esser]

commit a76c5f2e054bed66b0e90d95bec5c8002950d3a2
Author: Björn Esser <bjoern.esser at gmail.com>
Date:   Fri Aug 30 11:23:31 2013 +0200

    new upstream version
    restructured spec to match with libyui

 .gitignore     |    5 +++-
 libyui-qt.spec |   82 +++++++++++++++++++++++++++++--------------------------
 2 files changed, 47 insertions(+), 40 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 88dd818..4a406bf 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,4 @@
-/libyui-qt-2.43.3-c30d136.tar.gz
+*~
+*.rpm
+*.tar*
+results_*/
diff --git a/libyui-qt.spec b/libyui-qt.spec
index 7935c39..de0cc74 100644
--- a/libyui-qt.spec
+++ b/libyui-qt.spec
@@ -1,23 +1,19 @@
-%global commit c30d136efc100145deeaea8e82ab34a94f690c8f
-%global shortcommit %(c=%{commit}; echo ${c:0:7})
 %global libsuffix yui
 %global libname lib%{libsuffix}
 %global devel_min_ver 3.0.4
 %global major_so_ver 5
 
-%global _hardened_build 1
-
-
 Name:		%{libname}-qt
-Version:	2.43.3
-Release:	3%{?dist}
+Version:	2.43.5
+Release:	1%{?dist}
 Summary:	Qt User Interface for %{libname}
-Group:		System Environment/Libraries
+
 License:	LGPLv2 or LGPLv3
-URL:		https://github.com/%{libname}/%{name}/
-Source0:	https://github.com/%{libname}/%{name}/archive/%{commit}/%{name}-%{version}-%{shortcommit}.tar.gz
+URL:		https://github.com/%{libname}/%{name}
+Source0:	%{url}/archive/%{name}/master/%{version}.tar.gz#/%{name}-%{version}.tar.gz
 
-BuildRequires:	doxygen
+BuildRequires:	cmake
+BuildRequires:	doxygen-latex
 BuildRequires:	fdupes
 BuildRequires:	graphviz
 BuildRequires:	%{libname}-devel >= %{devel_min_ver}
@@ -31,15 +27,13 @@ This package contains the qt user interface component for %{libname}.
 
 
 %package devel
-
 Summary:	Files needed for developing with %{name}
-Group:		Development/Libraries
 
 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.
@@ -50,70 +44,80 @@ This package is only needed when you want to develop an extension for
 %{name} which is not covered within the UI-plugin.
 
 
+%package devel-common
+Summary:	Common files needed for developing with %{name}
+
+BuildArch:	noarch
+Requires:	%{name}-devel = %{version}-%{release}
+
+%description devel-common
+%{summary}, e.g. headers and CMake-macros.
+
+
 %package doc
 
 Summary:	Documentation files for %{name}
-Group:		Documentation
-
 BuildArch:	noarch
 
-
 %description doc
-This package includes the developer's documentation as HTML for %{name}.
+This package includes the developer's documentation as HTML and PDF
+for %{name}.
 
 
 %prep
-%setup -q -n %{name}-%{commit}
+%setup -q -n %{name}-%{name}-master-%{version}
 ./bootstrap.sh
 
 
 %build
 mkdir -p build
-cd build
-
+pushd build
 %cmake .. \
 	-DPREFIX=%{_prefix} \
 	-DLIB_DIR=%{_libdir} \
-	-DDOC_DIR=%{_defaultdocdir} \
-	-DDOC_SUBDIR=%{name}-%{version} \
-	-DINSTALL_DOCS=ON \
-	-DSKIP_LATEX=ON \
 	-DCMAKE_BUILD_TYPE=RELEASE \
 	-DRESPECT_FLAGS=ON
 
 make %{?_smp_mflags}
 make %{?_smp_mflags} docs
 
-%install
-cd build
 
+%install
+pushd build
 %make_install
 
-install -pm0644 ../COPYING* %{buildroot}/%{_defaultdocdir}/%{name}-%{version}
-install -pm0644 ../ChangeLog %{buildroot}/%{_defaultdocdir}/%{name}-%{version}
+# remove preinstalled stuff in docdir
+# get's picked-up by -doc-pkg later
+rm -rf %{buildroot}%{_defaultdocdir} ../examples/CMake*
 
-%fdupes %{buildroot}/%{_defaultdocdir}/%{name}-%{version}
+# prep docs
+mv ./doc/html ..
+mv ./doc/latex/refman.pdf ..
+rm -rf ../html/*.m*
+%fdupes ../html
 
 
 %files
-%{_libdir}/%{libsuffix}/lib*.so.%{major_so_ver}*
-%dir %{_defaultdocdir}/%{name}-%{version}
-%doc %{_defaultdocdir}/%{name}-%{version}/C*
-
+%doc COPYING*
+%{_libdir}/%{libsuffix}/%{name}.so.%{major_so_ver}*
 
 %files devel
-%{_libdir}/%{libsuffix}/lib*.so
-%{_includedir}/%{libsuffix}/*
+%{_libdir}/%{libsuffix}/%{name}.so
 %{_libdir}/pkgconfig/%{name}.pc
-%{_libdir}/cmake/%{name}
+%{_libdir}/cmake
 
+%files devel-common
+%{_includedir}/%{libsuffix}/*
 
 %files doc
-%dir %{_defaultdocdir}/%{name}-%{version}
-%doc %{_defaultdocdir}/%{name}-%{version}/*/
+%doc COPYING* ChangeLog *.pdf html/
 
 
 %changelog
+* Fri Aug 30 2013 Björn Esser <bjoern.esser at gmail.com> - 2.43.5-1
+- new upstream version
+- restructured spec to match with libyui
+
 * Sat Aug 03 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.43.3-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild