[mingw-qt5-qtbase] Remove hard dependency on qtchooser and co-own the /etc/xdg/qtchooser folder

Erik van Pienbroek epienbro at fedoraproject.org
Sat Jan 11 17:20:56 UTC 2014


commit dfeedb958a0c0ff0f25d3c978c843154929257ce
Author: Erik van Pienbroek <epienbro at fedoraproject.org>
Date:   Sat Jan 11 18:21:05 2014 +0100

    Remove hard dependency on qtchooser and co-own the /etc/xdg/qtchooser folder

 mingw-qt5-qtbase.spec |   15 +++++++++++----
 1 files changed, 11 insertions(+), 4 deletions(-)
---
diff --git a/mingw-qt5-qtbase.spec b/mingw-qt5-qtbase.spec
index 034fcf6..b68da26 100644
--- a/mingw-qt5-qtbase.spec
+++ b/mingw-qt5-qtbase.spec
@@ -20,7 +20,7 @@
 
 Name:           mingw-qt5-qtbase
 Version:        5.2.0
-Release:        3%{?pre:.%{pre}}%{?snapshot_date:.git%{snapshot_date}.%{snapshot_rev}}%{?dist}
+Release:        4%{?pre:.%{pre}}%{?snapshot_date:.git%{snapshot_date}.%{snapshot_rev}}%{?dist}
 Summary:        Qt5 for Windows - QtBase component
 
 License:        GPLv3 with exceptions or LGPLv2 with exceptions
@@ -186,7 +186,6 @@ Fedora Windows cross-compiler.
 %package -n mingw32-qt5-qmake
 Summary:       Qt5 for Windows build environment
 Requires:      mingw32-qt5-qttools-lrelease
-Requires:      qtchooser
 
 %description -n mingw32-qt5-qmake
 This package contains the build environment for cross compiling
@@ -225,7 +224,6 @@ Fedora Windows cross-compiler.
 %package -n mingw64-qt5-qmake
 Summary:       Qt for Windows build environment
 Requires:      mingw64-qt5-qttools-lrelease
-Requires:      qtchooser
 
 %description -n mingw64-qt5-qmake
 This package contains the build environment for cross compiling
@@ -599,6 +597,9 @@ ln -s %{mingw64_target}-qmake-qt5 $RPM_BUILD_ROOT%{_bindir}/mingw64-qmake-qt5
 %{_prefix}/%{mingw32_target}/lib/libQt5Bootstrap.so.5*
 %{_prefix}/%{mingw32_target}/lib/libQt5BootstrapDBus.so.5*
 %{mingw32_datadir}/qt5/
+
+# qtchooser
+%dir %{_sysconfdir}/xdg/qtchooser/
 # not editable config files, so not using %%config here
 %{_sysconfdir}/xdg/qtchooser/mingw32-qt5.conf
 
@@ -731,6 +732,9 @@ ln -s %{mingw64_target}-qmake-qt5 $RPM_BUILD_ROOT%{_bindir}/mingw64-qmake-qt5
 %{_prefix}/%{mingw64_target}/lib/libQt5Bootstrap.so.5*
 %{_prefix}/%{mingw64_target}/lib/libQt5BootstrapDBus.so.5*
 %{mingw64_datadir}/qt5/
+
+# qtchooser
+%dir %{_sysconfdir}/xdg/qtchooser/
 # not editable config files, so not using %%config here
 %{_sysconfdir}/xdg/qtchooser/mingw64-qt5.conf
 
@@ -755,7 +759,10 @@ ln -s %{mingw64_target}-qmake-qt5 $RPM_BUILD_ROOT%{_bindir}/mingw64-qmake-qt5
 
 
 %changelog
-* Mon Jan  6 2014 Erik van Pienbroek <epeinbro at fedoraproject.org> - 5.2.0-3
+* Sat Jan 11 2014 Erik van Pienbroek <epienbro at fedoraproject.org> - 5.2.0-4
+- Remove hard dependency on qtchooser and co-own the /etc/xdg/qtchooser folder
+
+* Mon Jan  6 2014 Erik van Pienbroek <epienbro at fedoraproject.org> - 5.2.0-3
 - Split the cmake patch and moved half of its contents to the 'implib dll'
   patch and the other to the 'use external angle' patch as those are more
   proper locations


More information about the scm-commits mailing list