rdieter pushed to qt5-qtdeclarative (el6). "Merge branch 'f22' into f21"

notifications at fedoraproject.org notifications at fedoraproject.org
Fri Apr 10 18:15:24 UTC 2015


>From 0bfbc7dbaac849976cb5db98f76f833628f36a96 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ville=20Skytt=C3=A4?= <ville.skytta at iki.fi>
Date: Sat, 14 Feb 2015 22:10:19 +0200
Subject: Fix cmake dir ownerhips


diff --git a/qt5-qtdeclarative.spec b/qt5-qtdeclarative.spec
index a9af0d5..9593434 100644
--- a/qt5-qtdeclarative.spec
+++ b/qt5-qtdeclarative.spec
@@ -13,7 +13,7 @@
 Summary: Qt5 - QtDeclarative component
 Name:    qt5-%{qt_module}
 Version: 5.4.0
-Release: 1%{?dist}
+Release: 2%{?dist}
 
 # See LICENSE.GPL LICENSE.LGPL LGPL_EXCEPTION.txt, for details
 License: LGPLv2 with exceptions or GPLv3 with exceptions
@@ -172,6 +172,7 @@ popd
 %{_qt5_libdir}/libQt5QuickTest.so.5*
 %{_qt5_plugindir}/qmltooling/
 %{_qt5_archdatadir}/qml/
+%dir %{_qt5_libdir}/cmake/Qt5Qml/
 %{_qt5_libdir}/cmake/Qt5Qml/Qt5Qml_QTcpServerConnection.cmake
 %{_qt5_libdir}/cmake/Qt5Qml/Qt5Qml_QtQuick2Plugin.cmake
 
@@ -184,6 +185,7 @@ popd
 %{_qt5_libdir}/libQt5Quick*.so
 %{_qt5_libdir}/libQt5QuickWidgets.so.5
 %{_qt5_libdir}/libQt5Quick*.prl
+%dir %{_qt5_libdir}/cmake/Qt5Quick*/
 %{_qt5_libdir}/cmake/Qt5*/Qt5*Config*.cmake
 %{_qt5_libdir}/pkgconfig/Qt5*.pc
 %{_qt5_archdatadir}/mkspecs/modules/*.pri
@@ -207,6 +209,9 @@ popd
 
 
 %changelog
+* Sat Feb 14 2015 Ville Skyttä <ville.skytta at iki.fi> - 5.4.0-2
+- Fix cmake dir ownerhips
+
 * Wed Dec 10 2014 Rex Dieter <rdieter at fedoraproject.org> 5.4.0-1
 - 5.4.0 (final)
 
-- 
cgit v0.10.2


>From 1b2881da16cecd7ecb40f73fbb76819e0bed923a Mon Sep 17 00:00:00 2001
From: Rex Dieter <rdieter at math.unl.edu>
Date: Mon, 16 Feb 2015 12:29:48 -0600
Subject: rebuild (gcc)


diff --git a/qt5-qtdeclarative.spec b/qt5-qtdeclarative.spec
index 9593434..a9b0a44 100644
--- a/qt5-qtdeclarative.spec
+++ b/qt5-qtdeclarative.spec
@@ -13,7 +13,7 @@
 Summary: Qt5 - QtDeclarative component
 Name:    qt5-%{qt_module}
 Version: 5.4.0
-Release: 2%{?dist}
+Release: 3%{?dist}
 
 # See LICENSE.GPL LICENSE.LGPL LGPL_EXCEPTION.txt, for details
 License: LGPLv2 with exceptions or GPLv3 with exceptions
@@ -209,6 +209,9 @@ popd
 
 
 %changelog
+* Mon Feb 16 2015 Rex Dieter <rdieter at fedoraproject.org> 5.4.0-3
+- rebuild (gcc)
+
 * Sat Feb 14 2015 Ville Skyttä <ville.skytta at iki.fi> - 5.4.0-2
 - Fix cmake dir ownerhips
 
-- 
cgit v0.10.2


>From b5cb112d4115da767746e7a6b58ffed8df03e0f1 Mon Sep 17 00:00:00 2001
From: Jan Grulich <jgrulich at redhat.com>
Date: Tue, 24 Feb 2015 15:41:51 +0100
Subject: Update to 5.4.1


diff --git a/.gitignore b/.gitignore
index 4f7b575..abc2a52 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 /qtdeclarative-opensource-src-5.4.0.tar.xz
+/qtdeclarative-opensource-src-5.4.1.tar.xz
diff --git a/qt5-qtdeclarative.spec b/qt5-qtdeclarative.spec
index a9b0a44..b0c2d62 100644
--- a/qt5-qtdeclarative.spec
+++ b/qt5-qtdeclarative.spec
@@ -12,8 +12,8 @@
 
 Summary: Qt5 - QtDeclarative component
 Name:    qt5-%{qt_module}
-Version: 5.4.0
-Release: 3%{?dist}
+Version: 5.4.1
+Release: 1%{?dist}
 
 # See LICENSE.GPL LICENSE.LGPL LGPL_EXCEPTION.txt, for details
 License: LGPLv2 with exceptions or GPLv3 with exceptions
@@ -209,6 +209,9 @@ popd
 
 
 %changelog
+* Tue Feb 24 2015 Jan Grulich <jgrulich at redhat.com> 5.4.1-1
+- 5.4.1
+
 * Mon Feb 16 2015 Rex Dieter <rdieter at fedoraproject.org> 5.4.0-3
 - rebuild (gcc)
 
diff --git a/sources b/sources
index a7f7f63..f1abd7d 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-4f928e52e72b5e867b50b4d409d5e99b  qtdeclarative-opensource-src-5.4.0.tar.xz
+86dfe5c41e14a142c72fdaa6a64f933c  qtdeclarative-opensource-src-5.4.1.tar.xz
-- 
cgit v0.10.2


	http://pkgs.fedoraproject.org/cgit/qt5-qtdeclarative.git/commit/?h=el6&id=ed8ad4c53edf63c7982cefb00cc1cc0c2e16e5d5


More information about the scm-commits mailing list