diff --git a/qt.spec b/qt.spec index 91bbf56..1f5cfcc 100644 --- a/qt.spec +++ b/qt.spec @@ -7,11 +7,16 @@ # See http://bugzilla.redhat.com/223663 %define multilib_archs x86_64 %{ix86} ppc64 ppc s390x s390 sparc64 sparcv9 +%if 0%{?fedora} > 16 +# use external qt_settings pkg +%define qt_settings 1 +%endif + Summary: Qt toolkit Name: qt Epoch: 1 Version: 4.8.1 -Release: 8%{?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 @@ -241,6 +246,9 @@ BuildRequires: freetds-devel Obsoletes: qgtkstyle < 0.1 Provides: qgtkstyle = 0.1-1 Requires: ca-certificates +%if 0%{?qt_settings} +Requires: qt-settings +%endif %description Qt is a software toolkit for developing applications. @@ -677,8 +685,10 @@ popd echo "%{_qt4_libdir}" > %{buildroot}/etc/ld.so.conf.d/qt4-%{__isa_bits}.conf %endif +%if ! 0%{?qt_settings} # Trolltech.conf install -p -m644 -D %{SOURCE4} %{buildroot}%{_qt4_sysconfdir}/Trolltech.conf +%endif # qt4-logo (generic) icons install -p -m644 -D %{SOURCE30} %{buildroot}%{_datadir}/icons/hicolor/128x128/apps/qt4-logo.png @@ -857,7 +867,9 @@ fi %if "%{_qt4_sysconfdir}" != "%{_sysconfdir}" %dir %{_qt4_sysconfdir} %endif +%if ! 0%{?qt_settings} %config(noreplace) %{_qt4_sysconfdir}/Trolltech.conf +%endif %{_qt4_datadir}/phrasebooks/ %{_qt4_libdir}/libQtCore.so.4* %if 0%{?dbus:1} @@ -1080,6 +1092,12 @@ fi %changelog +* Thu May 10 2012 Rex Dieter 4.8.1-10 +- Requires: qt-settings (f17+) + +* Tue May 08 2012 Rex Dieter 4.8.1-9 +- rebuild (libtiff) + * Thu May 03 2012 Than Ngo - 4.8.1-8 - add rhel/fedora condition