diff --git a/.gitignore b/.gitignore index ca35773..94ac023 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -/kdelibs-4.14.24.tar.xz +/kdelibs-4.14.25.tar.xz diff --git a/kdelibs-strigi_optional.patch b/kdelibs-strigi_optional.patch deleted file mode 100644 index fcf5a27..0000000 --- a/kdelibs-strigi_optional.patch +++ /dev/null @@ -1,30 +0,0 @@ -diff -up kdelibs-4.14.19/CMakeLists.txt.strigi_optional kdelibs-4.14.19/CMakeLists.txt ---- kdelibs-4.14.19/CMakeLists.txt.strigi_optional 2016-04-13 15:10:50.000000000 -0500 -+++ kdelibs-4.14.19/CMakeLists.txt 2016-05-06 12:47:17.709456787 -0500 -@@ -82,17 +82,17 @@ set_package_properties(ZLIB PROPERTIES D - ) - - find_package(Strigi 0.6.3) --if (WIN32) -- set (STRIGI_TYPE "OPTIONAL") -- set (STRIGI_EXTRA_TEXT "") --else (WIN32) -- set (STRIGI_TYPE "REQUIRED") -- set (STRIGI_EXTRA_TEXT "Required by some critical kioslaves") --endif (WIN32) -+#if (WIN32) -+# set (STRIGI_TYPE "OPTIONAL") -+# set (STRIGI_EXTRA_TEXT "") -+#else (WIN32) -+# set (STRIGI_TYPE "REQUIRED") -+# set (STRIGI_EXTRA_TEXT "Required by some critical kioslaves") -+#endif (WIN32) - set_package_properties(Strigi PROPERTIES DESCRIPTION "Desktop indexing and search support" - URL "http://strigi.sourceforge.net" -- TYPE ${STRIGI_TYPE} -- PURPOSE ${STRIGI_EXTRA_TEXT} -+ TYPE OPTIONAL -+ PURPOSE "Required by some kioslaves for metadata support" - ) - - find_package(LibAttica 0.4.2) diff --git a/kdelibs.spec b/kdelibs.spec index 141ef75..28a73f6 100644 --- a/kdelibs.spec +++ b/kdelibs.spec @@ -49,8 +49,8 @@ Summary: KDE Libraries # shipped with kde applications, version... -%global apps_version 16.08.1 -Version: 4.14.24 +%global apps_version 16.08.2 +Version: 4.14.25 Release: 1%{?dist} Name: kdelibs @@ -178,10 +178,6 @@ Patch55: Drop-Nepomuk-from-KParts-LINK_INTERFACE_LIBRARIES.patch # https://bugs.kde.org/show_bug.cgi?id=288410 Patch56: kdelibs-kdebug288410.patch -# make strigi dep optional -# see also http://reviewboard.kde.org/r/127823 -Patch57: kdelibs-strigi_optional.patch - # make filter working, TODO: upstream? -- rex Patch59: kdelibs-4.9.3-kcm_ssl.patch @@ -481,7 +477,6 @@ sed -i -e "s|@@VERSION_RELEASE@@|%{version}-%{release}|" kio/kio/kprotocolmanage %patch54 -p1 -b .kjs-locale %patch55 -p1 -b .Drop-Nepomuk-from-KParts-LINK_INTERFACE_LIBRARIES %patch56 -p1 -b .kdebug288410 -%patch57 -p1 -b .strigi_optional %patch59 -p1 -b .filter %patch61 -p1 -b .dot %patch62 -p1 -b .arm-plasma @@ -872,6 +867,9 @@ update-mime-database %{?fedora:-n} %{_datadir}/mime &> /dev/null || : %changelog +* Sun Oct 16 2016 Rex Dieter - 6:4.14.25-1 +- 4.14.25 (kde-apps-16.08.2) + * Tue Sep 06 2016 Rex Dieter - 6:4.14.24-1 - 4.14.24 (kde-apps-16.08.1) diff --git a/sources b/sources index 1270edb..6f36813 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -5bbe1873dd9ff892a3f1101f02e04718 kdelibs-4.14.24.tar.xz +bdfc8b5f89be3bfddde957c58cd79a9f kdelibs-4.14.25.tar.xz