From e55b6663bcc4ca5c1a9bd757bc8f294f47161944 Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Fri, 25 Aug 2017 10:56:27 -0500 Subject: [PATCH] fix build, cosmetics --- kf5-kdoctools.spec | 33 +++++++++++++++------------------ 1 file changed, 15 insertions(+), 18 deletions(-) diff --git a/kf5-kdoctools.spec b/kf5-kdoctools.spec index 963220f..7d0e9c3 100755 --- a/kf5-kdoctools.spec +++ b/kf5-kdoctools.spec @@ -1,28 +1,30 @@ %global framework kdoctools -Name: kf5-%{framework} +Name: kf5-%{framework} Version: 5.37.0 Release: 1%{?dist} -Summary: KDE Frameworks 5 Tier 2 addon for generating documentation +Summary: KDE Frameworks 5 Tier 2 addon for generating documentation -License: GPLv2+ and MIT -URL: https://cgit.kde.org/%{framework}.git +License: GPLv2+ and MIT +URL: https://cgit.kde.org/%{framework}.git -%global versiondir %(echo %{version} | cut -d. -f1-2) +%global majmin %(echo %{version} | cut -d. -f1-2) %global revision %(echo %{version} | cut -d. -f3) %if %{revision} >= 50 %global stable unstable %else %global stable stable %endif -Source0: http://download.kde.org/%{stable}/frameworks/%{versiondir}/%{framework}-%{version}.tar.xz +Source0: http://download.kde.org/%{stable}/frameworks/%{majmin}/%{framework}-%{version}.tar.xz BuildRequires: docbook-dtds BuildRequires: docbook-style-xsl -BuildRequires: extra-cmake-modules >= %{version} -BuildRequires: kf5-karchive-devel >= %{version} -BuildRequires: kf5-ki18n-devel >= %{version} -BuildRequires: kf5-rpm-macros >= %{version} + +BuildRequires: kf5-rpm-macros +BuildRequires: extra-cmake-modules >= %{majmin} +BuildRequires: kf5-karchive-devel >= %{majmin} +BuildRequires: kf5-ki18n-devel >= %{majmin} + BuildRequires: libxml2-devel BuildRequires: libxslt-devel %if 0%{?fedora} @@ -36,7 +38,6 @@ BuildRequires: qt5-qtbase-devel Requires: docbook-dtds Requires: docbook-style-xsl -Requires: kf5-filesystem >= %{version} Obsoletes: kf5-kdoctools-doc < 5.3.0-2 Provides: kf5-kdoctools-doc = %{version}-%{release} @@ -61,7 +62,7 @@ developing applications that use %{name}. %prep -%setup -q -n %{framework}-%{version} +%autosetup -n %{framework}-%{version} -p1 %build @@ -76,13 +77,13 @@ make %{?_smp_mflags} -C %{_target_platform} %install make install/fast DESTDIR=%{buildroot} -C %{_target_platform} -%find_lang kdoctools5_qt --with-qt --with-man --all-name +%find_lang %{name} --all-name --with-html --with-man --with-qt %post -p /sbin/ldconfig %postun -p /sbin/ldconfig -%files -f kdoctools5_qt.lang +%files -f %{name}.lang %doc README.md %license COPYING.LIB %{_kf5_libdir}/libKF5DocTools.so.5* @@ -91,10 +92,7 @@ make install/fast DESTDIR=%{buildroot} -C %{_target_platform} %{_kf5_bindir}/meinproc5 %{_kf5_mandir}/man1/*.1* %{_kf5_mandir}/man7/*.7* -%{_kf5_mandir}/man8/*.8* %{_kf5_datadir}/kf5/kdoctools/ -# FIXME/TODO: %%lang'ify these -- rex -%{_kf5_docdir}/HTML/*/kdoctools5-common/ %files devel %{_kf5_includedir}/KDocTools/ @@ -102,7 +100,6 @@ make install/fast DESTDIR=%{buildroot} -C %{_target_platform} %{_kf5_libdir}/cmake/KF5DocTools/ - %changelog * Fri Aug 25 2017 Rex Dieter - 5.37.0-1 - 5.37.0