From 9819663a478d29df8514dabc2121433512999621 Mon Sep 17 00:00:00 2001 From: Than Ngo Date: Apr 09 2013 16:41:06 +0000 Subject: don't build component if ACTIVEAPP_FOUND FALSE --- diff --git a/okular-4.10-cmake.patch b/okular-4.10-cmake.patch new file mode 100644 index 0000000..5b24ef2 --- /dev/null +++ b/okular-4.10-cmake.patch @@ -0,0 +1,12 @@ +diff -up okular-4.10.2/active/CMakeLists.txt.me okular-4.10.2/active/CMakeLists.txt +--- okular-4.10.2/active/CMakeLists.txt.me 2013-04-09 17:34:36.086464571 +0200 ++++ okular-4.10.2/active/CMakeLists.txt 2013-04-09 17:35:02.737461052 +0200 +@@ -4,7 +4,5 @@ macro_log_feature(ACTIVEAPP_FOUND "Activ + + if (ACTIVEAPP_FOUND) + add_subdirectory( app ) ++ add_subdirectory( components ) + endif (ACTIVEAPP_FOUND) +- +-add_subdirectory( components ) +- diff --git a/okular.spec b/okular.spec index d80dd1a..c81acb3 100644 --- a/okular.spec +++ b/okular.spec @@ -1,7 +1,7 @@ Name: okular Summary: A document viewer Version: 4.10.2 -Release: 2%{?dist} +Release: 3%{?dist} License: GPLv2 URL: https://projects.kde.org/projects/kde/kdegraphics/okular @@ -23,6 +23,9 @@ Patch51: kdegraphics-4.5.80-OkularConfig-dont-hardcode-paths.patch # get rif of gcc overflow warning Patch52: okular-gcc-overflow.patch +# don't build component if ACTIVEAPP_FOUND FALSE +Patch53: okular-4.10-cmake.patch + %if 0%{?fedora} BuildRequires: chmlib-devel BuildRequires: ebook-tools-devel @@ -93,7 +96,7 @@ Summary: A kioslave for displaying WinHelp files %patch50 -p2 -b .okular_dt %patch51 -p2 -b .OkularConfig %patch52 -p1 -b .overflow - +%patch53 -p1 -b .cmake %build mkdir -p %{_target_platform} @@ -138,14 +141,14 @@ fi %{_kde4_iconsdir}/hicolor/*/*/* %{_mandir}/man1/okular.1* -%files active %if 0%{?fedora} +%files active %{_kde4_appsdir}/plasma/packages/org.kde.active.documentviewer/ %{_kde4_bindir}/active-documentviewer %{_kde4_datadir}/applications/kde4/active-documentviewer.desktop -%endif # not sure if this is best put here or not -- rex %{_kde4_libdir}/kde4/imports/org/kde/okular/ +%endif %files devel %{_kde4_includedir}/okular/ @@ -176,6 +179,9 @@ fi %changelog +* Tue Apr 09 2013 Than Ngo - 4.10.2-3 +- don't build component if ACTIVEAPP_FOUND FALSE + * Fri Apr 05 2013 Than Ngo - 4.10.2-2 - BR on plasma-mobile-devel only in fedora