[kmess] explicitly enable konq_plugin now

Rex Dieter rdieter at fedoraproject.org
Wed Mar 16 15:53:29 UTC 2011


commit 72cddb6759104f22f960afb9693e1c85e35f01f7
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Wed Mar 16 10:52:58 2011 -0500

    explicitly enable konq_plugin now

 kmess.spec |   17 ++++++++++++-----
 1 files changed, 12 insertions(+), 5 deletions(-)
---
diff --git a/kmess.spec b/kmess.spec
index 89c7f69..97d7bd6 100644
--- a/kmess.spec
+++ b/kmess.spec
@@ -18,8 +18,7 @@ Patch50: kmess-2.0.6.1-kmesssendpluginlib_dsolinking.patch
 # this static anyway
 patch51: kmess-2.0.6.1-kmesssendpluginlib_static.patch
 
-BuildRequires:  kdelibs4-devel >= 4.2
-BuildRequires:  cmake
+BuildRequires:  kdelibs4-devel
 BuildRequires:  qca2-devel
 BuildRequires:  libxml2-devel
 BuildRequires:  libxslt-devel
@@ -29,8 +28,14 @@ BuildRequires:  gettext
 BuildRequires:  giflib-devel
 BuildRequires:  libgcrypt-devel
 
-# removed konqueror integration till the bugs are worked out
-#BuildRequires:  kdebase-devel
+## removed konqueror integration till the bugs are worked out
+## is "the bugs" ^^ the same as what is fixed in Patch51/Patch52?
+## will assume 'yes', and enable this feature now... -- Rex
+%global konq_plugin 1
+%if 0%{?konq_plugin}
+BuildRequires:  kdebase4-devel
+%{?_kde4_version:Requires: kdebase4 >= %{_kde4_version}}
+%endif
 
 #-----------------------------------------------------------------------------
 #-- The following OPTIONAL packages could NOT be located on your system.
@@ -72,7 +77,7 @@ make %{?_smp_mflags} -C %{_target_platform}
 rm -rf %{buildroot}
 make install/fast DESTDIR=%{buildroot} -C %{_target_platform}
 
-%find_lang kmess --with-kde || (touch kmess.lang; echo "NOTICE: translations missing!")
+%find_lang kmess --with-kde || (touch kmess.lang; echo 'NOTICE: translations missing!')
 
 
 %check
@@ -103,8 +108,10 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &> /dev/null || :
 %{_kde4_appsdir}/kmess/
 %{_kde4_iconsdir}/hicolor/*/*/kmess.*
 %{_kde4_datadir}/sounds/kmess*
+%if 0%{?konq_plugin}
 %{_kde4_datadir}/kde4/services/kmesssendplugin.desktop
 %{_kde4_libdir}/kde4/libkmesssendplugin.so
+%endif
 
 %changelog
 * Wed Mar 16 2011 Rex Dieter <rdieter at fedoraproject.org> 2.0.6.1-1


More information about the scm-commits mailing list