diff --git a/.gitignore b/.gitignore index 3530410..1d5ede4 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1 @@ -/qtxmlpatterns-opensource-src-5.2.1.tar.xz -/qtxmlpatterns-opensource-src-5.3.0.tar.xz -/qtxmlpatterns-opensource-src-5.3.1.tar.xz +/qtxmlpatterns-opensource-src-5.3.2.tar.xz diff --git a/qt5-qtxmlpatterns.spec b/qt5-qtxmlpatterns.spec index 1472ca0..f104f2d 100644 --- a/qt5-qtxmlpatterns.spec +++ b/qt5-qtxmlpatterns.spec @@ -10,8 +10,13 @@ Summary: Qt5 - QtXmlPatterns component Name: qt5-%{qt_module} +<<<<<<< HEAD Version: 5.3.1 Release: 2%{?dist} +======= +Version: 5.3.2 +Release: 1%{?dist} +>>>>>>> el6 # See LGPL_EXCEPTIONS.txt, LICENSE.GPL3, respectively, for exception details License: LGPLv2 with exceptions or GPLv3 with exceptions @@ -134,6 +139,9 @@ popd %changelog +* Tue Sep 16 2014 Rex Dieter 5.3.2-1 +- 5.3.2 + * Sun Aug 17 2014 Fedora Release Engineering - 5.3.1-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild diff --git a/sources b/sources index 41b6e54..1a61ba9 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -d263163cc6e9ba7a4e8bd6c558f3ae42 qtxmlpatterns-opensource-src-5.3.1.tar.xz +857e8040b2bf45c114a7d75ec6ef94ee qtxmlpatterns-opensource-src-5.3.2.tar.xz