rdieter pushed to qt5-qtdeclarative (el6). "Merge branch 'master' into f21"
notifications at fedoraproject.org
notifications at fedoraproject.org
Fri Apr 10 18:15:12 UTC 2015
>From 68adae000fb38c047bd7cd38fa3dd9ec8234e71a Mon Sep 17 00:00:00 2001
From: Rex Dieter <rdieter at math.unl.edu>
Date: Sat, 18 Oct 2014 18:14:08 -0500
Subject: 5.4.0-0.1.beta
- 5.4.0-beta
- %ix84: drop sse2-optimized bits, need to rethink if/how to support it now
diff --git a/.gitignore b/.gitignore
index 6df07f1..fefbfac 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
/qtdeclarative-opensource-src-5.3.2.tar.xz
+/qtdeclarative-opensource-src-5.4.0-beta.tar.xz
diff --git a/qt5-qtdeclarative.spec b/qt5-qtdeclarative.spec
index 49492f0..8217b62 100644
--- a/qt5-qtdeclarative.spec
+++ b/qt5-qtdeclarative.spec
@@ -10,20 +10,23 @@
%endif
%endif
+%define pre beta
+
Summary: Qt5 - QtDeclarative component
Name: qt5-%{qt_module}
-Version: 5.3.2
-Release: 1%{?dist}
+Version: 5.4.0
+Release: 0.1.%{pre}%{?dist}
# See LICENSE.GPL LICENSE.LGPL LGPL_EXCEPTION.txt, for details
License: LGPLv2 with exceptions or GPLv3 with exceptions
Url: http://qt-project.org/
%if 0%{?pre:1}
-Source0: http://download.qt-project.org/development_releases/qt/5.3/%{version}-%{pre}/submodules/%{qt_module}-opensource-src-%{version}-%{pre}.tar.xz
+Source0: http://download.qt-project.org/development_releases/qt/5.4/%{version}-%{pre}/submodules/%{qt_module}-opensource-src-%{version}-%{pre}.tar.xz
%else
-Source0: http://download.qt-project.org/official_releases/qt/5.3/%{version}/submodules/%{qt_module}-opensource-src-%{version}.tar.xz
+Source0: http://download.qt-project.org/official_releases/qt/5.4/%{version}/submodules/%{qt_module}-opensource-src-%{version}.tar.xz
%endif
+# FIXME? now bases on whether qtbase supports sse2 (or not)
# support no_sse2 CONFIG (fedora i686 builds cannot assume -march=pentium4 -msse2 -mfpmath=sse flags, or the JIT that needs them)
# https://codereview.qt-project.org/#change,73710
Patch1: qtdeclarative-opensource-src-5.2.0-no_sse2.patch
@@ -39,7 +42,7 @@ BuildRequires: python
%{?_qt5_version:Requires: qt5-qtbase%{?_isa} >= %{_qt5_version}}
%description
-%{summary}
+%{summary}.
%package devel
Summary: Development files for %{name}
@@ -58,6 +61,7 @@ Requires: %{name}-devel%{?_isa} = %{version}-%{release}
%if 0%{?docs}
%package doc
Summary: API documentation for %{name}
+License: GFDL
Requires: %{name} = %{version}-%{release}
# for qhelpgenerator
BuildRequires: qt5-qttools-devel
@@ -76,7 +80,7 @@ Requires: %{name}%{?_isa} = %{version}-%{release}
%prep
%setup -q -n %{qt_module}-opensource-src-%{version}%{?pre:-%{pre}}
-%patch1 -p1 -b .no_sse2
+#patch1 -p1 -b .no_sse2
%build
@@ -87,7 +91,8 @@ popd
make %{?_smp_mflags} -C %{_target_platform}
-%ifarch %{ix86}
+#ifarch %{ix86}
+%if 0
# build libQt5Qml with no_sse2
mkdir -p %{_target_platform}-no_sse2
pushd %{_target_platform}-no_sse2
@@ -155,19 +160,21 @@ popd
%postun -p /sbin/ldconfig
%files
-%doc LICENSE.GPL LICENSE.LGPL LGPL_EXCEPTION.txt
+%doc LICENSE.GPL* LICENSE.LGPL* LGPL_EXCEPTION.txt
%doc dist/changes*
%{_qt5_libdir}/libQt5Qml.so.5*
-%ifarch %{ix86}
+#ifarch %{ix86}
+%if 0
%{_qt5_libdir}/sse2/libQt5Qml.so.5*
%endif
%{_qt5_libdir}/libQt5Quick.so.5*
%{_qt5_libdir}/libQt5QuickWidgets.so.5*
%{_qt5_libdir}/libQt5QuickParticles.so.5*
%{_qt5_libdir}/libQt5QuickTest.so.5*
-%{_qt5_plugindir}/accessible/libqtaccessiblequick.so
%{_qt5_plugindir}/qmltooling/
%{_qt5_archdatadir}/qml/
+%{_qt5_libdir}/cmake/Qt5Qml/Qt5Qml_QTcpServerConnection.cmake
+%{_qt5_libdir}/cmake/Qt5Qml/Qt5Qml_QtQuick2Plugin.cmake
%files devel
%{_bindir}/qml*
@@ -178,7 +185,7 @@ popd
%{_qt5_libdir}/libQt5Quick*.so
%{_qt5_libdir}/libQt5QuickWidgets.so.5
%{_qt5_libdir}/libQt5Quick*.prl
-%{_qt5_libdir}/cmake/Qt5*/
+%{_qt5_libdir}/cmake/Qt5*/Qt5*Config*.cmake
%{_qt5_libdir}/pkgconfig/Qt5*.pc
%{_qt5_archdatadir}/mkspecs/modules/*.pri
@@ -201,6 +208,10 @@ popd
%changelog
+* Sat Oct 18 2014 Rex Dieter <rdieter at fedoraproject.org> - 5.4.0-0.1.beta
+- 5.4.0-beta
+- %%ix84: drop sse2-optimized bits, need to rethink if/how to support it now
+
* Tue Sep 16 2014 Rex Dieter <rdieter at fedoraproject.org> 5.3.2-1
- 5.3.2
diff --git a/sources b/sources
index 1c68340..a25e438 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-72ae60527ebb15f4b85cfbadc4c174de qtdeclarative-opensource-src-5.3.2.tar.xz
+d905a654cbf50adcb8bf41657038c942 qtdeclarative-opensource-src-5.4.0-beta.tar.xz
--
cgit v0.10.2
>From a89841c3e155793ff499ede55917361c76b8efdc Mon Sep 17 00:00:00 2001
From: Rex Dieter <rdieter at math.unl.edu>
Date: Sat, 18 Oct 2014 18:32:03 -0500
Subject: one more sse2 conditional
diff --git a/qt5-qtdeclarative.spec b/qt5-qtdeclarative.spec
index 8217b62..12c873b 100644
--- a/qt5-qtdeclarative.spec
+++ b/qt5-qtdeclarative.spec
@@ -110,7 +110,8 @@ make %{?_smp_mflags} docs -C %{_target_platform}
%install
make install INSTALL_ROOT=%{buildroot} -C %{_target_platform}
-%ifarch %{ix86}
+#ifarch %{ix86}
+%if 0
mkdir -p %{buildroot}%{_qt5_libdir}/sse2
mv %{buildroot}%{_qt5_libdir}/libQt5Qml.so.5* %{buildroot}%{_qt5_libdir}/sse2/
make install INSTALL_ROOT=%{buildroot} -C %{_target_platform}-no_sse2/src/qml
--
cgit v0.10.2
>From 1cc0755d27e95f4f3bfd92a87cce24c097a41e4c Mon Sep 17 00:00:00 2001
From: Rex Dieter <rdieter at math.unl.edu>
Date: Mon, 3 Nov 2014 12:10:42 -0600
Subject: use new %qmake_qt5 macro
diff --git a/qt5-qtdeclarative.spec b/qt5-qtdeclarative.spec
index 12c873b..a04a5e3 100644
--- a/qt5-qtdeclarative.spec
+++ b/qt5-qtdeclarative.spec
@@ -15,7 +15,7 @@
Summary: Qt5 - QtDeclarative component
Name: qt5-%{qt_module}
Version: 5.4.0
-Release: 0.1.%{pre}%{?dist}
+Release: 0.2.%{pre}%{?dist}
# See LICENSE.GPL LICENSE.LGPL LGPL_EXCEPTION.txt, for details
License: LGPLv2 with exceptions or GPLv3 with exceptions
@@ -86,7 +86,7 @@ Requires: %{name}%{?_isa} = %{version}-%{release}
%build
mkdir -p %{_target_platform}
pushd %{_target_platform}
-%{_qt5_qmake} ..
+%{qmake_qt5} ..
popd
make %{?_smp_mflags} -C %{_target_platform}
@@ -209,6 +209,9 @@ popd
%changelog
+* Mon Nov 03 2014 Rex Dieter <rdieter at fedoraproject.org> 5.4.0-0.2.beta
+- use new %%qmake_qt5 macro
+
* Sat Oct 18 2014 Rex Dieter <rdieter at fedoraproject.org> - 5.4.0-0.1.beta
- 5.4.0-beta
- %%ix84: drop sse2-optimized bits, need to rethink if/how to support it now
--
cgit v0.10.2
>From 895891410be56bf3dfa173ed76b77cf88f23f2d8 Mon Sep 17 00:00:00 2001
From: Rex Dieter <rdieter at math.unl.edu>
Date: Fri, 28 Nov 2014 09:53:26 -0600
Subject: 5.4.0-rc
diff --git a/.gitignore b/.gitignore
index fefbfac..0225bc7 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
/qtdeclarative-opensource-src-5.3.2.tar.xz
/qtdeclarative-opensource-src-5.4.0-beta.tar.xz
+/qtdeclarative-opensource-src-5.4.0-rc.tar.xz
diff --git a/qt5-qtdeclarative.spec b/qt5-qtdeclarative.spec
index a04a5e3..e7347d9 100644
--- a/qt5-qtdeclarative.spec
+++ b/qt5-qtdeclarative.spec
@@ -10,12 +10,12 @@
%endif
%endif
-%define pre beta
+%define pre rc
Summary: Qt5 - QtDeclarative component
Name: qt5-%{qt_module}
Version: 5.4.0
-Release: 0.2.%{pre}%{?dist}
+Release: 0.3.%{pre}%{?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
+* Fri Nov 28 2014 Rex Dieter <rdieter at fedoraproject.org> 5.4.0-0.3.rc
+- 5.4.0-rc
+
* Mon Nov 03 2014 Rex Dieter <rdieter at fedoraproject.org> 5.4.0-0.2.beta
- use new %%qmake_qt5 macro
diff --git a/sources b/sources
index a25e438..38b1ef2 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-d905a654cbf50adcb8bf41657038c942 qtdeclarative-opensource-src-5.4.0-beta.tar.xz
+579909648c279bc0e2ba63cbf0506564 qtdeclarative-opensource-src-5.4.0-rc.tar.xz
--
cgit v0.10.2
>From 366fc168a99dbeff4e2420043dd79b6b3a3404c4 Mon Sep 17 00:00:00 2001
From: Rex Dieter <rdieter at math.unl.edu>
Date: Wed, 10 Dec 2014 07:26:13 -0600
Subject: 5.4.0 (final)
diff --git a/.gitignore b/.gitignore
index 0225bc7..4f7b575 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1 @@
-/qtdeclarative-opensource-src-5.3.2.tar.xz
-/qtdeclarative-opensource-src-5.4.0-beta.tar.xz
-/qtdeclarative-opensource-src-5.4.0-rc.tar.xz
+/qtdeclarative-opensource-src-5.4.0.tar.xz
diff --git a/qt5-qtdeclarative.spec b/qt5-qtdeclarative.spec
index e7347d9..a9af0d5 100644
--- a/qt5-qtdeclarative.spec
+++ b/qt5-qtdeclarative.spec
@@ -10,12 +10,10 @@
%endif
%endif
-%define pre rc
-
Summary: Qt5 - QtDeclarative component
Name: qt5-%{qt_module}
Version: 5.4.0
-Release: 0.3.%{pre}%{?dist}
+Release: 1%{?dist}
# See LICENSE.GPL LICENSE.LGPL LGPL_EXCEPTION.txt, for details
License: LGPLv2 with exceptions or GPLv3 with exceptions
@@ -209,6 +207,9 @@ popd
%changelog
+* Wed Dec 10 2014 Rex Dieter <rdieter at fedoraproject.org> 5.4.0-1
+- 5.4.0 (final)
+
* Fri Nov 28 2014 Rex Dieter <rdieter at fedoraproject.org> 5.4.0-0.3.rc
- 5.4.0-rc
diff --git a/sources b/sources
index 38b1ef2..a7f7f63 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-579909648c279bc0e2ba63cbf0506564 qtdeclarative-opensource-src-5.4.0-rc.tar.xz
+4f928e52e72b5e867b50b4d409d5e99b qtdeclarative-opensource-src-5.4.0.tar.xz
--
cgit v0.10.2
http://pkgs.fedoraproject.org/cgit/qt5-qtdeclarative.git/commit/?h=el6&id=7de9b3b64762dcec69f72251bc5427b7245e75b2
More information about the scm-commits
mailing list