Accepting request 212776 from KDE:Qt5

- Explicitly (Build)Require pkgconfig(harfbuzz) for 13.1+
- Explicitly activate system-harfbuzz, system-freetype and fontconfig options
- Drop clucene-core-devel and giflib-devel Build(Requires): unused
- Drop pkgconfig(atspi-2) (Build)Requires: external libatspi2 is not used during build time (see qtbase commit 4c1c820)

OBS-URL: https://build.opensuse.org/request/show/212776
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/libqt5-qtbase?expand=0&rev=12

libqt5-qtbase.changes

@@ -1,3 +1,13 @@
+-------------------------------------------------------------------
+Fri Jan  3 22:28:56 UTC 2014 - hrvoje.senjan@gmail.com
+
+- Explicitly (Build)Require pkgconfig(harfbuzz) for 13.1+
+- Explicitly activate system-harfbuzz, system-freetype and
+  fontconfig options
+- Drop clucene-core-devel and giflib-devel Build(Requires): unused
+- Drop pkgconfig(atspi-2) (Build)Requires: external libatspi2 is not
+  used during build time (see qtbase commit 4c1c820)
+
 -------------------------------------------------------------------
 Tue Dec 12 14:54:22 UTC 2013 - uweigand@de.ibm.com
 
@@ -60,13 +70,13 @@ Wed Oct 23 17:11:55 UTC 2013 - hrvoje.senjan@gmail.com
   * New feature release, please see
   http://blog.qt.digia.com/blog/2013/10/23/qt-5-2-beta-available/
   and http://qt-project.org/wiki/New-Features-in-Qt-5.2
-- Change obsoletes of new library and sql plugins packages 
+- Change obsoletes of new library and sql plugins packages
 
 -------------------------------------------------------------------
 Fri Oct 18 17:48:59 UTC 2013 - hrvoje.senjan@gmail.com
 
 - Added qtbase-opensource-src-5.1.1-bigendian.patch, also needed
-  for building on PowerPC, otherwise fromWordToBytes is 
+  for building on PowerPC, otherwise fromWordToBytes is
   left undeclared
 
 -------------------------------------------------------------------
@@ -77,8 +87,8 @@ Fri Oct 18 12:38:19 UTC 2013 - hrvoje.senjan@gmail.com
 -------------------------------------------------------------------
 Wed Oct 16 17:24:48 UTC 2013 - hrvoje.senjan@gmail.com
 
-- Further split libqt5-qtbase package to libQt5Concurrent5, 
+- Further split libqt5-qtbase package to libQt5Concurrent5,
-  libQt5Core5, libQt5DBus5, libQt5Network5, libQt5Xml5, 
+  libQt5Core5, libQt5DBus5, libQt5Network5, libQt5Xml5,
   libQt5PrintSupport5 and libQt5OpenGL5
 - Rename sql plugin subpackages for more consistent naming with the
   rest of libraries
@@ -190,7 +200,7 @@ Thu Aug 30 11:31:45 UTC 2012 - stephan.binner@basyskom.com
 -------------------------------------------------------------------
 Thu May 24 15:29:20 UTC 2012 - stephan.binner@basyskom.com
 
-- update to newer Alpha snapshot / Beta candidate 
+- update to newer Alpha snapshot / Beta candidate
 
 -------------------------------------------------------------------
 Fri Apr 13 13:22:38 UTC 2012 - stephan.binner@basyskom.com
@@ -200,5 +210,5 @@ Fri Apr 13 13:22:38 UTC 2012 - stephan.binner@basyskom.com
 -------------------------------------------------------------------
 Thu Apr  5 09:56:15 UTC 2012 - dmueller@suse.com
 
-- Initial packaging (Qt 5.0 Alpha) 
+- Initial packaging (Qt 5.0 Alpha)
 

libqt5-qtbase.spec

@@ -1,7 +1,7 @@
 #
 # spec file for package libqt5-qtbase
 #
-# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -18,12 +18,9 @@
 
 Name:           libqt5-qtbase
 BuildRequires:  alsa-devel
-BuildRequires:  at-spi2-core-devel
 BuildRequires:  cups-devel
 BuildRequires:  fdupes
