diff --git a/.gitignore b/.gitignore index 67c8ea5..bf15603 100644 --- a/.gitignore +++ b/.gitignore @@ -1,10 +1 @@ -/baloo-5.5.95.tar.xz -/baloo-5.6.0.tar.xz -/baloo-5.6.1.tar.xz -/baloo-5.6.2.tar.xz -/baloo-5.6.95.tar.xz -/baloo-5.9.0.tar.xz -/baloo-5.9.1.tar.xz -/baloo-5.9.2.tar.xz -/baloo-5.13.0.tar.xz /baloo-5.14.0.tar.xz diff --git a/baloo-5.14.0-baloofile_config.patch b/baloo-5.14.0-baloofile_config.patch new file mode 100644 index 0000000..2e48dab --- /dev/null +++ b/baloo-5.14.0-baloofile_config.patch @@ -0,0 +1,19 @@ +diff -up baloo-5.14.0/src/file/fileindexerconfig.cpp.balooconfig baloo-5.14.0/src/file/fileindexerconfig.cpp +--- baloo-5.14.0/src/file/fileindexerconfig.cpp.balooconfig 2015-09-10 01:43:46.000000000 -0500 ++++ baloo-5.14.0/src/file/fileindexerconfig.cpp 2015-10-03 09:48:28.880859786 -0500 +@@ -276,8 +276,13 @@ void cleanupList(QList= %{version} -BuildRequires: extra-cmake-modules >= %{version} -BuildRequires: lmdb-devel +## upstreamable patches +# http://bugzilla.redhat.com/1235026 +Patch1: baloo-5.14.0-baloofile_config.patch -BuildRequires: kf5-ki18n-devel >= %{version} -BuildRequires: kf5-kconfig-devel >= %{version} -BuildRequires: kf5-kidletime-devel >= %{version} +BuildRequires: cmake +BuildRequires: extra-cmake-modules >= %{version} BuildRequires: kf5-kauth-devel >= %{version} +BuildRequires: kf5-kconfig-devel >= %{version} BuildRequires: kf5-kcrash-devel >= %{version} -BuildRequires: kf5-solid-devel >= %{version} BuildRequires: kf5-kdbusaddons-devel >= %{version} BuildRequires: kf5-kfilemetadata-devel >= %{version} +BuildRequires: kf5-ki18n-devel >= %{version} +BuildRequires: kf5-kidletime-devel >= %{version} BuildRequires: kf5-kio-devel >= %{version} +BuildRequires: kf5-rpm-macros >= %{version} +BuildRequires: kf5-solid-devel >= %{version} +BuildRequires: lmdb-devel +BuildRequires: qt5-qtbase-devel +BuildRequires: qt5-qtdeclarative-devel Requires: kf5-filesystem >= %{version} @@ -45,19 +52,20 @@ Provides: baloo = %{version}-%{release} %package devel Summary: Development files for %{name} -Group: Development/Libraries +# KDE e.V. may determine that future LGPL versions are accepted +License: LGPLv2 or LGPLv3 Requires: %{name}%{?_isa} = %{version}-%{release} Requires: %{name}-file%{?_isa} = %{version}-%{release} -Requires: kf5-kfilemetadata-devel >= %{version} -Requires: xapian-core-devel Requires: kf5-kcoreaddons-devel >= %{version} - +Requires: kf5-kfilemetadata-devel >= %{version} %description devel The %{name}-devel package contains libraries and header files for developing applications that use %{name}. %package file Summary: File indexing and search for Baloo +# KDE e.V. may determine that future LGPL versions are accepted +License: LGPLv2 or LGPLv3 Obsoletes: %{name} < 5.0.1-2 Obsoletes: baloo-file < 5.0.1-2 Provides: baloo-file = %{version}-%{release} @@ -67,15 +75,20 @@ Requires: %{name} = %{version}-%{release} %package libs Summary: Runtime libraries for %{name} +# KDE e.V. may determine that future LGPL versions are accepted +License: LGPLv2 or LGPLv3 %description libs %{summary}. + %prep %setup -qn %{framework}-%{version} -%build +%patch1 -p1 -b .baloofile_config + -mkdir -p %{_target_platform} +%build +mkdir %{_target_platform} pushd %{_target_platform} %{cmake_kf5} .. popd @@ -116,6 +129,7 @@ gtk-update-icon-cache %{_kf5_datadir}/icons/hicolor &> /dev/null || : fi %files -f %{name}.lang +%license COPYING %{_kf5_bindir}/baloosearch %{_kf5_bindir}/balooshow %{_kf5_bindir}/balooctl @@ -139,26 +153,31 @@ fi %{_kf5_sysconfdir}/dbus-1/system.d/org.kde.baloo.filewatch.conf %{_kf5_datadir}/polkit-1/actions/org.kde.baloo.filewatch.policy %{_kf5_datadir}/dbus-1/system-services/org.kde.baloo.filewatch.service -%{_kf5_datadir}/dbus-1/interfaces/org.kde.baloo.file.indexer.xml %post libs -p /sbin/ldconfig %postun libs -p /sbin/ldconfig %files libs +%license COPYING.LIB %{_kf5_libdir}/libKF5Baloo.so.* %{_kf5_libdir}/libKF5BalooEngine.so.* %files devel %{_kf5_libdir}/libKF5Baloo.so -%{_kf5_libdir}/cmake/KF5Baloo +%{_kf5_libdir}/cmake/KF5Baloo/ %{_kf5_libdir}/pkgconfig/Baloo.pc -%{_kf5_includedir}/Baloo +%{_kf5_includedir}/Baloo/ %{_kf5_includedir}/baloo_version.h %{_kf5_datadir}/dbus-1/interfaces/org.kde.baloo.*.xml - %changelog +* Sat Oct 03 2015 Rex Dieter - 5.14.0-2 +- index only well-known document-centric dirs by default (#1235026) +- .spec cosmetics +- polish licensing +- -devel: drop xapian dep + * Wed Sep 16 2015 Daniel Vrátil - 5.14.0-1 - KDE Frameworks 5.14.0