[okular] use feature macros
Rex Dieter
rdieter at fedoraproject.org
Wed Oct 23 16:44:56 UTC 2013
commit 696bb066b9cadafe81816b7945d56a7f93c8f563
Author: Rex Dieter <rdieter at math.unl.edu>
Date: Wed Oct 23 11:44:13 2013 -0500
use feature macros
... and fix build when active feature is not enabled.
okular.spec | 27 +++++++++++++++++++--------
1 files changed, 19 insertions(+), 8 deletions(-)
---
diff --git a/okular.spec b/okular.spec
index 81482a2..8d654ad 100644
--- a/okular.spec
+++ b/okular.spec
@@ -1,3 +1,10 @@
+
+%if 0%{?fedora}
+%define active 1
+%define chm 1
+%define ebook 1
+%endif
+
Name: okular
Summary: A document viewer
Version: 4.11.2
@@ -26,11 +33,13 @@ Patch52: okular-gcc-overflow.patch
# don't build component if ACTIVEAPP_FOUND FALSE
Patch53: okular-4.10-cmake.patch
-%if 0%{?fedora}
+%if 0%{?chm}
BuildRequires: chmlib-devel
-BuildRequires: ebook-tools-devel
%endif
BuildRequires: desktop-file-utils
+%if 0%{?ebook}
+BuildRequires: ebook-tools-devel
+%endif
BuildRequires: kactivities-devel >= %{version}
BuildRequires: kdelibs4-devel >= %{version}
BuildRequires: libkipi-devel >= %{version}
@@ -41,14 +50,14 @@ BuildRequires: pkgconfig(libspectre)
BuildRequires: pkgconfig(poppler-qt4)
BuildRequires: pkgconfig(qca2)
BuildRequires: pkgconfig(qimageblitz)
-%if 0%{?fedora}
+%if 0%{?active}
BuildRequires: plasma-mobile-devel
%endif
# kio_msits migrates from kdegraphics, which had Epoch: 7
%define kio_msits_epoch 7
Requires: %{name}-part%{?_isa} = %{version}-%{release}
-%if 0%{?fedora}
+%if 0%{?chm}
Requires: kio_msits = %{kio_msits_epoch}:%{version}-%{release}
%endif
Requires: kde-runtime%{?_kde4_version: >= %{_kde4_version}}
@@ -109,12 +118,14 @@ make %{?_smp_mflags} -C %{_target_platform}
%install
-rm -rf %{buildroot}
-
make install/fast DESTDIR=%{buildroot} -C %{_target_platform}
%find_lang %{name} --with-kde --without-mo
+%if ! 0%{?active}
+rm -fv %{buildroot}%{_kde4_datadir}/applications/kde4/active-documentviewer_*.desktop
+%endif
+
%check
desktop-file-validate %{buildroot}%{_kde4_datadir}/applications/kde4/%{name}.desktop
@@ -142,7 +153,7 @@ fi
%{_kde4_iconsdir}/hicolor/*/*/*
%{_mandir}/man1/okular.1*
-%if 0%{?fedora}
+%if 0%{?active}
%files active
%{_kde4_appsdir}/plasma/packages/org.kde.active.documentviewer/
%{_kde4_bindir}/active-documentviewer
@@ -173,7 +184,7 @@ fi
%{_kde4_datadir}/kde4/servicetypes/okularGenerator.desktop
%{_kde4_libdir}/kde4/okularGenerator*.so
%{_kde4_libdir}/kde4/okularpart.so
-%if 0%{?fedora}
+%if 0%{?chm}
%files -n kio_msits
%{_kde4_libdir}/kde4/kio_msits.so
%{_kde4_datadir}/kde4/services/msits.protocol
More information about the scm-commits
mailing list