6:4.14.12-1

- 4.14.12 (KDE Applications 15.08.1)
- kde-apps-rpm-macros subpkg
- apply icon-related reverts for < f22 only

.gitignore

@@ -1,3 +1 @@
-/kdelibs-4.14.9.tar.xz
+/kdelibs-4.14.12.tar.xz
-/kdelibs-4.14.10.tar.xz
-/kdelibs-4.14.11.tar.xz

kdelibs.spec

@@ -50,8 +50,8 @@
 
 Summary: KDE Libraries
 # shipped with kde applications, version...
-%global apps_version 15.08.0
+%global apps_version 15.08.1
-Version: 4.14.11
+Version: 4.14.12
 Release: 1%{?dist}
 
 Name: kdelibs
@@ -307,6 +307,8 @@ Provides: kdelibs-experimental = %{version}-%{release}
 Obsoletes: kdelibs-experimental < 4.3.75
 %endif
 
+Requires: kde-apps-rpm-macros = %{?epoch:%{epoch}:}%{version}-%{release}
+
 %description
 Libraries for KDE 4.
 
@@ -380,6 +382,12 @@ Requires: kate4-part%{?_isa}
 %description ktexteditor
 %{summary}
 
+%package -n kde-apps-rpm-macros
+Summary: RPM macros for kdelibs and kde-applications
+BuildArch: noarch
+%description -n kde-apps-rpm-macros
+%{summary}
+
 %package webkit
 Summary: KDE WebKit support library
 # upgrade path, when -webkit subpkg landed
@@ -463,10 +471,11 @@ sed -i -e "s|@@VERSION_RELEASE@@|%{version}-%{release}|" kio/kio/kprotocolmanage
 %patch64 -p1 -b .invokeTerminal
 
 # upstream patches
-
+%if 0%{?fedora} < 22
 %patch090 -p1 -R -b .return-not-break.-copy-paste-error
 %patch091 -p1 -R -b .coding-style-fixes.patch
 %patch092 -p1 -R -b .return-application-icons-properly
+%endif
 %if 0%{?plasma_packagekit}
 %patch093 -p1 -R -b .turn-the-packagekit-support-feature-off-by-default
 %endif
@@ -587,14 +596,14 @@ rm -fv %{buildroot}%{_mandir}/man1/kdecmake.1*
 
 # rpm macros
 install -p -m644 -D %{SOURCE1} \
-  %{buildroot}%{rpm_macros_dir}/macros.kdelibs4
+  %{buildroot}%{rpm_macros_dir}/macros.kde-apps
 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|@@EVR@@|%{?epoch:%{epoch}:}%{version}-%{release}|g" \
   -e "s|@@KDE_APPLICATIONS_VERSION@@|%{apps_version}|g" \
-  %{buildroot}%{rpm_macros_dir}/macros.kdelibs4
+  %{buildroot}%{rpm_macros_dir}/macros.kde-apps
 
 
 %check
@@ -629,7 +638,6 @@ 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
@@ -815,6 +823,9 @@ update-mime-database %{?fedora:-n} %{_datadir}/mime &> /dev/null || :
 %files ktexteditor
 %{_kde4_libdir}/libktexteditor.so.4*
 
+%files -n kde-apps-rpm-macros
+%{rpm_macros_dir}/macros.kde-apps
+
 %if 0%{?apidocs}
 %files apidocs
 %{_kde4_docdir}/HTML/en/kdelibs4-apidocs/
@@ -827,6 +838,11 @@ update-mime-database %{?fedora:-n} %{_datadir}/mime &> /dev/null || :
 
 
 %changelog
+* Sat Sep 12 2015 Rex Dieter <rdieter@fedoraproject.org> - 6:4.14.12-1
+- 4.14.12 (KDE Applications 15.08.1)
+- kde-apps-rpm-macros subpkg (usable without kdelibs)
+- apply icon-related reverts for < f22 only
+
 * Mon Aug 24 2015 Daniel Vrátil <dvratil@redhat.com> 6:4.14.11-1
 - 4.14.11 (KDE Applications 15.08.0)
 

sources

@@ -1 +1 @@
-129cf1dd7bc8f241e65f9b9466df8cdc  kdelibs-4.14.11.tar.xz
+82efb9842d56164ae1a1626b432b6364  kdelibs-4.14.12.tar.xz