revert bundled libxml2/libxslt

This commit is contained in:
Rex Dieter 2019-03-25 15:29:53 -05:00
parent ef6768f9d6
commit 67986a15d6

View File

@ -47,7 +47,7 @@
Summary: Qt5 - QtWebEngine components Summary: Qt5 - QtWebEngine components
Name: qt5-qtwebengine Name: qt5-qtwebengine
Version: 5.12.2 Version: 5.12.2
Release: 1%{?dist} Release: 2%{?dist}
# See LICENSE.GPL LICENSE.LGPL LGPL_EXCEPTION.txt, for details # See LICENSE.GPL LICENSE.LGPL LGPL_EXCEPTION.txt, for details
# See also http://qt-project.org/doc/qt-5.0/qtdoc/licensing.html # See also http://qt-project.org/doc/qt-5.0/qtdoc/licensing.html
@ -159,7 +159,8 @@ BuildRequires: pkgconfig(libpci)
BuildRequires: pkgconfig(dbus-1) BuildRequires: pkgconfig(dbus-1)
BuildRequires: pkgconfig(nss) BuildRequires: pkgconfig(nss)
BuildRequires: pkgconfig(lcms2) BuildRequires: pkgconfig(lcms2)
BuildRequires: pkgconfig(libxslt) pkgconfig(libxml-2.0) ## https://bugreports.qt.io/browse/QTBUG-59094
#BuildRequires: pkgconfig(libxslt) pkgconfig(libxml-2.0)
BuildRequires: perl-interpreter BuildRequires: perl-interpreter
BuildRequires: python2-devel BuildRequires: python2-devel
%if 0%{?use_system_libvpx} %if 0%{?use_system_libvpx}
@ -229,7 +230,7 @@ Provides: bundled(libwebp) = 0.6.0
%endif %endif
# bundled as "libxml" # bundled as "libxml"
# see src/3rdparty/chromium/third_party/libxml/linux/include/libxml/xmlversion.h # see src/3rdparty/chromium/third_party/libxml/linux/include/libxml/xmlversion.h
#Provides: bundled(libxml2) = 2.9.4 Provides: bundled(libxml2) = 2.9.4
# see src/3rdparty/chromium/third_party/libxslt/linux/config.h for version # see src/3rdparty/chromium/third_party/libxslt/linux/config.h for version
Provides: bundled(libxslt) = 1.1.29 Provides: bundled(libxslt) = 1.1.29
Provides: bundled(libXNVCtrl) = 302.17 Provides: bundled(libXNVCtrl) = 302.17
@ -568,6 +569,9 @@ done
%changelog %changelog
* Mon Mar 25 2019 Rex Dieter <rdieter@fedoraproject.org> - 5.12.2-2
- revert bundled libxml2/libxslt
* Mon Mar 25 2019 Rex Dieter <rdieter@fedoraproject.org> - 5.12.2-1 * Mon Mar 25 2019 Rex Dieter <rdieter@fedoraproject.org> - 5.12.2-1
- 5.12.2 - 5.12.2
- use system libxml2/libxslt - use system libxml2/libxslt