From 36205006b465f9a61f81a30ea26f2af8febc7efb Mon Sep 17 00:00:00 2001
From: Rex Dieter <rdieter@math.unl.edu>
Date: Thu, 24 Jan 2013 12:14:01 -0600
Subject: [PATCH] make qtchooser support non-conflicting

---
 qt.spec | 21 +++++----------------
 1 file changed, 5 insertions(+), 16 deletions(-)

diff --git a/qt.spec b/qt.spec
index a778303..296f9d2 100644
--- a/qt.spec
+++ b/qt.spec
@@ -20,7 +20,7 @@ Summary: Qt toolkit
 Name:    qt
 Epoch:   1
 Version: 4.8.4
-Release: 8%{?dist}
+Release: 9%{?dist}
 
 # See LGPL_EXCEPTIONS.txt, LICENSE.GPL3, respectively, for exception details
 License: (LGPLv2 with exceptions or GPLv3 with exceptions) and ASL 2.0 and BSD and FTL and MIT
@@ -264,11 +264,6 @@ Requires: ca-certificates
 %if 0%{?qt_settings}
 Requires: qt-settings
 %endif
-%if 0%{?qtchooser}
-Requires: qtchooser
-%else
-Conflicts: qtchooser
-%endif
 
 %description 
 Qt is a software toolkit for developing applications.
@@ -680,10 +675,8 @@ for i in * ; do
       ln -s ../../../bin/${i}-qt4 $i
       ;;
     *)
-%if ! 0%{?qtchooser}
       mv $i ../../../bin/
       ln -s ../../../bin/$i .
-%endif
       ;;
   esac
 done
@@ -853,6 +846,7 @@ rm -rf %{buildroot}
 %defattr(-,root,root,-)
 %doc README LICENSE.GPL3 LICENSE.LGPL LGPL_EXCEPTION.txt
 %if 0%{?qtchooser}
+%dir %{_sysconfdir}/xdg/qtchooser
 # not editable config files, so not using %%config here
 %{_sysconfdir}/xdg/qtchooser/*.conf
 %endif
@@ -886,10 +880,8 @@ rm -rf %{buildroot}
 %{_qt4_libdir}/libQtCore.so.4*
 %if 0%{?dbus:1}
 %if "%{_qt4_bindir}" != "%{_bindir}"
-%if ! 0%{?qtchooser}
 %{_bindir}/qdbus
 %endif
-%endif
 %{_qt4_bindir}/qdbus
 %{_qt4_libdir}/libQtDBus.so.4*
 %endif
@@ -995,7 +987,6 @@ fi
 %{_bindir}/uic*
 %{_bindir}/designer*
 %{_bindir}/linguist*
-%if ! 0%{?qtchooser}
 %{_bindir}/lconvert
 %{_bindir}/pixeltool
 %{_bindir}/qdoc3
@@ -1013,7 +1004,6 @@ fi
 %{_bindir}/xmlpatterns
 %{_bindir}/xmlpatternsvalidator
 %endif
-%endif
 %if "%{_qt4_headerdir}" != "%{_includedir}"
 %dir %{_qt4_headerdir}/
 %endif
@@ -1076,9 +1066,7 @@ fi
 %if 0%{?qvfb}
 %files qvfb -f qvfb.lang
 %defattr(-,root,root,-)
-%if ! 0%{?qtchooser}
 %{_bindir}/qvfb
-%endif
 %{_qt4_bindir}/qvfb
 %endif
 
@@ -1148,17 +1136,18 @@ fi
 %endif
 %exclude %{_qt4_plugindir}/sqldrivers
 %if "%{_qt4_bindir}" != "%{_bindir}"
-%if ! 0%{?qtchooser}
 %{?dbus:%{_bindir}/qdbusviewer}
 %{_bindir}/qmlviewer
 %endif
-%endif
 %{?dbus:%{_qt4_bindir}/qdbusviewer}
 %{_qt4_bindir}/qmlviewer
 %{_datadir}/icons/hicolor/*/apps/qt4-logo.*
 
 
 %changelog
+* Thu Jan 24 2013 Rex Dieter <rdieter@fedoraproject.org> 1:4.8.4-9
+- make qtchooser support non-conflicting
+
 * Mon Jan 21 2013 Adam Tkac <atkac redhat com> - 1:4.8.4-8
 - rebuild due to "jpeg8-ABI" feature drop