rpms/qt-assistant-adp/devel qt-assistant-adp.spec,1.2,1.3

[Rex Dieter]

Author: rdieter

Update of /cvs/pkgs/rpms/qt-assistant-adp/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1154

Modified Files:
	qt-assistant-adp.spec 
Log Message:
* Tue Mar 16 2010 Rex Dieter <rdieter at fedoraproject.org> - 4.6.2-2
- use versioned BR/Requires to avoid Conflicts



Index: qt-assistant-adp.spec
===================================================================
RCS file: /cvs/pkgs/rpms/qt-assistant-adp/devel/qt-assistant-adp.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- qt-assistant-adp.spec	16 Mar 2010 15:15:57 -0000	1.2
+++ qt-assistant-adp.spec	16 Mar 2010 15:30:10 -0000	1.3
@@ -1,7 +1,7 @@
 Summary: Compatibility version of Qt Assistant
 Name:    qt-assistant-adp
 Version: 4.6.2
-Release: 1%{?dist}
+Release: 2%{?dist}
 
 # See LGPL_EXCEPTIONS.txt, LICENSE.GPL3, respectively, for exception details
 License: LGPLv2 with exceptions or GPLv3 with exceptions
@@ -10,12 +10,8 @@ Url: http://qt.nokia.com/doc/4.6/qassist
 Source: http://get.qt.nokia.com/qt/source/qt-everywhere-opensource-src-%{version}.tar.gz
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-# This was included in qt-x11 up to 4.6.x.
-Conflicts: qt4-x11 < 4.7
-# Translations were included in qt up to 4.6.x.
-Conflicts: qt4 < 4.7
-
-BuildRequires: qt4-devel
+BuildRequires: qt4-devel >= 4.7.0
+%{?_qt4_version:Requires: qt4%{?_isa} >= %{_qt4_version}}
 
 %description
 The old version of Qt Assistant, based on Assistant Document Profile (.adp)
@@ -30,8 +26,6 @@ New applications should use the new vers
 Summary: Development files for the compatibility QAssistantClient
 Group: Development/Libraries
 Requires: %{name}%{?_isa} = %{?epoch:%{epoch}:}%{version}-%{release}
-# This was included in qt-devel up to 4.6.x.
-Conflicts: qt4-devel < 4.7
 Requires: qt4-devel
 
 %description devel
@@ -134,5 +128,8 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Tue Mar 16 2010 Rex Dieter <rdieter at fedoraproject.org> - 4.6.2-2
+- use versioned BR/Requires to avoid Conflicts
+
 * Sat Mar 13 2010 Kevin Kofler <Kevin at tigcc.ticalc.org> - 4.6.2-1
 - first Fedora package