rpms/qt5-qtxmlpatterns
6
0
Fork 0
Code Issues Pull Requests Releases Activity

Merge branch 'el6'

Browse Source 
Conflicts:
	qt5-qtxmlpatterns.spec
This commit is contained in:
Rex Dieter 2014-09-16 12:29:11 -05:00
commit df82222ccc
3 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
.gitignore vendored
View File

@ -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

8
qt5-qtxmlpatterns.spec
View File

@ -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 <rdieter@fedoraproject.org> 5.3.2-1
- 5.3.2
* Sun Aug 17 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 5.3.1-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild

2
sources
View File

@ -1 +1 @@
d263163cc6e9ba7a4e8bd6c558f3ae42 qtxmlpatterns-opensource-src-5.3.1.tar.xz
857e8040b2bf45c114a7d75ec6ef94ee qtxmlpatterns-opensource-src-5.3.2.tar.xz