- updated dependencies, release 4 (exiv2 rebuild)

diff --git a/kde4-nepomuk-core.spec b/kde4-nepomuk-core.spec
index 7fb65534892a928325e3a168d6c71f82efecf526..ca90b20df578c96993bd3de70ed786c7183138a3 100644 (file)
--- a/kde4-nepomuk-core.spec
+++ b/kde4-nepomuk-core.spec
@@ -1,25 +1,26 @@
-%define         _state          stable
-%define         orgname                nepomuk-core
-%define         qtver           4.8.3
+%define                _state          stable
+%define                orgname         nepomuk-core
+%define                qt_ver          4.8.3
 
 Summary:       Nepomuk Core utilities and libraries
 Summary(pl.UTF-8):     Narzędzia i biblioteki Nepomuk Core
 Name:          kde4-nepomuk-core
 Version:       4.14.3
-Release:       3
-License:       LGPLv2 or LGPLv3
+Release:       4
+License:       LGPL v2.1 or LGPL v3
 Group:         X11/Applications
 Source0:       http://download.kde.org/%{_state}/%{version}/src/%{orgname}-%{version}.tar.xz
 # Source0-md5: 8c25048fce09e23469b2fb149331a58a
 URL:           http://www.kde.org/
-BuildRequires: QtCore-devel >= %{qtver}
+BuildRequires: QtCore-devel >= %{qt_ver}
+BuildRequires: QtDBus-devel >= %{qt_ver}
 BuildRequires: acl-devel
 BuildRequires: attr-devel
 BuildRequires: automoc4
 BuildRequires: cmake >= 2.8.6
 BuildRequires: doxygen
 BuildRequires: ebook-tools-devel
-BuildRequires: exiv2-devel >= 0.12
+BuildRequires: exiv2-devel >= 0.21
 BuildRequires: ffmpeg-devel >= 1.0
 BuildRequires: kde4-baloo-devel >= %{version}
 BuildRequires: kde4-kdegraphics-mobipocket-devel >= %{version}
@@ -28,13 +29,26 @@ BuildRequires:      kde4-kfilemetadata-devel >= %{version}
 BuildRequires: libdbusmenu-qt-devel
 BuildRequires: pkgconfig
 BuildRequires: poppler-qt4-devel >= 0.12.1
-BuildRequires: qt4-build
+BuildRequires: qt4-build >= %{qt_ver}
 BuildRequires: shared-desktop-ontologies-devel >= 0.10.51
 BuildRequires: soprano-devel >= 2.9.3
 BuildRequires: strigi-devel
 BuildRequires: taglib-devel >= 1.4
+BuildRequires: tar >= 1:1.22
+BuildRequires: xz
 BuildRequires: zlib-devel
-Requires:      QtCore >= %{qtver}
+Requires:      QtCore >= %{qt_ver}
+Requires:      QtDBus >= %{qt_ver}
+Requires:      exiv2-libs >= 0.21
+Requires:      ffmpeg-libs >= 1.0
+Requires:      kde4-baloo >= %{version}
+Requires:      kde4-kdegraphics-mobipocket >= %{version}
+Requires:      kde4-kdelibs >= %{version}
+Requires:      kde4-kfilemetadata >= %{version}
+Requires:      poppler-qt4 >= 0.12.1
+Requires:      shared-desktop-ontologies >= 0.10.51
+Requires:      soprano >= 2.9.3
+Requires:      taglib >= 1.4
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
@@ -48,6 +62,10 @@ Summary:     Development files for Nepomuk Core
 Summary(pl.UTF-8):     Pliki programistyczne Nepomuk Core
 Group:         X11/Development/Libraries
 Requires:      %{name} = %{version}-%{release}
+Requires:      QtCore-devel >= %{qt_ver}
+Requires:      QtDBus-devel >= %{qt_ver}
+Requires:      kde4-kdelibs-devel >= %{version}
+Requires:      soprano-devel >= 2.9.3
 
 %description devel
 Development files for Nepomuk Core.
@@ -62,10 +80,10 @@ Pliki programistyczne Nepomuk Core.
 install -d build
 cd build
 %cmake \
-               -DHTML_INSTALL_DIR=%{_kdedocdir} \
-               -DKDE_DISTRIBUTION_TEXT="PLD-Linux" \
-               -DKDE4_ENABLE_FINAL=OFF \
-               ../
+       -DHTML_INSTALL_DIR=%{_kdedocdir} \
+       -DKDE_DISTRIBUTION_TEXT="PLD-Linux" \
+       -DKDE4_ENABLE_FINAL=OFF \
+       ../
 
 %{__make}
 
@@ -114,9 +132,9 @@ rm -rf $RPM_BUILD_ROOT
 %attr(755,root,root) %{_libdir}/libnepomukcommon.so
 %attr(755,root,root) %{_libdir}/libnepomukextractor.so
 %attr(755,root,root) %{_libdir}/libnepomukcore.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libnepomukcore.so.?
+%attr(755,root,root) %ghost %{_libdir}/libnepomukcore.so.4
 %attr(755,root,root) %{_libdir}/libnepomukcleaner.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libnepomukcleaner.so.?
+%attr(755,root,root) %ghost %{_libdir}/libnepomukcleaner.so.4
 %{_desktopdir}/kde4/nepomukbackup.desktop
 %{_desktopdir}/kde4/nepomukcleaner.desktop
 %{_datadir}/apps/fileindexerservice
@@ -132,8 +150,12 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/kde4/servicetypes/nepomukextractor.desktop
 %{_datadir}/kde4/servicetypes/nepomukservice2.desktop
 %{_datadir}/kde4/servicetypes/nepomukservice.desktop
-%{_datadir}/ontology/kde/*.ontology
-%{_datadir}/ontology/kde/*.trig
+%{_datadir}/ontology/kde/kext.ontology
+%{_datadir}/ontology/kde/kext.trig
+%{_datadir}/ontology/kde/kuvo.ontology
+%{_datadir}/ontology/kde/kuvo.trig
+%{_datadir}/ontology/kde/nrio.ontology
+%{_datadir}/ontology/kde/nrio.trig
 %{_datadir}/polkit-1/actions/org.kde.nepomuk.filewatch.policy
 /etc/dbus-1/system.d/org.kde.nepomuk.filewatch.conf