Requires: qt-settings

Trolltech.conf

@@ -1,3 +0,0 @@
-[Qt]
-font="Sans Serif,10,-1,5,50,0,0,0,0,0"
-

qt.spec

@@ -11,7 +11,7 @@ Summary: Qt toolkit
 Name:    qt
 Epoch:   1
 Version: 4.8.1
-Release: 9%{?dist}
+Release: 10%{?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
@@ -24,9 +24,6 @@ Obsoletes: qt4 < %{version}-%{release}
 Provides: qt4 = %{version}-%{release}
 %{?_isa:Provides: qt4%{?_isa} = %{version}-%{release}}
 
-# default Qt config file
-Source4: Trolltech.conf
-
 # header file to workaround multilib issue
 Source5: qconfig-multilib.h
 
@@ -241,6 +238,7 @@ BuildRequires: freetds-devel
 Obsoletes: qgtkstyle < 0.1
 Provides:  qgtkstyle = 0.1-1
 Requires: ca-certificates
+Requires: qt-settings
 
 %description 
 Qt is a software toolkit for developing applications.
@@ -677,9 +675,6 @@ popd
   echo "%{_qt4_libdir}" > %{buildroot}/etc/ld.so.conf.d/qt4-%{__isa_bits}.conf
 %endif
 
-# Trolltech.conf
-install -p -m644 -D %{SOURCE4} %{buildroot}%{_qt4_sysconfdir}/Trolltech.conf
-
 # qt4-logo (generic) icons
 install -p -m644 -D %{SOURCE30} %{buildroot}%{_datadir}/icons/hicolor/128x128/apps/qt4-logo.png
 install -p -m644 -D %{SOURCE31} %{buildroot}%{_datadir}/icons/hicolor/48x48/apps/qt4-logo.png
@@ -857,7 +852,6 @@ fi
 %if "%{_qt4_sysconfdir}" != "%{_sysconfdir}"
 %dir %{_qt4_sysconfdir}
 %endif
-%config(noreplace) %{_qt4_sysconfdir}/Trolltech.conf
 %{_qt4_datadir}/phrasebooks/
 %{_qt4_libdir}/libQtCore.so.4*
 %if 0%{?dbus:1}
@@ -1080,6 +1074,9 @@ fi
 
 
 %changelog
+* Thu May 10 2012 Rex Dieter <rdieter@fedoraproject.org> 4.8.1-10
+- Requires: qt-settings
+
 * Tue May 08 2012 Rex Dieter <rdieter@fedoraproject.org> 4.8.1-9
 - rebuild (libtiff)