[qt5-qtbase] 5.2.0-rc1
Rex Dieter
rdieter at fedoraproject.org
Mon Dec 2 14:13:37 UTC 2013
commit e8b08f3abf2c823146a0c25f54cbf23e7f63f32e
Author: Rex Dieter <rdieter at math.unl.edu>
Date: Mon Dec 2 08:13:32 2013 -0600
5.2.0-rc1
- revert/omit recent egl packaging changes
- -doc install changes-5.* files here (#989149)
.gitignore | 1 +
qt5-qtbase.spec | 23 ++++---
qtbase-opensource-src-5.2.0-egl.patch | 111 ---------------------------------
sources | 2 +-
4 files changed, 14 insertions(+), 123 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 555f51c..6980f00 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
/qtbase-opensource-src-5.1.1.tar.xz
/qtbase-opensource-src-5.2.0-beta1.tar.xz
+/qtbase-opensource-src-5.2.0-rc1.tar.xz
diff --git a/qt5-qtbase.spec b/qt5-qtbase.spec
index db9e3bb..a6b6a01 100644
--- a/qt5-qtbase.spec
+++ b/qt5-qtbase.spec
@@ -19,14 +19,14 @@
%define docs 1
%endif
-%define pre beta1
-%define snap 2013-11-08_141
-%define snap_tag 20131108_141
+%define pre rc1
+#define snap 2013-11-08_141
+#define snap_tag 20131108_141
Summary: Qt5 - QtBase components
Name: qt5-qtbase
Version: 5.2.0
-Release: 0.8.%{pre}.%{snap_tag}%{?dist}
+Release: 0.10.%{pre}%{?dist}
# See LGPL_EXCEPTIONS.txt, LICENSE.GPL3, respectively, for exception details
License: LGPLv2 with exceptions or GPLv3 with exceptions
@@ -61,8 +61,6 @@ Patch51: qtbase-opensource-src-5.1.1-bigendian.patch
Patch52: qtbase-opensource-src-5.2.0-alpha-harfbuzz.patch
##upstream patches
-# fix egl build
-Patch53: qtbase-opensource-src-5.2.0-egl.patch
# macros
%define _qt5 %{name}
@@ -213,7 +211,6 @@ rm -fv mkspecs/linux-g++*/qmake.conf.multilib-optflags
#patch50 -p1 -b .poll
%patch51 -p1 -b .bigendian
%patch52 -p1 -b .harfbuzz
-%patch53 -p1 -b .egl
# drop -fexceptions from $RPM_OPT_FLAGS
RPM_OPT_FLAGS=`echo $RPM_OPT_FLAGS | sed 's|-fexceptions||g'`
@@ -285,8 +282,7 @@ popd
-system-libpng \
%{?pcre} \
-system-sqlite \
- -system-zlib \
- -no-eglfs
+ -system-zlib
make %{?_smp_mflags}
@@ -418,7 +414,6 @@ popd
%files
%doc LICENSE.GPL LICENSE.LGPL LGPL_EXCEPTION.txt
-%doc dist/README dist/changes-%{version}
%if 0%{?qtchooser}
# not editable config files, so not using %%config here
%dir %{_sysconfdir}/xdg/qtchooser
@@ -453,8 +448,9 @@ popd
%dir %{_qt5_plugindir}/sqldrivers/
%{_qt5_plugindir}/sqldrivers/libqsqlite.so
-%if 0%{?docs}
%files doc
+%doc dist/README dist/changes-5.*
+%if 0%{?docs}
%{_qt5_docdir}/*.qch
%{_qt5_docdir}/qdoc/
%{_qt5_docdir}/qmake/
@@ -611,6 +607,11 @@ popd
%changelog
+* Mon Dec 02 2013 Rex Dieter <rdieter at fedoraproject.org> 5.2.0-0.10.rc1
+- 5.2.0-rc1
+- revert/omit recent egl packaging changes
+- -doc install changes-5.* files here (#989149)
+
* Tue Nov 26 2013 Rex Dieter <rdieter at fedoraproject.org> 5.2.0-0.8.beta1.20131108_141
- Install changes-5.x.y file (#989149)
diff --git a/sources b/sources
index c1bca8a..ab6862d 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-298582a6bf168a34e815bb751bd664c8 qtbase-opensource-src-5.2.0-beta1.tar.xz
+a86dc4cc3aa6443f1ca4b35f826ec240 qtbase-opensource-src-5.2.0-rc1.tar.xz
More information about the scm-commits
mailing list