- -common: Conflicts: kdebase-runtime < 4.5.80

- drop some old pre-f13 era Conflicts
This commit is contained in:
Rex Dieter 2010-12-10 13:09:15 -06:00
parent 9d96f580c2
commit 8e763e0ac4
1 changed files with 7 additions and 7 deletions

View File

@ -16,7 +16,7 @@
Summary: KDE Libraries
Version: 4.5.85
Release: 3%{?dist}
Release: 4%{?dist}
Name: kdelibs
Epoch: 6
@ -185,18 +185,14 @@ Libraries for KDE 4.
%package common
Group: System Environment/Libraries
Summary: Common files for KDE 3 and KDE 4 libraries
# some files moved kdebase-runtime -> here
Conflicts: kdebase-runtime < 4.5.80
%description common
This package includes the common files for the KDE 3 and KDE 4 libraries.
%package devel
Group: Development/Libraries
Summary: Header files for compiling KDE 4 applications
# stuff moved, help upgrade path
%if 0%{?fedora} && 0%{?fedora} < 13
Conflicts: kdebase-workspace-devel < 4.3.80
Obsoletes: kdelibs-experimental-devel < 4.3.75
Provides: kdelibs-experimental-devel = %{version}-%{release}
%endif
%if 0%{?fedora} && 0%{?fedora} < 15
Obsoletes: webkitkde-devel < 0.0.6
%endif
@ -529,6 +525,10 @@ rm -rf %{buildroot}
%changelog
* Fri Dec 10 2010 Rex Dieter <rdieter@fedoraproject.org> - 4.5.85-4
- -common: Conflicts: kdebase-runtime < 4.5.80
- drop some old pre-f13 era Conflicts
* Fri Dec 10 2010 Kevin Kofler <Kevin@tigcc.ticalc.org> - 4.5.85-3
- fix FindQt4.cmake when there's also qt3-devel installed (#661996)