[libyui-qt/f21] new upstream release (#1183542) rebuilt for libyui-3.1.5 keep doc-files in unfied %%{_pkgdocdir} sma
Björn Esser
besser82 at fedoraproject.org
Tue Jan 20 10:23:43 UTC 2015
commit 3ef34e12c801a04e1f6fa2d37d78c7647bbbaa71
Author: Björn Esser <bjoern.esser at gmail.com>
Date: Tue Jan 20 11:16:37 2015 +0100
new upstream release (#1183542)
rebuilt for libyui-3.1.5
keep doc-files in unfied %%{_pkgdocdir}
small improvements to spec-file
libyui-qt.spec | 71 +++++++++++++++++++++++++++++++++++++-------------------
sources | 2 +-
2 files changed, 48 insertions(+), 25 deletions(-)
---
diff --git a/libyui-qt.spec b/libyui-qt.spec
index 1c0d312..5d363ec 100644
--- a/libyui-qt.spec
+++ b/libyui-qt.spec
@@ -1,11 +1,19 @@
+# Define libsuffix, minimum libyui-devel version
+# and so-version of libyui.
%global libsuffix yui
%global libname lib%{libsuffix}
-%global devel_min_ver 3.0.12
+%global devel_min_ver 3.1.2
%global major_so_ver 6
+# 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.46.1
-Release: 4%{?dist}
+Version: 2.46.13
+Release: 1%{?dist}
Summary: Qt User Interface for %{libname}
License: LGPLv2 or LGPLv3
@@ -13,10 +21,7 @@ URL: https://github.com/%{libname}/%{name}
Source0: %{url}/archive/%{name}/master/%{version}.tar.gz#/%{name}-%{version}.tar.gz
BuildRequires: cmake >= 2.8
-BuildRequires: doxygen
-BuildRequires: fdupes
BuildRequires: fontconfig-devel
-BuildRequires: graphviz
BuildRequires: %{libname}-devel >= %{devel_min_ver}
BuildRequires: pkgconfig(Qt5Core)
BuildRequires: pkgconfig(Qt5Gui)
@@ -59,6 +64,10 @@ for %{name} which is not covered within the UI-plugin.
Summary: Documentation files for %{name}
BuildArch: noarch
+BuildRequires: doxygen
+BuildRequires: graphviz
+BuildRequires: hardlink
+
%description doc
This package includes the developer's documentation as HTML
for %{name}.
@@ -70,50 +79,64 @@ for %{name}.
%build
-mkdir -p build
-pushd build
-%cmake \
- -DPREFIX=%{_prefix} \
- -DLIB_DIR=%{_libdir} \
- -DCMAKE_BUILD_TYPE=RELEASE \
- -DRESPECT_FLAGS=ON \
+%{__mkdir} -p %{_cmake_build_subdir}
+pushd %{_cmake_build_subdir}
+%cmake \
+ -DYPREFIX=%{_prefix} \
+ -DLIB_DIR=%{_libdir} \
+ -DCMAKE_BUILD_TYPE=RELEASE \
+ -DRESPECT_FLAGS=ON \
..
-make %{?_smp_mflags}
-make %{?_smp_mflags} docs
+%{__make} %{?_smp_mflags}
+%{__make} %{?_smp_mflags} docs
popd
%install
-pushd build
-mkdir -p %{buildroot}%{_libdir}/%{libsuffix} \
- %{buildroot}%{_datadir}/%{name}/theme
+pushd %{_cmake_build_subdir}
+%{__mkdir} -p %{buildroot}%{_libdir}/%{libsuffix} \
+ %{buildroot}%{_datadir}/%{name}/theme
%make_install
-rm -rf %{buildroot}%{_defaultdocdir} \
- ../examples/CMake* \
- doc/html/*.m*
+# Delete obsolete files.
+%{__rm} -rf %{buildroot}%{_defaultdocdir} \
+ doc/html/*.m*
-%fdupes doc/html
+# Hard-link documentation.
+%{_sbindir}/hardlink -cv doc/html
+
+# Install documentation.
+%{__mkdir} -p %{buildroot}%{?_pkgdocdir}
+%{__cp} -a ../ChangeLog ../COPYING* doc/html/ \
+ %{buildroot}%{?_pkgdocdir}
popd
%files
-%doc ChangeLog COPYING*
+%doc %dir %{?_pkgdocdir}
+%doc %{?_pkgdocdir}/COPYING*
%{_libdir}/%{libsuffix}/%{name}.so.%{major_so_ver}*
%files devel
+%doc %{?_pkgdocdir}/ChangeLog
%{_includedir}/%{libsuffix}/*
%{_libdir}/%{libsuffix}/%{name}.so
%{_libdir}/pkgconfig/%{name}.pc
%{_libdir}/cmake
%files doc
-%doc ChangeLog COPYING* build/doc/html/
+%doc %{?_pkgdocdir}
%changelog
+* Tue Jan 20 2015 Björn Esser <bjoern.esser at gmail.com> - 2.46.13-1
+- new upstream release (#1183542)
+- rebuilt for libyui-3.1.5
+- keep doc-files in unfied %%{_pkgdocdir}
+- small improvements to spec-file
+
* Sun Aug 17 2014 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.46.1-4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild
diff --git a/sources b/sources
index d2f5e38..e4a4b88 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-96b577b9f1c3a5e1bd57971abd16fe0c libyui-qt-2.46.1.tar.gz
+e0e0cc8a448b61c0fda6f52b9933713a libyui-qt-2.46.13.tar.gz
More information about the scm-commits
mailing list