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

[Björn Esser]

commit e26b09e9cbf93bd697367a19e4f8da8c7f9c1d54
Author: Björn Esser <bjoern.esser at gmail.com>
Date:   Fri Aug 30 13:09:20 2013 +0200

    new upstream version
    restructured spec to match with libyui

 .gitignore          |    5 ++-
 libyui-ncurses.spec |   86 +++++++++++++++++++++++++--------------------------
 sources             |    2 +-
 3 files changed, 47 insertions(+), 46 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 1985234..4a406bf 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,4 @@
-/libyui-ncurses-2.43.9-c1614c6.tar.gz
+*~
+*.rpm
+*.tar*
+results_*/
diff --git a/libyui-ncurses.spec b/libyui-ncurses.spec
index 4542744..6e5d7cf 100644
--- a/libyui-ncurses.spec
+++ b/libyui-ncurses.spec
@@ -1,29 +1,24 @@
-%global commit c1614c6aa347d6a780911597c49bb19f408914b2
-%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}-ncurses
-Version:	2.43.9
-Release:	4%{?dist}
+Version:	2.44.1
+Release:	1%{?dist}
+Summary:	Character Based User Interface for %{libname}
+
 License:	LGPLv2 or LGPLv3
-Source:		https://github.com/%{libname}/%{name}/archive/%{commit}/%{name}-%{version}-%{shortcommit}.tar.gz
-Group:		System Environment/Libraries
+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}
 BuildRequires:	ncurses-devel
 
-URL:		https://github.com/%{libname}/%{name}/
-Summary:	Character Based User Interface for %{libname}
-
 Provides:	%{libsuffix}-ui%{?_isa} = %{major_so_ver}
 
 
@@ -33,16 +28,13 @@ component for %{libname}.
 
 
 %package devel
-
-Group:		Development/Libraries
+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:	ncurses-devel%{?_isa}
 
-Summary:	Files needed for developing with %{name}
-
-
 %description devel
 %{libname} can be used independently of YaST for generic (C++) applications
 and has very few dependencies.
@@ -53,35 +45,35 @@ This package is only needed when you want to develop an extension for
 %{name} which is not covered within the UI-plugin.
 
 
-%package doc
-
-Group:		Documentation
+%package devel-common
+Summary:	Common files needed for developing with %{name}
 
 BuildArch:	noarch
+Requires:	%{name}-devel = %{version}-%{release}
 
-Summary:	Documentation files for %{name}
+%description devel-common
+%{summary}, e.g. headers and CMake-macros.
 
 
+%package doc
+Summary:	Documentation files for %{name}
+BuildArch:	noarch
+
 %description doc
 This package includes the developer's documentation as HTML 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
 
@@ -90,36 +82,42 @@ make %{?_smp_mflags} docs
 
 
 %install
-cd build
-
+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}
-%{_datadir}/%{libname}/*
+%{_libdir}/cmake
 
+%files devel-common
+%{_includedir}/%{libsuffix}/*
+%{_datadir}/%{libname}/*
 
 %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.44.1-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.9-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
 
diff --git a/sources b/sources
index c07666a..73381b3 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-849b88b696b3885aa15c1ce69372a63d  libyui-ncurses-2.43.9-c1614c6.tar.gz
+e3136e4892dccb9cc788e6e3323a8b11  libyui-ncurses-2.44.1.tar.gz