[nepomuk-core] 4.8.90-2 move libkdeinit_* to base pkg (no need for multilib) .spec cleanup add soprano runtime dep

[Rex Dieter]

commit 4026c79a3b18a050ba2bf52cfca0f2cbe42b05fc
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Tue Jun 12 22:13:53 2012 -0500

    4.8.90-2
    move libkdeinit_* to base pkg (no need for multilib)
    .spec cleanup
    add soprano runtime dep

 nepomuk-core.spec |   47 +++++++++++++++++++++++------------------------
 1 files changed, 23 insertions(+), 24 deletions(-)
---
diff --git a/nepomuk-core.spec b/nepomuk-core.spec
index 358a0c8..3689fe9 100644
--- a/nepomuk-core.spec
+++ b/nepomuk-core.spec
@@ -1,12 +1,12 @@
 %define soprano_ver 2.7.56
 
-Name:           nepomuk-core
+Name:    nepomuk-core
 Version: 4.8.90
-Release: 1%{?dist}
-Summary:        Nepomuk Core utilities and libraries
+Release: 2%{?dist}
+Summary: Nepomuk Core utilities and libraries
 
-License:        LGPLv2 or LGPLv3
-URL:            http://www.kde.org/
+License: LGPLv2 or LGPLv3
+URL:     http://www.kde.org/
 
 %global revision %(echo %{version} | cut -d. -f3)
 %if %{revision} >= 50
@@ -22,22 +22,20 @@ BuildRequires:  pkgconfig(soprano) >= %{soprano_ver}
 BuildRequires:  pkgconfig(shared-desktop-ontologies)
 BuildRequires:  doxygen
 
-#-- Could NOT find KDE4Workspace  (missing:  KDE4Workspace_CONFIG) 
-# it's not needed, will be fixed in beta 2
-
-Requires:       kdelibs4%{?_isa} >= %{version}
-Requires:       %{name}-libs%{?_isa} = %{version}-%{release}
+Requires: %{name}-libs%{?_isa} = %{version}-%{release}
+Requires: kdelibs4%{?_isa} >= %{version}
+%global soprano_version %(pkg-config --modversion soprano 2>/dev/null || echo %{soprano_ver})
+Requires: soprano%{?_isa} >= %{soprano_version}
 
 # moved from kde-runtime in 4.8.80 (nepomuk common has nepomuk-core preference)
-Conflicts:      kde-runtime < 4.8.80-2
-
+Conflicts: kde-runtime < 4.8.80-2
 
 %description
 %{summary}.
 
 %package devel
 Summary:  Developer files for %{name}
-Requires: %{name}-libs%{?_isa} = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires: %{name}-libs%{?_isa} = %{version}-%{release}
 %description devel
 %{summary}.
 
@@ -62,28 +60,21 @@ make %{?_smp_mflags} -C %{_target_platform}
 
 
 %install
-rm -rf %{buildroot}
 
 make install/fast DESTDIR=%{buildroot} -C %{_target_platform}
 
-# nepomuk-rcgen is already in kdelibs, will be fixed in beta 2
-rm -vf %{buildroot}%{_kde4_bindir}/nepomuk-rcgen
-
 
 %check
 desktop-file-validate %{buildroot}%{_kde4_datadir}/applications/kde4/nepomukbackup.desktop
 
 
-%post libs -p /sbin/ldconfig
-%postun libs -p /sbin/ldconfig
-
-
 %files
 %doc ontologies/README
 %{_kde4_appsdir}/fileindexerservice/
 %{_kde4_appsdir}/nepomukfilewatch/
 %{_kde4_appsdir}/nepomukstorage/
-%{_kde4_bindir}/*
+#{_kde4_bindir}/*
+%{_kde4_libdir}/libkdeinit4_nepomukserver.so
 %{_kde4_datadir}/applications/kde4/nepomukbackup.desktop
 %{_kde4_datadir}/autostart/nepomukserver.desktop
 %{_kde4_datadir}/kde4/services/*
@@ -98,15 +89,23 @@ desktop-file-validate %{buildroot}%{_kde4_datadir}/applications/kde4/nepomukback
 %{_kde4_includedir}/nepomuk2/
 %{_kde4_includedir}/Nepomuk2/
 
+%post libs -p /sbin/ldconfig
+%postun libs -p /sbin/ldconfig
+
 %files libs
 %{_kde4_libdir}/kde4/*.so
-%{_kde4_libdir}/libkdeinit4_nepomukserver.so
 %{_kde4_libdir}/libnepomukcommon.so
 %{_kde4_libdir}/libnepomukcore.so.*
 %{_kde4_libdir}/libnepomuksync.so.*
 
 
 %changelog
+* Tue Jun 12 2012 Rex Dieter <rdieter at fedoraproject.org> 
+- 4.8.90-2
+- move libkdeinit_* to base pkg (no need for multilib) 
+- .spec cleanup
+- add soprano runtime dep
+
 * Sat Jun 09 2012 Rex Dieter <rdieter at fedoraproject.org> - 4.8.90-1
 - 4.8.90
 
@@ -121,4 +120,4 @@ desktop-file-validate %{buildroot}%{_kde4_datadir}/applications/kde4/nepomukback
 - fix license
 
 * Sat May 26 2012 Jaroslav Reznik <jreznik at redhat.com> 4.8.80-1
-- initial try
\ No newline at end of file
+- initial try