-BuildRequires:  freetype2-devel
 BuildRequires:  gcc-c++
-BuildRequires:  giflib-devel
 BuildRequires:  libjpeg-devel
 BuildRequires:  libmng-devel
 BuildRequires:  libmysqlclient-devel
@@ -37,17 +34,26 @@ BuildRequires:  sqlite3-devel
 BuildRequires:  unixODBC-devel
 BuildRequires:  pkgconfig(dbus-1)
 BuildRequires:  pkgconfig(egl)
+BuildRequires:  pkgconfig(freetype2)
 BuildRequires:  pkgconfig(gl)
 %ifarch %arm
 BuildRequires:  pkgconfig(gbm)
 BuildRequires:  pkgconfig(glesv2)
 %endif
+BuildRequires:  libicu-devel
+BuildRequires:  libpulse-devel
+BuildRequires:  libudev-devel
 BuildRequires:  xcb-util-image-devel
 BuildRequires:  xcb-util-keysyms-devel
 BuildRequires:  xcb-util-renderutil-devel
 BuildRequires:  xcb-util-wm-devel
+BuildRequires:  xorg-x11-devel
+BuildRequires:  xz
 BuildRequires:  pkgconfig(glib-2.0)
 BuildRequires:  pkgconfig(gtk+-2.0)
+%if 0%{?suse_version} >= 1310
+BuildRequires:  pkgconfig(harfbuzz)
+%endif
 BuildRequires:  pkgconfig(ice)
 BuildRequires:  pkgconfig(sm)
 BuildRequires:  pkgconfig(xkbcommon) >= 0.2.0
@@ -82,12 +88,6 @@ Patch1000:      0001-Remove-the-GLES-2-dependency-for-eglfs-and-kms.patch
 Patch1001:      0002-Fix-configure-script-to-not-dictate-OpenGL-ES-2-when.patch
 Patch1002:      0003-EGL-convenience-deal-with-DefaultRenderableType-when.patch
 Patch1003:      0004-Do-not-disable-egl-on-desktop-gl-automatically.patch
-BuildRequires:  clucene-core-devel
-BuildRequires:  libicu-devel
-BuildRequires:  libpulse-devel
-BuildRequires:  libudev-devel
-BuildRequires:  xorg-x11-devel
-BuildRequires:  xz
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 
@@ -131,11 +131,8 @@ rm -r src/3rdparty/{libjpeg,freetype,libpng,zlib}
 Summary:        Qt Development Kit
 Group:          Development/Libraries/X11
 Requires:       alsa-devel
-Requires:       at-spi2-core-devel
 Requires:       c++_compiler
 Requires:       cups-devel
-Requires:       freetype2-devel
-Requires:       giflib-devel
 Requires:       libQt5Concurrent5 = %{version}
 Requires:       libQt5Core5 = %{version}
 Requires:       libQt5DBus5 = %{version}
@@ -161,6 +158,7 @@ Requires:       pkgconfig
 Requires:       sqlite3-devel
 Requires:       pkgconfig(dbus-1)
 Requires:       pkgconfig(egl)
+Requires:       pkgconfig(freetype2)
 Requires:       pkgconfig(gl)
 %ifarch %arm
 Requires:       pkgconfig(gbm)
@@ -176,6 +174,9 @@ Requires:       xcb-util-wm-devel
 Requires:       xorg-x11-devel
 Requires:       zlib-devel
 Requires:       pkgconfig(glib-2.0)
+%if 0%{?suse_version} >= 1310
+Requires:       pkgconfig(harfbuzz)
+%endif
 Requires:       pkgconfig(ice)
 Requires:       pkgconfig(sm)
 Requires:       pkgconfig(xkbcommon) >= 0.2.0
@@ -378,6 +379,11 @@ echo yes | ./configure $platform \
 	-system-libjpeg \
 	-openssl-linked \
 	-system-libpng \
+%if 0%{?suse_version} >= 1310
+	-system-harfbuzz \
+%endif
+	-fontconfig \
+	-system-freetype \
 	-cups \
 	-nis \
 	-system-zlib \