diff --git a/kdelibs.spec b/kdelibs.spec index 003a461..fdcff95 100644 --- a/kdelibs.spec +++ b/kdelibs.spec @@ -52,7 +52,7 @@ Summary: KDE Libraries # shipped with kde applications, version... %global apps_version 15.12.0 Version: 4.14.15 -Release: 1%{?dist} +Release: 2%{?dist} Name: kdelibs Epoch: 6 @@ -472,6 +472,10 @@ sed -i -e "s|@@VERSION_RELEASE@@|%{version}-%{release}|" kio/kio/kprotocolmanage %patch64 -p1 -b .invokeTerminal # upstream patches +%patch101 -p1 -b .0001 +%patch102 -p1 -b .0002 +%patch103 -p1 -b .0003 + %if 0%{?fedora} < 22 %patch090 -p1 -R -b .return-not-break.-copy-paste-error %patch091 -p1 -R -b .coding-style-fixes.patch @@ -839,6 +843,9 @@ update-mime-database %{?fedora:-n} %{_datadir}/mime &> /dev/null || : %changelog +* Sat Dec 19 2015 Rex Dieter - 6:4.14.15-2 +- actually apply those post-4.14.15 commits (kparts, python) + * Fri Dec 18 2015 Rex Dieter - 6:4.14.15-1 - 4.14.15 (kde apps 15.12.0) - include a few post-4.14.15 commits (kparts, python related)