rpms/qt4/devel qt4.spec,1.76,1.77

[Rex Dieter (rdieter)]

Author: rdieter

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

Modified Files:
	qt4.spec 
Log Message:
* Fri Dec 21 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 4.3.3-2
- -doc: Requires: %name-assistant, omit assistant bin, 
  -x11: Provides: %name-assistant (#147948)



Index: qt4.spec
===================================================================
RCS file: /cvs/pkgs/rpms/qt4/devel/qt4.spec,v
retrieving revision 1.76
retrieving revision 1.77
diff -u -r1.76 -r1.77
--- qt4.spec	5 Dec 2007 23:59:37 -0000	1.76
+++ qt4.spec	21 Dec 2007 18:12:45 -0000	1.77
@@ -4,7 +4,7 @@
 Summary: Qt toolkit
 Name:	 qt4
 Version: 4.3.3
-Release: 1%{?dist}
+Release: 2%{?dist}
 
 # GPLv2+exceptions(see GPL_EXCEPTIONS*.txt)
 License: GPLv2
@@ -160,7 +160,7 @@
 Summary: API documentation, demos and example programs for %{name}
 Group: Documentation
 Requires: %{name} = %{version}-%{release}
-Provides: %{name}-assistant = %{version}-%{release}
+Requires: %{name}-assistant
 
 %description doc
 %{summary}.  Includes:
@@ -209,6 +209,7 @@
 %package x11
 Summary: Qt GUI-related libraries
 Group: System Environment/Libraries
+Provides: %{name}-assistant = %{version}-%{release}
 Requires: %{name} = %{version}-%{release}
 Requires: redhat-rpm-config rpm
 
@@ -603,9 +604,7 @@
 %{_qt4_prefix}/doc
 %{_qt4_demosdir}/
 %{_qt4_examplesdir}/
-# Qt Assistant
-%{_qt4_bindir}/assistant*
-%{_bindir}/assistant*
+# Qt Assistant (bin moved to -x11)
 %{_datadir}/applications/*assistant*.desktop
 # Qt Demo
 %{_qt4_bindir}/qt*demo*
@@ -638,6 +637,10 @@
 
 
 %changelog
+* Fri Dec 21 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 4.3.3-2
+- -doc: Requires: %%name-assistant, omit assistant bin, 
+  -x11: Provides: %%name-assistant (#147948)
+
 * Wed Dec 05 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 4.3.3-1
 - qt-4.3.3