ship $$[QT_INSTALL_DATA]/qtlogging.ini for packaged logging defaults (#1227295)

This commit is contained in:
Rex Dieter 2016-02-25 09:22:40 -06:00
parent 7f9dd5fd56
commit a09edb40e5
2 changed files with 14 additions and 1 deletions

View File

@ -44,7 +44,7 @@
Summary: Qt5 - QtBase components
Name: qt5-qtbase
Version: 5.6.0
Release: 0.32.%{prerelease}%{?dist}
Release: 0.33.%{prerelease}%{?dist}
# See LGPL_EXCEPTIONS.txt, for exception details
License: LGPLv2 with exceptions or GPLv3 with exceptions
@ -55,6 +55,9 @@ Source0: http://download.qt.io/development_releases/qt/5.6/%{version}-%{prerelea
Source0: http://download.qt.io/official_releases/qt/5.6/%{version}%{?prerelease:-%{prerelease}}/submodules/%{qt_module}-opensource-src-%{version}%{?prerelease:-%{prerelease}}.tar.xz
%endif
# https://bugzilla.redhat.com/show_bug.cgi?id=1227295
Source1: qtlogging.ini
# header file to workaround multilib issue
# https://bugzilla.redhat.com/show_bug.cgi?id=1036956
Source5: qconfig-multilib.h
@ -500,6 +503,8 @@ make install INSTALL_ROOT=%{buildroot}
make install_docs INSTALL_ROOT=%{buildroot}
%endif
install -m644 -p -D %{SOURCE1} %{buildroot}%{_qt5_datadir}/qtlogging.ini
# Qt5.pc
cat >%{buildroot}%{_libdir}/pkgconfig/Qt5.pc<<EOF
prefix=%{_qt5_prefix}
@ -681,6 +686,7 @@ fi
%{_qt5_translationdir}/
%dir %{_qt5_prefix}/
%dir %{_qt5_datadir}/
%{_qt5_datadir}/qtlogging.ini
%dir %{_qt5_libexecdir}/
%dir %{_qt5_plugindir}/
%dir %{_qt5_plugindir}/bearer/
@ -938,6 +944,9 @@ fi
%changelog
* Thu Feb 25 2016 Rex Dieter <rdieter@fedoraproject.org> 5.6.0-0.33.rc
- ship $$[QT_INSTALL_DATA]/qtlogging.ini for packaged logging defaults (#1227295)
* Thu Feb 25 2016 Rex Dieter <rdieter@fedoraproject.org> 5.6.0-0.32.rc
- qt5-qtbase-static missing dependencies (#1311311)

4
qtlogging.ini Normal file
View File

@ -0,0 +1,4 @@
[Rules]
# distro defaults, see also https://bugzilla.redhat.com/show_bug.cgi?id=1227295
# can override in $XDG_CONFIG_HOME/QtProject/qtlogging.ini or $XDG_CONFIG_DIR/QtProject/qtlogging.ini
*.debug=false