rpms/qt/F-9 qt.spec,1.182,1.183
Rex Dieter (rdieter)
fedora-extras-commits at redhat.com
Wed Aug 6 13:14:07 UTC 2008
Author: rdieter
Update of /cvs/pkgs/rpms/qt/F-9
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5309
Modified Files:
qt.spec
Log Message:
Index: qt.spec
===================================================================
RCS file: /cvs/pkgs/rpms/qt/F-9/qt.spec,v
retrieving revision 1.182
retrieving revision 1.183
diff -u -r1.182 -r1.183
--- qt.spec 6 Aug 2008 13:06:31 -0000 1.182
+++ qt.spec 6 Aug 2008 13:13:37 -0000 1.183
@@ -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
@@ -726,8 +726,9 @@
%changelog
-* Wed Aug 06 2008 Than Ngo <than at redhat.com> - 4.4.1-2
-- fix License tag
+* 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