rpms/qt/devel qt.spec,1.206,1.207

Rex Dieter (rdieter) fedora-extras-commits at redhat.com
Wed Aug 6 13:11:07 UTC 2008


Author: rdieter

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

Modified Files:
	qt.spec 
Log Message:
- fix Obsoletes: qt-sqlite (missing epoch)



Index: qt.spec
===================================================================
RCS file: /cvs/pkgs/rpms/qt/devel/qt.spec,v
retrieving revision 1.206
retrieving revision 1.207
diff -u -r1.206 -r1.207
--- qt.spec	6 Aug 2008 10:46:33 -0000	1.206
+++ qt.spec	6 Aug 2008 13:10:37 -0000	1.207
@@ -4,6 +4,7 @@
 Summary: Qt toolkit
 %if 0%{?fedora} > 8
 Name:    qt
+Epoch:   1
 %else
 Name:    qt4
 %endif
@@ -18,7 +19,6 @@
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 %if "%{name}" != "qt4"
-Epoch: 1
 Obsoletes: qt4 < %{version}-%{release}
 Provides: qt4 = %{version}-%{release}
 %endif
@@ -148,8 +148,8 @@
 Obsoletes: qt4-sqlite < %{version}-%{release}
 Provides: qt4-sqlite = %{version}-%{release}
 %if "%{name}" == "qt"
-Obsoletes: qt-sqlite < %{version}-%{release}
-Provides: qt-sqlite = %{version}-%{release}
+Obsoletes: qt-sqlite < %{?epoch:%{epoch}:}%{version}-%{release}
+Provides: qt-sqlite = %{?epoch:%{epoch}:}%{version}-%{release}
 %endif
 
 %description 
@@ -728,6 +728,7 @@
 %changelog
 * Wed Aug 06 2008 Than Ngo <than at redhat.com> -  4.4.1-2
 - fix license tag
+- fix Obsoletes: qt-sqlite (missing epoch)
 
 * Tue Aug 05 2008 Than Ngo <than at redhat.com> -  4.4.1-1
 - 4.4.1




More information about the fedora-extras-commits mailing list