rpms/qt/F-9 qt.spec,1.200,1.201
Rex Dieter
rdieter at fedoraproject.org
Sun Jun 7 21:40:18 UTC 2009
Author: rdieter
Update of /cvs/pkgs/rpms/qt/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23711
Modified Files:
qt.spec
Log Message:
* Sat May 30 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.5.1-13
- -doc: Obsoletes: qt-doc < 1:4.5.1-4 (workaround bug #502401)
Index: qt.spec
===================================================================
RCS file: /cvs/pkgs/rpms/qt/F-9/qt.spec,v
retrieving revision 1.200
retrieving revision 1.201
diff -u -p -r1.200 -r1.201
--- qt.spec 23 May 2009 05:12:46 -0000 1.200
+++ qt.spec 7 Jun 2009 21:39:48 -0000 1.201
@@ -12,7 +12,7 @@ Epoch: 1
Name: qt4
%endif
Version: 4.5.1
-Release: 11%{?dist}
+Release: 13%{?dist}
# See LGPL_EXCEPTIONS.txt, LICENSE.GPL3, respectively, for exception details
License: LGPLv2 with exceptions or GPLv3 with exceptions
@@ -84,7 +84,10 @@ Source31: hi48-app-qt4-logo.png
%define psql -plugin-sql-psql
%define sqlite -plugin-sql-sqlite
%define phonon -phonon
+# if building with --phonon, define to internal version (ie, Obsolete external phonon)
+#define phonon_internal 1
%define phonon_backend -no-phonon-backend
+%define phonon_version 4.3.1
%define webkit -webkit
%define gtkstyle -gtkstyle
@@ -210,6 +213,8 @@ Obsoletes: qt4-doc < %{version}-%{releas
Provides: qt4-doc = %{version}-%{release}
%endif
%if 0%{?fedora} > 9
+# help workaround yum bug http://bugzilla.redhat.com/502401
+Obsoletes: qt-doc < 1:4.5.1-4
BuildArch: noarch
%endif
%description doc
@@ -226,19 +231,17 @@ Requires: libpng-devel
Requires: libjpeg-devel
Requires: pkgconfig
%if 0%{?phonon:1}
-# No, let's avoid the circular dependency (for now) -- Rex
-#Requires: phonon-devel
Provides: qt4-phonon-devel = %{version}-%{release}
%endif
+%if 0%{?phonon_internal}
+Obsoletes: phonon-devel < 4.3.1-100
+Provides: phonon-devel = 4.3.1-100
+Requires: phonon-backend%{?_isa} >= %{phonon_version}
+%endif
%if 0%{?webkit:1}
Obsoletes: WebKit-qt-devel < 1.0.0-1
Provides: WebKit-qt-devel = 1.0.0-1
%endif
-# we strip these from the .pc files to avoid the bogus deps
-# -openssl-linked ? -- Rex
-#Requires: openssl-devel
-# -dbus-linked ? -- Rex
-#Requires: dbus-devel
Obsoletes: qt4-designer < %{version}-%{release}
Provides: qt4-designer = %{version}-%{release}
# as long as libQtUiTools.a is included
@@ -314,6 +317,10 @@ Provides: qt4-postgresql = %{version}-%
%package x11
Summary: Qt GUI-related libraries
Group: System Environment/Libraries
+%if 0%{?phonon_internal}
+Obsoletes: phonon < 4.3.1-100
+Provides: phonon = 4.3.1-100
+%endif
%if 0%{?phonon:1}
Provides: qt4-phonon = %{version}-%{release}
%endif
@@ -611,16 +618,18 @@ EOF
# create/own %%_qt4_plugindir/styles
mkdir %{buildroot}%{_qt4_plugindir}/styles
-%if 0%{?phonon:1}
+%if 0%{?phonon:1}
+mkdir -p %{buildroot}%{_qt4_plugindir}/phonon_backend
+%endif
+
+%if ! 0%{?phonon_internal}
mkdir -p %{buildroot}%{_qt4_plugindir}/phonon_backend
-# if building with phonon support, nuke it
rm -fv %{buildroot}%{_qt4_libdir}/libphonon.so*
rm -rfv %{buildroot}%{_libdir}/pkgconfig/phonon.pc
# contents slightly different between phonon-4.3.1 and qt-4.5.0
rm -fv %{buildroot}%{_includedir}/phonon/phononnamespace.h
# contents dup'd but should remove just in case
rm -fv %{buildroot}%{_includedir}/phonon/*.h
-
#rm -rfv %{buildroot}%{_qt4_headerdir}/phonon*
#rm -rfv %{buildroot}%{_qt4_headerdir}/Qt/phonon*
%endif
@@ -759,7 +768,9 @@ gtk-update-icon-cache -q %{_datadir}/ico
%{_qt4_datadir}/q3porting.xml
%if 0%{?phonon:1}
%{_qt4_libdir}/libphonon.prl
-#{_qt4_libdir}/libphonon.so
+%if 0%{?phonon_internal}
+%{_qt4_libdir}/libphonon.so
+%endif
%endif
%{_qt4_libdir}/libQt*.so
%{_qt4_libdir}/libQtUiTools*.a
@@ -812,8 +823,8 @@ gtk-update-icon-cache -q %{_datadir}/ico
%files x11
%defattr(-,root,root,-)
%{_sysconfdir}/rpm/macros.*
-%if 0%{?phonon:1}
-#{_qt4_libdir}/libphonon.so.4*
+%if 0%{?phonon_internal}
+%{_qt4_libdir}/libphonon.so.4*
%endif
%{_qt4_libdir}/libQt3Support.so.*
%{_qt4_libdir}/libQtAssistantClient.so.*
@@ -841,6 +852,12 @@ gtk-update-icon-cache -q %{_datadir}/ico
%changelog
+* Sat May 30 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.5.1-13
+- -doc: Obsoletes: qt-doc < 1:4.5.1-4 (workaround bug #502401)
+
+* Sat May 23 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.5.1-12
+- +phonon_internal macro to toggle packaging of qt's phonon (default off)
+
* Fri May 22 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.5.1-11
- qt-copy-patches-20090522
More information about the fedora-extras-commits
mailing list