Merge branch 'master' into f21

2014-09-15 09:18:51 -05:00 · 2014-09-15 09:18:51 -05:00 · b734e8a845
parent 4489cb1d5f 015ad65e30
commit b734e8a845
3 changed files with 7 additions and 3 deletions
--- a/.gitignore
+++ b/.gitignore
@ -1,2 +1,3 @@
 /kdelibs-4.13.97.tar.xz
 /kdelibs-4.14.0.tar.xz
+/kdelibs-4.14.1.tar.xz
--- a/kdelibs.spec
+++ b/kdelibs.spec
@ -38,8 +38,8 @@
 %global _changelog_trimtime %(date +%s -d "1 year ago")

 Summary: KDE Libraries
-Version: 4.14.0
-Release: 2%{?dist}
+Version: 4.14.1
+Release: 1%{?dist}

 Name: kdelibs
 Epoch: 6
@ -725,6 +725,9 @@ update-mime-database %{?fedora:-n} %{_datadir}/mime &> /dev/null || :


 %changelog
+* Mon Sep 15 2014 Rex Dieter <rdieter@fedoraproject.org> - 6:4.14.1-1
+- 4.14.1
+
 * Sat Aug 16 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 6:4.14.0-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild

--- a/2
+++ b/2
@ -1 +1 @@
-f246fc5485b085b36843e954b5b56922  kdelibs-4.14.0.tar.xz
+678acc5880ba5da96ae66d383e19a52b  kdelibs-4.14.1.tar.xz