rpms/qt4/devel qt4.spec,1.68,1.69

[Rex Dieter (rdieter)]

Author: rdieter

Update of /cvs/pkgs/rpms/qt4/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14810

Modified Files:
	qt4.spec 
Log Message:
* Fri Sep 14 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 4.3.1-8
- -x11: Req: redhat-rpm-config rpm, app-wrapper/multilib fun (#277581)



Index: qt4.spec
===================================================================
RCS file: /cvs/pkgs/rpms/qt4/devel/qt4.spec,v
retrieving revision 1.68
retrieving revision 1.69
diff -u -r1.68 -r1.69
--- qt4.spec	13 Sep 2007 19:19:19 -0000	1.68
+++ qt4.spec	14 Sep 2007 17:57:23 -0000	1.69
@@ -4,7 +4,7 @@
 Summary: Qt toolkit
 Name:	 qt4
 Version: 4.3.1
-Release: 7%{?dist}
+Release: 8%{?dist}
 
 # GPLv2+exceptions(see GPL_EXCEPTIONS*.txt)
 License: GPLv2
@@ -146,7 +146,6 @@
 Requires: libpng-devel
 Requires: libjpeg-devel
 Requires: pkgconfig
-Requires: rpm
 Obsoletes: %{name}-designer < %{version}-%{release}
 Provides:  %{name}-designer = %{version}-%{release}
 %if "%{name}" != "qt4"
@@ -213,6 +212,7 @@
 Summary: Qt GUI-related libraries
 Group: System Environment/Libraries
 Requires: %{name} = %{version}-%{release}
+Requires: redhat-rpm-config rpm
 
 %description x11
 Qt libraries which are used for drawing widgets and OpenGL items.
@@ -529,6 +529,7 @@
 
 %files x11 
 %defattr(-,root,root,-)
+%{_sysconfdir}/rpm/macros.*
 %{_qt4_libdir}/libQt3Support.so.*
 %{_qt4_libdir}/libQtAssistantClient.so.*
 %{_qt4_libdir}/libQtDesigner.so.*
@@ -548,7 +549,6 @@
 %files devel
 %defattr(-,root,root,-)
 #config /etc/profile.d/*
-%{_sysconfdir}/rpm/macros.*
 %{_qt4_bindir}/lrelease*
 %{_qt4_bindir}/lupdate*
 %{_qt4_bindir}/moc*
@@ -634,6 +634,9 @@
 
 
 %changelog
+* Fri Sep 14 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 4.3.1-8
+- -x11: Req: redhat-rpm-config rpm, app-wrapper/multilib fun (#277581)
+
 * Thu Sep 13 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 4.3.1-7
 - include qt4-logo icon, used by qtdemo/qtconfig (#241452)
 - linguist.desktop: use new linguist4 icons