[nepomuk-core] fix build

Rex Dieter rdieter at fedoraproject.org
Wed Jun 13 03:41:55 UTC 2012


commit 2281055e302aad21dc6c00bdff29611c78fb2427
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Tue Jun 12 22:44:27 2012 -0500

    fix build
    
    add shared-desktop-ontologies dep
    fix %files

 nepomuk-core.spec |   18 ++++++++++++++----
 1 files changed, 14 insertions(+), 4 deletions(-)
---
diff --git a/nepomuk-core.spec b/nepomuk-core.spec
index 3689fe9..85a4ab4 100644
--- a/nepomuk-core.spec
+++ b/nepomuk-core.spec
@@ -1,3 +1,4 @@
+%define shared_desktop_ontologies_ver 0.9.0
 %define soprano_ver 2.7.56
 
 Name:    nepomuk-core
@@ -24,6 +25,8 @@ BuildRequires:  doxygen
 
 Requires: %{name}-libs%{?_isa} = %{version}-%{release}
 Requires: kdelibs4%{?_isa} >= %{version}
+%global shared_desktop_ontologies_version %(pkg-config --modversion shared-desktop-ontologies 2>/dev/null || echo %{shared_desktop_ontologies_ver})
+Requires: shared-desktop-ontologies >= %{shared_desktop_ontologies_version}
 %global soprano_version %(pkg-config --modversion soprano 2>/dev/null || echo %{soprano_ver})
 Requires: soprano%{?_isa} >= %{soprano_version}
 
@@ -36,6 +39,7 @@ Conflicts: kde-runtime < 4.8.80-2
 %package devel
 Summary:  Developer files for %{name}
 Requires: %{name}-libs%{?_isa} = %{version}-%{release}
+Requires: kdelibs4-devel
 %description devel
 %{summary}.
 
@@ -46,6 +50,7 @@ Requires: %{name} = %{version}-%{release}
 %description libs
 %{summary}.
 
+
 %prep
 %setup -q
 
@@ -73,12 +78,17 @@ desktop-file-validate %{buildroot}%{_kde4_datadir}/applications/kde4/nepomukback
 %{_kde4_appsdir}/fileindexerservice/
 %{_kde4_appsdir}/nepomukfilewatch/
 %{_kde4_appsdir}/nepomukstorage/
-#{_kde4_bindir}/*
+# this one maybe in -devel?  --rex
+%{_kde4_bindir}/nepomuk-simpleresource-rcgen
+%{_kde4_bindir}/nepomukbackup
+%{_kde4_bindir}/nepomukindexer
+%{_kde4_bindir}/nepomukserver
+%{_kde4_bindir}/nepomukservicestub
 %{_kde4_libdir}/libkdeinit4_nepomukserver.so
 %{_kde4_datadir}/applications/kde4/nepomukbackup.desktop
 %{_kde4_datadir}/autostart/nepomukserver.desktop
-%{_kde4_datadir}/kde4/services/*
-%{_kde4_datadir}/kde4/servicetypes/*
+%{_kde4_datadir}/kde4/services/*.desktop
+%{_kde4_datadir}/kde4/servicetypes/nepomukservice.desktop
 %{_kde4_datadir}/ontology/kde/
 %{_datadir}/dbus-1/interfaces/*.xml
 
@@ -104,7 +114,7 @@ desktop-file-validate %{buildroot}%{_kde4_datadir}/applications/kde4/nepomukback
 - 4.8.90-2
 - move libkdeinit_* to base pkg (no need for multilib) 
 - .spec cleanup
-- add soprano runtime dep
+- add shared-desktop-ontologies, soprano runtime deps
 
 * Sat Jun 09 2012 Rex Dieter <rdieter at fedoraproject.org> - 4.8.90-1
 - 4.8.90


More information about the scm-commits mailing list