rpms/kdebindings/devel kdebindings-4.1.85-disable-nepomuk-smoke.patch, NONE, 1.1 kdebindings.spec, 1.160, 1.161

[Kevin Kofler]

Author: kkofler

Update of /cvs/pkgs/rpms/kdebindings/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29422/devel

Modified Files:
	kdebindings.spec 
Added Files:
	kdebindings-4.1.85-disable-nepomuk-smoke.patch 
Log Message:
- disable NepomukSmoke for now: it wasn't actually used (the corresponding
  Ruby binding is disabled by default and we don't build the C# bindings) and it
  depends on nepomukquery libs from kdebase (which also means we need to sort
  out the -devel symlink mess there first)

kdebindings-4.1.85-disable-nepomuk-smoke.patch:

--- NEW FILE kdebindings-4.1.85-disable-nepomuk-smoke.patch ---
diff -ur kdebindings-4.1.85/smoke/CMakeLists.txt kdebindings-4.1.85-disable-nepomuk-smoke/smoke/CMakeLists.txt
--- kdebindings-4.1.85/smoke/CMakeLists.txt	2008-12-04 09:34:05.000000000 +0100
+++ kdebindings-4.1.85-disable-nepomuk-smoke/smoke/CMakeLists.txt	2008-12-13 02:33:55.000000000 +0100
@@ -12,6 +12,7 @@
 OPTION(ENABLE_KTEXTEDITOR_SMOKE "build KTextEditorSmoke" ON)
 OPTION(ENABLE_SOLID_SMOKE "build SolidSmoke" ON)
 OPTION(ENABLE_PLASMA_SMOKE "build PlasmaSmoke" ON)
+OPTION(ENABLE_NEPOMUK_SMOKE "build NepomukSmoke" OFF)
 
 set(SMOKE_ENABLED "no")
 if(ENABLE_SMOKE)
@@ -93,10 +94,10 @@
         set(SMOKE_ENABLED "${SMOKE_ENABLED}, KTextEditor")
     endif(ENABLE_KTEXTEDITOR_SMOKE)
 
-    if(Nepomuk_FOUND)
+    if(ENABLE_NEPOMUK_SMOKE AND Nepomuk_FOUND)
         add_subdirectory(nepomuk)
         set(SMOKE_ENABLED "${SMOKE_ENABLED}, Nepomuk")
-    endif(Nepomuk_FOUND)
+    endif(ENABLE_NEPOMUK_SMOKE AND Nepomuk_FOUND)
 
     if(OKULAR_FOUND)
         add_subdirectory(okular)


Index: kdebindings.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdebindings/devel/kdebindings.spec,v
retrieving revision 1.160
retrieving revision 1.161
diff -u -r1.160 -r1.161
--- kdebindings.spec	12 Dec 2008 23:55:14 -0000	1.160
+++ kdebindings.spec	13 Dec 2008 01:38:13 -0000	1.161
@@ -29,6 +29,8 @@
 License: GPLv2
 URL: http://developer.kde.org/language-bindings/
 Source0: ftp://ftp.kde.org/pub/kde/unstable/%{version}/src/%{name}-%{version}.tar.bz2
+# disable NepomukSmoke by default (-DENABLE_NEPOMUK_SMOKE=ON to enable)
+Patch0: kdebindings-4.1.85-disable-nepomuk-smoke.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  plasma-devel >= %{version}
@@ -39,8 +41,6 @@
 %{?ruby:BuildRequires:  ruby-devel ruby}
 BuildRequires:  giflib-devel
 BuildRequires:  pcre-devel
-# causes smokeqt to fail to build
-#{?smoke:BuildRequires:  qwt-devel}
 BuildRequires:  PyQt4-devel >= 4.4.2
 %if 0%{?fedora} > 8
 BuildRequires:  qscintilla-devel >= 2.2
@@ -82,6 +82,7 @@
 
 %prep
 %setup -q
+%patch0 -p1 -b .disable-nepomuk-smoke
 
 %build
 mkdir -p %{_target_platform}
@@ -165,6 +166,10 @@
 %changelog
 * Fri Dec 12 2008 Kevin Kofler <Kevin at tigcc.ticalc.org> 4.1.85-2
 - reenable smoke, ruby
+- disable NepomukSmoke for now: it wasn't actually used (the corresponding
+  Ruby binding is disabled by default and we don't build the C# bindings) and it
+  depends on nepomukquery libs from kdebase (which also means we need to sort
+  out the -devel symlink mess there first)
 
 * Fri Dec 12 2008 Than Ngo <than at redhat.com> 4.1.85-1
 - 4.2beta2