6:4.14.4-1

- 4.14.4 (with kde-applications-14.12.1) - +macros.kdelibs4 : includes %kde_applications_version, %kde_runtime_requires, %kdelibs_requires
2015-01-10 13:01:21 -06:00 · 2015-01-10 13:01:21 -06:00 · 28add374ce
parent dfe751c10c
commit 28add374ce
8 changed files with 40 additions and 586 deletions
--- a/.gitignore
+++ b/.gitignore
@ -1 +1 @@
-/kdelibs-4.14.3.tar.xz
+/kdelibs-4.14.4.tar.xz
--- a/0011-Fix-warning-No-such-signal-org-freedesktop-UPower-De.patch
+++ b/0011-Fix-warning-No-such-signal-org-freedesktop-UPower-De.patch
@ -1,57 +0,0 @@
-From 9f372807041ec73cfa69017edfdb739485867d26 Mon Sep 17 00:00:00 2001
-From: Milian Wolff <mail@milianw.de>
-Date: Fri, 14 Nov 2014 16:24:52 +0100
-Subject: [PATCH 11/23] Fix warning: No such signal
- org::freedesktop::UPower::Device...
-
-Backport of commit d5f6f40eb8b6a420520cb7c726959048593d2cab in
-the frameworks repository of solid.
-
-The signature change can be detected at runtime using Qt's QMetaObject
-introspection mechanism. That prevents us from emitting the two
-pesky warnings at runtime, polluting our konsoles.
-
-Google is full of that warning, and there is also:
-https://bugzilla.redhat.com/show_bug.cgi?id=1056769
-
-REVIEW: 121007
---
- solid/solid/backends/upower/upowermanager.cpp | 22 ++++++++++++----------
- 1 file changed, 12 insertions(+), 10 deletions(-)
-
-diff --git a/solid/solid/backends/upower/upowermanager.cpp b/solid/solid/backends/upower/upowermanager.cpp
-index 1bfd37a..5012f0b 100644
--- a/solid/solid/backends/upower/upowermanager.cpp
-+++ b/solid/solid/backends/upower/upowermanager.cpp
-@@ -64,16 +64,18 @@ UPowerManager::UPowerManager(QObject *parent)
-     }
- 
-     if (serviceFound) {
-        connect(&m_manager, SIGNAL(DeviceAdded(QString)),
-                this, SIGNAL(deviceAdded(QString)));
-        connect(&m_manager, SIGNAL(DeviceRemoved(QString)),
-                this, SIGNAL(deviceRemoved(QString)));
-
-        // for UPower >= 0.99.0, changed signature :o/
-        connect(&m_manager, SIGNAL(DeviceAdded(QDBusObjectPath)),
-                this, SLOT(onDeviceAdded(QDBusObjectPath)));
-        connect(&m_manager, SIGNAL(DeviceRemoved(QDBusObjectPath)),
-                this, SLOT(onDeviceRemoved(QDBusObjectPath)));
-+        if (m_manager.metaObject()->indexOfSignal("DeviceAdded(QDBusObjectPath)") != -1) {
-+            // for UPower >= 0.99.0, changed signature :o/
-+            connect(&m_manager, SIGNAL(DeviceAdded(QDBusObjectPath)),
-+                    this, SLOT(onDeviceAdded(QDBusObjectPath)));
-+            connect(&m_manager, SIGNAL(DeviceRemoved(QDBusObjectPath)),
-+                    this, SLOT(onDeviceRemoved(QDBusObjectPath)));
-+        } else {
-+            connect(&m_manager, SIGNAL(DeviceAdded(QString)),
-+                    this, SIGNAL(deviceAdded(QString)));
-+            connect(&m_manager, SIGNAL(DeviceRemoved(QString)),
-+                    this, SIGNAL(deviceRemoved(QString)));
-+        }
-     }
- }
- 
-- 
-1.9.3
-
--- a/0019-Define-_DEFAULT_SOURCE-together-with-_BSD_SOURCE.patch
+++ b/0019-Define-_DEFAULT_SOURCE-together-with-_BSD_SOURCE.patch
@ -1,48 +0,0 @@
-From 8510661e0b6e79085997c2c2dc6a406113dc61df Mon Sep 17 00:00:00 2001
-From: Milian Wolff <mail@milianw.de>
-Date: Mon, 17 Nov 2014 16:13:42 +0100
-Subject: [PATCH 19/23] Define _DEFAULT_SOURCE together with _BSD_SOURCE.
-
-This silences the following compile warnings with newer GNU libc:
-
-warning "_BSD_SOURCE and _SVID_SOURCE are deprecated, use _DEFAULT_SOURCE"
-
-REVIEW: 121147
---
- cmake/modules/FindKDE4Internal.cmake | 6 +++---
- 1 file changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/cmake/modules/FindKDE4Internal.cmake b/cmake/modules/FindKDE4Internal.cmake
-index 134d14f..a9aecfd 100644
--- a/cmake/modules/FindKDE4Internal.cmake
-+++ b/cmake/modules/FindKDE4Internal.cmake
-@@ -1099,7 +1099,7 @@ endif (APPLE)
- 
- if (CMAKE_SYSTEM_NAME MATCHES Linux OR CMAKE_SYSTEM_NAME STREQUAL GNU)
-    if (CMAKE_COMPILER_IS_GNUCXX OR "${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang")
-      set ( _KDE4_PLATFORM_DEFINITIONS -D_XOPEN_SOURCE=500 -D_BSD_SOURCE -D_GNU_SOURCE)
-+      set ( _KDE4_PLATFORM_DEFINITIONS -D_XOPEN_SOURCE=500 -D_DEFAULT_SOURCE -D_BSD_SOURCE -D_GNU_SOURCE)
-       set ( CMAKE_SHARED_LINKER_FLAGS "-Wl,--fatal-warnings -Wl,--no-undefined -lc ${CMAKE_SHARED_LINKER_FLAGS}")
-       set ( CMAKE_MODULE_LINKER_FLAGS "-Wl,--fatal-warnings -Wl,--no-undefined -lc ${CMAKE_MODULE_LINKER_FLAGS}")
- 
-@@ -1114,7 +1114,7 @@ if (CMAKE_SYSTEM_NAME MATCHES Linux OR CMAKE_SYSTEM_NAME STREQUAL GNU)
-       endif(CMAKE_BUILD_TYPE_TOLOWER MATCHES profile)
-    endif (CMAKE_COMPILER_IS_GNUCXX OR "${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang")
-    if (CMAKE_C_COMPILER MATCHES "icc")
-      set ( _KDE4_PLATFORM_DEFINITIONS -D_XOPEN_SOURCE=500 -D_BSD_SOURCE -D_GNU_SOURCE)
-+      set ( _KDE4_PLATFORM_DEFINITIONS -D_XOPEN_SOURCE=500 -D_DEFAULT_SOURCE -D_BSD_SOURCE -D_GNU_SOURCE)
-       set ( CMAKE_SHARED_LINKER_FLAGS "-Wl,--fatal-warnings -Wl,--no-undefined -lc ${CMAKE_SHARED_LINKER_FLAGS}")
-       set ( CMAKE_MODULE_LINKER_FLAGS "-Wl,--fatal-warnings -Wl,--no-undefined -lc ${CMAKE_MODULE_LINKER_FLAGS}")
-    endif (CMAKE_C_COMPILER MATCHES "icc")
-@@ -1218,7 +1218,7 @@ if (CMAKE_COMPILER_IS_GNUCXX)
-      # It is kept here nonetheless both for backwards compatibility in case one does not use add_definitions(${KDE4_DEFINITIONS})
-      # and also because it is/was needed by glibc for snprintf to be available when building C files.
-      # See commit 4a44862b2d178c1d2e1eb4da90010d19a1e4a42c.
-     add_definitions (-D_BSD_SOURCE)
-+     add_definitions (-D_DEFAULT_SOURCE -D_BSD_SOURCE)
-    endif (CMAKE_SYSTEM_NAME MATCHES Linux OR CMAKE_SYSTEM_NAME STREQUAL GNU)
- 
-    if (CMAKE_SYSTEM_NAME STREQUAL GNU)
-- 
-1.9.3
-
--- a/kdelibs-4.13.2-glibc_DEFAULT_SOURCE.patch
+++ b/kdelibs-4.13.2-glibc_DEFAULT_SOURCE.patch
@ -1,30 +0,0 @@
-diff -up kdelibs-4.13.2/cmake/modules/FindKDE4Internal.cmake._DEFAULT_SOURCE kdelibs-4.13.2/cmake/modules/FindKDE4Internal.cmake
--- kdelibs-4.13.2/cmake/modules/FindKDE4Internal.cmake._DEFAULT_SOURCE	2014-06-08 17:15:31.037189262 -0500
-+++ kdelibs-4.13.2/cmake/modules/FindKDE4Internal.cmake	2014-06-09 08:00:43.074844711 -0500
-@@ -1097,7 +1097,7 @@ endif (APPLE)
- 
- if (CMAKE_SYSTEM_NAME MATCHES Linux OR CMAKE_SYSTEM_NAME STREQUAL GNU)
-    if (CMAKE_COMPILER_IS_GNUCXX OR "${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang")
-      set ( _KDE4_PLATFORM_DEFINITIONS -D_XOPEN_SOURCE=500 -D_BSD_SOURCE -D_GNU_SOURCE)
-+      set ( _KDE4_PLATFORM_DEFINITIONS -D_XOPEN_SOURCE=500 -D_BSD_SOURCE -D_DEFAULT_SOURCE -D_GNU_SOURCE)
-       set ( CMAKE_SHARED_LINKER_FLAGS "-Wl,--fatal-warnings -Wl,--no-undefined -lc ${CMAKE_SHARED_LINKER_FLAGS}")
-       set ( CMAKE_MODULE_LINKER_FLAGS "-Wl,--fatal-warnings -Wl,--no-undefined -lc ${CMAKE_MODULE_LINKER_FLAGS}")
- 
-@@ -1112,7 +1112,7 @@ if (CMAKE_SYSTEM_NAME MATCHES Linux OR C
-       endif(CMAKE_BUILD_TYPE_TOLOWER MATCHES profile)
-    endif (CMAKE_COMPILER_IS_GNUCXX OR "${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang")
-    if (CMAKE_C_COMPILER MATCHES "icc")
-      set ( _KDE4_PLATFORM_DEFINITIONS -D_XOPEN_SOURCE=500 -D_BSD_SOURCE -D_GNU_SOURCE)
-+      set ( _KDE4_PLATFORM_DEFINITIONS -D_XOPEN_SOURCE=500 -D_BSD_SOURCE -D_DEFAULT_SOURCE -D_GNU_SOURCE)
-       set ( CMAKE_SHARED_LINKER_FLAGS "-Wl,--fatal-warnings -Wl,--no-undefined -lc ${CMAKE_SHARED_LINKER_FLAGS}")
-       set ( CMAKE_MODULE_LINKER_FLAGS "-Wl,--fatal-warnings -Wl,--no-undefined -lc ${CMAKE_MODULE_LINKER_FLAGS}")
-    endif (CMAKE_C_COMPILER MATCHES "icc")
-@@ -1216,7 +1216,7 @@ if (CMAKE_COMPILER_IS_GNUCXX)
-      # It is kept here nonetheless both for backwards compatibility in case one does not use add_definitions(${KDE4_DEFINITIONS})
-      # and also because it is/was needed by glibc for snprintf to be available when building C files.
-      # See commit 4a44862b2d178c1d2e1eb4da90010d19a1e4a42c.
-     add_definitions (-D_BSD_SOURCE)
-+     add_definitions (-D_BSD_SOURCE -D_DEFAULT_SOURCE)
-    endif (CMAKE_SYSTEM_NAME MATCHES Linux OR CMAKE_SYSTEM_NAME STREQUAL GNU)
- 
-    if (CMAKE_SYSTEM_NAME STREQUAL GNU)
--- a/kdelibs.spec
+++ b/kdelibs.spec
@ -35,13 +35,16 @@
 %global soprano_version %(pkg-config --modversion soprano 2>/dev/null || echo %{soprano_ver})
 %global strigi_version %(pkg-config --modversion libstreams 2>/dev/null || echo %{strigi_ver})
 %global dbusmenu_qt_version %(pkg-config --modversion dbusmenu-qt 2>/dev/null || echo %{dbusmenu_qt_ver})
+%global rpm_macros_dir %(d=%{_rpmconfigdir}/macros.d; [ -d $d ] || d=%{_sysconfdir}/rpm; echo $d)

 # trim changelog included in binary rpms
 %global _changelog_trimtime %(date +%s -d "1 year ago")

 Summary: KDE Libraries
-Version: 4.14.3
-Release: 8%{?dist}
+# shipped with kde applications, version...
+%global apps_version 14.12.1
+Version: 4.14.4
+Release: 1%{?dist}

 Name: kdelibs
 Epoch: 6
@ -58,7 +61,9 @@ URL:     http://www.kde.org/
 %else
 %global stable stable
 %endif
-Source0: http://download.kde.org/%{stable}/%{version}/src/kdelibs-%{version}.tar.xz
+Source0: http://download.kde.org/%{stable}/applications/%{apps_version}/src/kdelibs-%{version}.tar.xz
+
+Source1: macros.kdelibs4

 Source10: SOLID_HAL_LEGACY.sh

@ -142,10 +147,6 @@ Patch49: kdelibs-solid_qt_no_debug_output.patch
 # https://git.reviewboard.kde.org/r/102439/
 Patch50: kdelibs-4.7.0-knewstuff2_gpg2.patch

-# https://bugs.kde.org/show_bug.cgi?id=269045
-# https://git.reviewboard.kde.org/r/101231/
-Patch51: kill-references-to-old-uri-style-fake-mimetypes.patch
-
 # Toggle solid upnp support at runtime via env var SOLID_UPNP=1 (disabled by default)
 Patch52: kdelibs-4.10.0-SOLID_UPNP.patch

@ -184,8 +185,6 @@ Patch65: 0001-KRecursiveFilterProxyModel-Fixed-the-model.patch

 ## upstream
 # 4.14 branch
-Patch111: 0011-Fix-warning-No-such-signal-org-freedesktop-UPower-De.patch
-Patch119: 0019-Define-_DEFAULT_SOURCE-together-with-_BSD_SOURCE.patch

 # revert these commits for
 #https://bugs.kde.org/315578
@ -426,7 +425,6 @@ sed -i -e "s|@@VERSION_RELEASE@@|%{version}-%{release}|" kio/kio/kprotocolmanage

 # upstreamable patches
 %patch50 -p1 -b .knewstuff2_gpg2
-%patch51 -p1 -b .r101231
 %patch52 -p1 -b .SOLID_UPNP
 %patch53 -p1 -b .kjs-s390
 %patch54 -p1 -b .kjs-locale
@ -440,8 +438,6 @@ sed -i -e "s|@@VERSION_RELEASE@@|%{version}-%{release}|" kio/kio/kprotocolmanage
 %patch65 -p1 -b .KRecursiveFilterProxyModel

 # upstream patches
-%patch111 -p1 -b .0011
-%patch119 -p1 -b .0019

 %patch090 -p1 -R -b .return-not-break.-copy-paste-error
 %patch091 -p1 -R -b .coding-style-fixes.patch
@ -559,6 +555,17 @@ install -p -m644 -D %{SOURCE10} %{buildroot}/etc/kde/env/SOLID_HAL_LEGACY.sh
 # let's just simplify matters and make it unconditional
 rm -fv %{buildroot}%{_mandir}/man1/kdecmake.1*

+# rpm macros
+install -p -m644 -D %{SOURCE1} \
+  %{buildroot}%{rpm_macros_dir}/macros.pyqt5
+sed -i \
+  -e "s|@@NAME@@|%{name}|g" \
+  -e "s|@@EPOCH@@|%{?epoch}%{!?epoch:0}|g" \
+  -e "s|@@VERSION@@|%{version}|g" \
+  -e "s|@@EVR@@|%{?epoch:%{epoch:}}%{version}-%{release}|g" \
+  -e "s|@@KDE_APPLICATIONS_VERSION@@|%{apps_version}|g" \
+  %{buildroot}%{rpm_macros_dir}/macros.kdelibs4
+

 %check
 %if 0%{?tests}
@ -592,6 +599,7 @@ update-mime-database %{?fedora:-n} %{_datadir}/mime &> /dev/null || :
 %if 0%{?hal:1}
 /etc/kde/env/SOLID_HAL_LEGACY.sh
 %endif
+%{rpm_macros_dir}/macros.kdelibs4
 %{_kde4_bindir}/checkXML
 %{_kde4_bindir}/kbuildsycoca4
 %{_kde4_bindir}/kcookiejar4
@ -782,6 +790,10 @@ update-mime-database %{?fedora:-n} %{_datadir}/mime &> /dev/null || :


 %changelog
+* Sat Jan 10 2015 Rex Dieter <rdieter@fedoraproject.org> - 6:4.14.4-1
+- 4.14.4 (with kde-applications-14.12.1)
+- +macros.kdelibs4 : includes %%kde_applications_version, %%kde_runtime_requires, %%kdelibs_requires
+
 * Mon Dec 29 2014 Rex Dieter <rdieter@fedoraproject.org> 6:4.14.3-8
 - pull in candidate fix for "kde deamon crash on wakeup" (kde#288410)

--- a/kill-references-to-old-uri-style-fake-mimetypes.patch
+++ b/kill-references-to-old-uri-style-fake-mimetypes.patch
@ -1,437 +0,0 @@
-From e3af2cc22efb92e6317856664aadb56e57cc759a Mon Sep 17 00:00:00 2001
-From: Rex Dieter <rdieter@math.unl.edu>
-Date: Thu, 18 Dec 2014 07:58:43 -0600
-Subject: [PATCH] kill references to old uri/ style fake mimetypes
-
-BUG: 269045
-REVIEW: 101231
---
- kio/misc/mms.protocol   |   1 -
- kio/misc/mmst.protocol  |   1 -
- kio/misc/mmsu.protocol  |   1 -
- kio/misc/pnm.protocol   |   1 -
- kio/misc/rtspt.protocol |   1 -
- kio/misc/rtspu.protocol |   1 -
- mimetypes/kde.xml       | 344 ------------------------------------------------
- 7 files changed, 350 deletions(-)
-
-diff --git a/kio/misc/mms.protocol b/kio/misc/mms.protocol
-index ae9e1d9..0215402 100644
--- a/kio/misc/mms.protocol
-+++ b/kio/misc/mms.protocol
-@@ -1,7 +1,6 @@
- [Protocol]
- helper=true
- exec=
-defaultMimetype=uri/mms
- protocol=mms
- input=none
- output=none
-diff --git a/kio/misc/mmst.protocol b/kio/misc/mmst.protocol
-index 1f0f763..782864e 100644
--- a/kio/misc/mmst.protocol
-+++ b/kio/misc/mmst.protocol
-@@ -1,5 +1,4 @@
- [Protocol]
-defaultMimetype=uri/mmst
- exec=
- protocol=mmst
- input=none
-diff --git a/kio/misc/mmsu.protocol b/kio/misc/mmsu.protocol
-index deda935..7bf570b 100644
--- a/kio/misc/mmsu.protocol
-+++ b/kio/misc/mmsu.protocol
-@@ -1,5 +1,4 @@
- [Protocol]
-defaultMimetype=uri/mmsu
- exec=
- protocol=mmsu
- input=none
-diff --git a/kio/misc/pnm.protocol b/kio/misc/pnm.protocol
-index 3ca3a7d..c359642 100644
--- a/kio/misc/pnm.protocol
-+++ b/kio/misc/pnm.protocol
-@@ -1,5 +1,4 @@
- [Protocol]
-defaultMimetype=uri/pnm
- exec=
- protocol=pnm
- input=none
-diff --git a/kio/misc/rtspt.protocol b/kio/misc/rtspt.protocol
-index 9e4fe96..e808910 100644
--- a/kio/misc/rtspt.protocol
-+++ b/kio/misc/rtspt.protocol
-@@ -1,5 +1,4 @@
- [Protocol]
-defaultMimetype=uri/rtspt
- exec=
- protocol=rtspt
- input=none
-diff --git a/kio/misc/rtspu.protocol b/kio/misc/rtspu.protocol
-index 9cc9299..2c78181 100644
--- a/kio/misc/rtspu.protocol
-+++ b/kio/misc/rtspu.protocol
-@@ -1,5 +1,4 @@
- [Protocol]
-defaultMimetype=uri/rtspu
- exec=
- protocol=rtspu
- input=none
-diff --git a/mimetypes/kde.xml b/mimetypes/kde.xml
-index 9db3af0..d9255f1 100644
--- a/mimetypes/kde.xml
-+++ b/mimetypes/kde.xml
-@@ -1902,350 +1902,6 @@ Notes:
-     <comment xml:lang="zh_TW">所有檔案</comment>
-   </mime-type>
- 
-  <!-- uri/ fake mime types -->
-  <mime-type type="uri/mms">
-    <comment>mms: URIs</comment>
-    <comment xml:lang="ar">mms: وصلات</comment>
-    <comment xml:lang="ast">mms: URIs</comment>
-    <comment xml:lang="bs">MMS URI‑ji</comment>
-    <comment xml:lang="ca">mms: URI</comment>
-    <comment xml:lang="ca@valencia">mms: URI</comment>
-    <comment xml:lang="cs">mms: URI</comment>
-    <comment xml:lang="da">mms: URI'er</comment>
-    <comment xml:lang="de">mms: URIs</comment>
-    <comment xml:lang="el">mms: URIs</comment>
-    <comment xml:lang="en_GB">mms: URIs</comment>
-    <comment xml:lang="es">mms: URIs</comment>
-    <comment xml:lang="et">mms: URI-d</comment>
-    <comment xml:lang="eu">mms: URIak</comment>
-    <comment xml:lang="fi">mms: URI:t</comment>
-    <comment xml:lang="fr">mms : URIs</comment>
-    <comment xml:lang="ga">mms: URIanna</comment>
-    <comment xml:lang="gl">mms: Lista de URI</comment>
-    <comment xml:lang="hr">mms: URI-ovi</comment>
-    <comment xml:lang="hu">mms: URI-k</comment>
-    <comment xml:lang="ia">mms: URIs</comment>
-    <comment xml:lang="is">mms: slóðir</comment>
-    <comment xml:lang="it">mms: URI</comment>
-    <comment xml:lang="ja">mms: URIs</comment>
-    <comment xml:lang="kk">mms: URI-лері</comment>
-    <comment xml:lang="km">mms: URIs</comment>
-    <comment xml:lang="ko">mms: URI</comment>
-    <comment xml:lang="lt">mms: URI</comment>
-    <comment xml:lang="lv">mms: URIs</comment>
-    <comment xml:lang="ml">mms: URIs</comment>
-    <comment xml:lang="mr">mms: URIs</comment>
-    <comment xml:lang="nb">mms: URI-er</comment>
-    <comment xml:lang="nds">MMS: URIs</comment>
-    <comment xml:lang="nl">mms: URI's</comment>
-    <comment xml:lang="nn">mms:-adresser</comment>
-    <comment xml:lang="pa">mms: URI</comment>
-    <comment xml:lang="pl">mms: adresy URI</comment>
-    <comment xml:lang="pt">URI's 'mms:'</comment>
-    <comment xml:lang="pt_BR">URIs mms:</comment>
-    <comment xml:lang="ro">URI-uri mms:</comment>
-    <comment xml:lang="ru">расположения ресурсов MMS</comment>
-    <comment xml:lang="se">mms:-čujuhusat</comment>
-    <comment xml:lang="sk">mms: adresy URI</comment>
-    <comment xml:lang="sl">URI-ji za mms:</comment>
-    <comment xml:lang="sq">mms: URIs</comment>
-    <comment xml:lang="sr">ММС УРИ‑ји</comment>
-    <comment xml:lang="sr@ijekavian">ММС УРИ‑ји</comment>
-    <comment xml:lang="sr@ijekavianlatin">MMS URI‑ji</comment>
-    <comment xml:lang="sr@latin">MMS URI‑ji</comment>
-    <comment xml:lang="sv">mms: webbadresser</comment>
-    <comment xml:lang="tr">mms: Adresleri</comment>
-    <comment xml:lang="ug">mms: ئادرېسلار</comment>
-    <comment xml:lang="uk">mms: адреси</comment>
-    <comment xml:lang="zh_CN">mms: 地址</comment>
-    <comment xml:lang="zh_TW">mms: 網址</comment>
-  </mime-type>
-  <mime-type type="uri/mmst">
-    <comment>mmst: URIs</comment>
-    <comment xml:lang="ar">mmst: وصلات</comment>
-    <comment xml:lang="ast">mmst: URIs</comment>
-    <comment xml:lang="bs">MMST URI‑ji</comment>
-    <comment xml:lang="ca">mmst: URI</comment>
-    <comment xml:lang="ca@valencia">mmst: URI</comment>
-    <comment xml:lang="cs">mmst: URI</comment>
-    <comment xml:lang="da">mmst: URI'er</comment>
-    <comment xml:lang="de">mmst: URIs</comment>
-    <comment xml:lang="el">mmst: URIs</comment>
-    <comment xml:lang="en_GB">mmst: URIs</comment>
-    <comment xml:lang="es">mmst: URIs</comment>
-    <comment xml:lang="et">mmst: URI-d</comment>
-    <comment xml:lang="eu">mmst: URIak</comment>
-    <comment xml:lang="fi">mmst: URI:t</comment>
-    <comment xml:lang="fr">mmst : URIs</comment>
-    <comment xml:lang="ga">mmst: URIanna</comment>
-    <comment xml:lang="gl">mmst: Lista de URI</comment>
-    <comment xml:lang="hr">mmst: URI-ovi</comment>
-    <comment xml:lang="hu">mmst: URI-k</comment>
-    <comment xml:lang="ia">mmst: URIs</comment>
-    <comment xml:lang="is">mmst: slóðir</comment>
-    <comment xml:lang="it">mmst: URI</comment>
-    <comment xml:lang="ja">mmst: URIs</comment>
-    <comment xml:lang="kk">mmst: URI-лері</comment>
-    <comment xml:lang="km">mmst: URIs</comment>
-    <comment xml:lang="ko">mmst: URI</comment>
-    <comment xml:lang="lt">mmst: URI</comment>
-    <comment xml:lang="lv">mmst: URIs</comment>
-    <comment xml:lang="ml">mmst: URIs</comment>
-    <comment xml:lang="mr">mmst: URIs</comment>
-    <comment xml:lang="nb">mmst: URI-er</comment>
-    <comment xml:lang="nds">MMST: URIs</comment>
-    <comment xml:lang="nl">mmst: URI's</comment>
-    <comment xml:lang="nn">mmst:-adresser</comment>
-    <comment xml:lang="pa">mmst: URI</comment>
-    <comment xml:lang="pl">mmst: adresy URI</comment>
-    <comment xml:lang="pt">URI's 'mmst:'</comment>
-    <comment xml:lang="pt_BR">URIs mmst:</comment>
-    <comment xml:lang="ro">URI-uri mmst:</comment>
-    <comment xml:lang="ru">расположения ресурсов MMST</comment>
-    <comment xml:lang="se">mmst:-čujuhusat</comment>
-    <comment xml:lang="sk">mmst: adresy URI</comment>
-    <comment xml:lang="sl">URI-ji za mmst:</comment>
-    <comment xml:lang="sq">mmst: URIs</comment>
-    <comment xml:lang="sr">ММСТ УРИ‑ји</comment>
-    <comment xml:lang="sr@ijekavian">ММСТ УРИ‑ји</comment>
-    <comment xml:lang="sr@ijekavianlatin">MMST URI‑ji</comment>
-    <comment xml:lang="sr@latin">MMST URI‑ji</comment>
-    <comment xml:lang="sv">mmst: webbadresser</comment>
-    <comment xml:lang="tr">mmst: Adresleri</comment>
-    <comment xml:lang="ug">mmst: ئادرېسلار</comment>
-    <comment xml:lang="uk">mmst: адреси</comment>
-    <comment xml:lang="zh_CN">mmst: 地址</comment>
-    <comment xml:lang="zh_TW">mmst: 網址</comment>
-  </mime-type>
-  <mime-type type="uri/mmsu">
-    <comment>mmsu: URIs</comment>
-    <comment xml:lang="ar">mmsu: وصلات</comment>
-    <comment xml:lang="ast">mmsu: URIs</comment>
-    <comment xml:lang="bs">MMSU URI‑ji</comment>
-    <comment xml:lang="ca">mmsu: URI</comment>
-    <comment xml:lang="ca@valencia">mmsu: URI</comment>
-    <comment xml:lang="cs">mmsu: URI</comment>
-    <comment xml:lang="da">mmsu: URI'er</comment>
-    <comment xml:lang="de">mmsu: URIs</comment>
-    <comment xml:lang="el">mmsu: URIs</comment>
-    <comment xml:lang="en_GB">mmsu: URIs</comment>
-    <comment xml:lang="es">mmsu: URIs</comment>
-    <comment xml:lang="et">mmsu: URI-d</comment>
-    <comment xml:lang="eu">mmsu: URIak</comment>
-    <comment xml:lang="fi">mmsu: URI:t</comment>
-    <comment xml:lang="fr">mmsu : URIs</comment>
-    <comment xml:lang="ga">mmsu: URIanna</comment>
-    <comment xml:lang="gl">mmsu: Lista de URI</comment>
-    <comment xml:lang="hr">mmsu: URI-ovi</comment>
-    <comment xml:lang="hu">mmsu: URI-k</comment>
-    <comment xml:lang="ia">mmsu: URIs</comment>
-    <comment xml:lang="is">mmsu: slóðir</comment>
-    <comment xml:lang="it">mmsu: URI</comment>
-    <comment xml:lang="ja">mmsu: URIs</comment>
-    <comment xml:lang="kk">mmsu: URIs</comment>
-    <comment xml:lang="km">mmsu: URIs</comment>
-    <comment xml:lang="ko">mmsu: URI</comment>
-    <comment xml:lang="lt">mmsu: URI</comment>
-    <comment xml:lang="lv">mmsu: URIs</comment>
-    <comment xml:lang="ml">mmsu: URIs</comment>
-    <comment xml:lang="mr">mmsu: URIs</comment>
-    <comment xml:lang="nb">mmsu: URI-er</comment>
-    <comment xml:lang="nds">MMSU: URIs</comment>
-    <comment xml:lang="nl">mmsu: URI's</comment>
-    <comment xml:lang="nn">mmsu:-adresser</comment>
-    <comment xml:lang="pa">mmsu: URI</comment>
-    <comment xml:lang="pl">mmsu: adresy URI</comment>
-    <comment xml:lang="pt">URI's 'mmsu:'</comment>
-    <comment xml:lang="pt_BR">URIs mmsu:</comment>
-    <comment xml:lang="ro">URI-uri mmsu:</comment>
-    <comment xml:lang="ru">расположения ресурсов MMSU</comment>
-    <comment xml:lang="se">mmsu:-čujuhusat</comment>
-    <comment xml:lang="sk">mmsu: adresy URI</comment>
-    <comment xml:lang="sl">URI-ji za mmsu:</comment>
-    <comment xml:lang="sq">mmsu: URIs</comment>
-    <comment xml:lang="sr">ММСУ УРИ‑ји</comment>
-    <comment xml:lang="sr@ijekavian">ММСУ УРИ‑ји</comment>
-    <comment xml:lang="sr@ijekavianlatin">MMSU URI‑ji</comment>
-    <comment xml:lang="sr@latin">MMSU URI‑ji</comment>
-    <comment xml:lang="sv">mmsu: webbadresser</comment>
-    <comment xml:lang="tr">mmsu: Adresleri</comment>
-    <comment xml:lang="ug">mmsu: ئادرېسلار</comment>
-    <comment xml:lang="uk">mmsu: адреси</comment>
-    <comment xml:lang="zh_CN">mmsu: 地址</comment>
-    <comment xml:lang="zh_TW">mmsu: 網址</comment>
-  </mime-type>
-  <mime-type type="uri/pnm">
-    <comment>pnm: URIs</comment>
-    <comment xml:lang="ar">pnm: وصلات</comment>
-    <comment xml:lang="ast">pnm: URIs</comment>
-    <comment xml:lang="bs">PNM URI‑ji</comment>
-    <comment xml:lang="ca">pnm: URI</comment>
-    <comment xml:lang="ca@valencia">pnm: URI</comment>
-    <comment xml:lang="cs">pnm: URI</comment>
-    <comment xml:lang="da">pnm: URI'er</comment>
-    <comment xml:lang="de">pnm: URIs</comment>
-    <comment xml:lang="el">pnm: URIs</comment>
-    <comment xml:lang="en_GB">pnm: URIs</comment>
-    <comment xml:lang="es">pnm: URIs</comment>
-    <comment xml:lang="et">pnm: URI-d</comment>
-    <comment xml:lang="eu">pnm: URIak</comment>
-    <comment xml:lang="fi">pnm: URI:t</comment>
-    <comment xml:lang="fr">pnm : URIs</comment>
-    <comment xml:lang="ga">pnm: URIanna</comment>
-    <comment xml:lang="gl">pnm: Lista de URI</comment>
-    <comment xml:lang="hr">pnm: URI-ovi</comment>
-    <comment xml:lang="hu">pnm: URI-k</comment>
-    <comment xml:lang="ia">pnm: URIs</comment>
-    <comment xml:lang="is">pnm: slóðir</comment>
-    <comment xml:lang="it">pnm: URI</comment>
-    <comment xml:lang="ja">pnm: URIs</comment>
-    <comment xml:lang="kk">pnm: URI-лері</comment>
-    <comment xml:lang="km">pnm: URIs</comment>
-    <comment xml:lang="ko">pnm: URI</comment>
-    <comment xml:lang="lt">pnm: URI</comment>
-    <comment xml:lang="lv">pnm: URIs</comment>
-    <comment xml:lang="ml">pnm: URIs</comment>
-    <comment xml:lang="mr">pnm: URIs</comment>
-    <comment xml:lang="nb">pnm: URI-er</comment>
-    <comment xml:lang="nds">PNM: URIs</comment>
-    <comment xml:lang="nl">pnm: URI-adressen</comment>
-    <comment xml:lang="nn">pnm:-adresser</comment>
-    <comment xml:lang="pa">pnm: URI</comment>
-    <comment xml:lang="pl">pnm: adresy URI</comment>
-    <comment xml:lang="pt">URI's 'pnm:'</comment>
-    <comment xml:lang="pt_BR">URIs pnm:</comment>
-    <comment xml:lang="ro">URI-uri pnm:</comment>
-    <comment xml:lang="ru">расположения ресурсов PNM</comment>
-    <comment xml:lang="se">pnm:-čujuhusat</comment>
-    <comment xml:lang="sk">pnm: adresy URI</comment>
-    <comment xml:lang="sl">URI-ji za pnm:</comment>
-    <comment xml:lang="sq">pnm: URIs</comment>
-    <comment xml:lang="sr">ПНМ УРИ‑ји</comment>
-    <comment xml:lang="sr@ijekavian">ПНМ УРИ‑ји</comment>
-    <comment xml:lang="sr@ijekavianlatin">PNM URI‑ji</comment>
-    <comment xml:lang="sr@latin">PNM URI‑ji</comment>
-    <comment xml:lang="sv">pnm: webbadresser</comment>
-    <comment xml:lang="tr">pnm: Adresleri</comment>
-    <comment xml:lang="ug">pnm: ئادرېسلار</comment>
-    <comment xml:lang="uk">pnm: адреси</comment>
-    <comment xml:lang="zh_CN">pnm: 地址</comment>
-    <comment xml:lang="zh_TW">pnm: 網址</comment>
-  </mime-type>
-  <mime-type type="uri/rtspt">
-    <comment>rtspt: URIs</comment>
-    <comment xml:lang="ar">rtspt: وصلات</comment>
-    <comment xml:lang="ast">rtspt: URIs</comment>
-    <comment xml:lang="bs">RTSPT URI‑ji</comment>
-    <comment xml:lang="ca">rtspt: URI</comment>
-    <comment xml:lang="ca@valencia">rtspt: URI</comment>
-    <comment xml:lang="cs">rtspt: URIs</comment>
-    <comment xml:lang="da">rtspt: URI'er</comment>
-    <comment xml:lang="de">rtspt: URIs</comment>
-    <comment xml:lang="el">rtspt: URIs</comment>
-    <comment xml:lang="en_GB">rtspt: URIs</comment>
-    <comment xml:lang="es">rtspt: URIs</comment>
-    <comment xml:lang="et">rtspt: URI-d</comment>
-    <comment xml:lang="eu">rtspt: URIak</comment>
-    <comment xml:lang="fi">rtspt: URI:t</comment>
-    <comment xml:lang="fr">rtspt : URIs</comment>
-    <comment xml:lang="ga">rtspt: URIanna</comment>
-    <comment xml:lang="gl">rtspt: Lista de URI</comment>
-    <comment xml:lang="hr">rtspt: URI-ovi</comment>
-    <comment xml:lang="hu">rtspt: URI-k</comment>
-    <comment xml:lang="ia">rtsp: URIs</comment>
-    <comment xml:lang="is">rtspt: slóðir</comment>
-    <comment xml:lang="it">rtspt: URI</comment>
-    <comment xml:lang="ja">rtspt: URIs</comment>
-    <comment xml:lang="kk">rtspt: URI-лері</comment>
-    <comment xml:lang="km">rtspt: URIs</comment>
-    <comment xml:lang="ko">rtspt: URI</comment>
-    <comment xml:lang="lt">rtspt: URI</comment>
-    <comment xml:lang="lv">rtspt: URIs</comment>
-    <comment xml:lang="ml">rtspt: URIs</comment>
-    <comment xml:lang="mr">rtspt: URIs</comment>
-    <comment xml:lang="nb">rtspt: URI-er</comment>
-    <comment xml:lang="nds">RTSPT: URIs</comment>
-    <comment xml:lang="nl">rtspt: URI-adressen</comment>
-    <comment xml:lang="nn">rtspt:-adresser</comment>
-    <comment xml:lang="pa">rtspt: URI</comment>
-    <comment xml:lang="pl">rtspt: adresy URI</comment>
-    <comment xml:lang="pt">URI's 'rtspt:'</comment>
-    <comment xml:lang="pt_BR">URIs rtspt:</comment>
-    <comment xml:lang="ro">URI-uri rtspt:</comment>
-    <comment xml:lang="ru">расположения ресурсов RTSPT</comment>
-    <comment xml:lang="se">rtspt:-čujuhusat</comment>
-    <comment xml:lang="sk">rtspt: adresy URI</comment>
-    <comment xml:lang="sl">URI-ji za rtspt:</comment>
-    <comment xml:lang="sq">rtspt: URIs</comment>
-    <comment xml:lang="sr">РТСПТ УРИ‑ји</comment>
-    <comment xml:lang="sr@ijekavian">РТСПТ УРИ‑ји</comment>
-    <comment xml:lang="sr@ijekavianlatin">RTSPT URI‑ji</comment>
-    <comment xml:lang="sr@latin">RTSPT URI‑ji</comment>
-    <comment xml:lang="sv">rtspt: webbadresser</comment>
-    <comment xml:lang="tr">rtspt: Adresleri</comment>
-    <comment xml:lang="ug">rtspt: ئادرېسلار</comment>
-    <comment xml:lang="uk">rtspt: адреси</comment>
-    <comment xml:lang="zh_CN">rtspt: 地址</comment>
-    <comment xml:lang="zh_TW">rtspt: 網址</comment>
-  </mime-type>
-  <mime-type type="uri/rtspu">
-    <comment>rtspu: URIs</comment>
-    <comment xml:lang="ar">rtspu: وصلات</comment>
-    <comment xml:lang="ast">rtspu: URIs</comment>
-    <comment xml:lang="bs">RTSPU URI‑ji</comment>
-    <comment xml:lang="ca">rtspu: URI</comment>
-    <comment xml:lang="ca@valencia">rtspu: URI</comment>
-    <comment xml:lang="cs">rtspu: URI</comment>
-    <comment xml:lang="da">rtspu: URI'er</comment>
-    <comment xml:lang="de">rtspu: URIs</comment>
-    <comment xml:lang="el">rtspu: URIs</comment>
-    <comment xml:lang="en_GB">rtspu: URIs</comment>
-    <comment xml:lang="es">rtspu: URIs</comment>
-    <comment xml:lang="et">rtspu: URI-d</comment>
-    <comment xml:lang="eu">rtspu: URIak</comment>
-    <comment xml:lang="fi">rtspu: URI:t</comment>
-    <comment xml:lang="fr">rtspu : URIs</comment>
-    <comment xml:lang="ga">rtspu: URIanna</comment>
-    <comment xml:lang="gl">rtspu: Lista de URI</comment>
-    <comment xml:lang="hr">rtspu: URI-ovi</comment>
-    <comment xml:lang="hu">rtspu: URI-k</comment>
-    <comment xml:lang="ia">rtspu: URIs</comment>
-    <comment xml:lang="is">rtspu: slóðir</comment>
-    <comment xml:lang="it">rtspu: URI</comment>
-    <comment xml:lang="ja">rtspu: URIs</comment>
-    <comment xml:lang="kk">rtspu: URI-лері</comment>
-    <comment xml:lang="km">rtspu: URIs</comment>
-    <comment xml:lang="ko">rtspu: URI</comment>
-    <comment xml:lang="lt">rtspu: URI</comment>
-    <comment xml:lang="lv">rtspu: URIs</comment>
-    <comment xml:lang="ml">rtspu: URIs</comment>
-    <comment xml:lang="mr">rtspu: URIs</comment>
-    <comment xml:lang="nb">rtspu: URI-er</comment>
-    <comment xml:lang="nds">RTSPU: URIs</comment>
-    <comment xml:lang="nl">rtspu: URI-adressen</comment>
-    <comment xml:lang="nn">rtspu:-adresser</comment>
-    <comment xml:lang="pa">rtspu: URI</comment>
-    <comment xml:lang="pl">rtspu: adresy URI</comment>
-    <comment xml:lang="pt">URI's 'rtspu:'</comment>
-    <comment xml:lang="pt_BR">URIs rtspu:</comment>
-    <comment xml:lang="ro">URI-uri rtspu:</comment>
-    <comment xml:lang="ru">расположения ресурсов RTSPU</comment>
-    <comment xml:lang="se">rpspu:-čujuhusat</comment>
-    <comment xml:lang="sk">rtspu: adresy URI</comment>
-    <comment xml:lang="sl">URI-ji za rtspu:</comment>
-    <comment xml:lang="sq">rtspu: URIs</comment>
-    <comment xml:lang="sr">РТСПУ УРИ‑ји</comment>
-    <comment xml:lang="sr@ijekavian">РТСПУ УРИ‑ји</comment>
-    <comment xml:lang="sr@ijekavianlatin">RTSPU URI‑ji</comment>
-    <comment xml:lang="sr@latin">RTSPU URI‑ji</comment>
-    <comment xml:lang="sv">rtspu: webbadresser</comment>
-    <comment xml:lang="tr">rtspu: Adresleri</comment>
-    <comment xml:lang="ug">rtspu: ئادرېسلار</comment>
-    <comment xml:lang="uk">rtspu: адреси</comment>
-    <comment xml:lang="zh_CN">rtspu: 地址</comment>
-    <comment xml:lang="zh_TW">rtspu: 網址</comment>
-  </mime-type>
-
-   <mime-type type="application/vnd.kde.fontspackage">
-     <sub-class-of type="application/zip"/>
-     <comment>fonts package</comment>
-- 
-1.9.3
-
--- a/macros.kdelibs4
+++ b/macros.kdelibs4
@ -0,0 +1,14 @@
+%kdelibs4 @@NAME@@
+%kdelibs4_epoch @@EPOCH@@
+%kdelibs4_version @@VERSION@@
+%kdelibs4_evr @@EVR@@
+
+%kdelibs4_requires \
+Requires: kdelibs4%{?_isa} >= %{kdelibs4_version} \
+%{nil}
+
+%kde_applications_version @@KDE_APPLICATIONS_VERSION@@
+
+%kde_runtime_requires \
+Requires: kde-runtime >= %{kde_applications_version} \
+%{nil}
--- a/2
+++ b/2
@ -1 +1 @@
-ac0e44b2a6a138df56a501581e537615  kdelibs-4.14.3.tar.xz
+b83f3b9639c057e264bd65ce733fbaa8  kdelibs-4.14.4.tar.xz