Conflicts: kdelibs3 < 3.5.10-42

This commit is contained in:
Rex Dieter 2012-12-20 21:12:50 -06:00
parent 13bf6ac3ac
commit 23897b390c
1 changed files with 6 additions and 3 deletions

View File

@ -23,7 +23,7 @@
Summary: KDE Libraries
Version: 4.9.95
Release: 1%{?dist}
Release: 2%{?dist}
Name: kdelibs
Epoch: 6
@ -153,8 +153,8 @@ Patch200: kdelibs-4.3.1-CVE-2009-2702.patch
# rhel patches
Patch300: kdelibs-4.8.3-webkit.patch
# kmailservice moved here
Conflicts: kdelibs3 < 3.5.10-38
# kmailservice/ktelnetservice moved here
Conflicts: kdelibs3 < 3.5.10-42
BuildRequires: qt4-devel >= %{qt4_ver}
%if 0%{?fedora}
@ -555,6 +555,9 @@ gtk-update-icon-cache %{_kde4_iconsdir}/hicolor &> /dev/null || :
%changelog
* Thu Dec 20 2012 Rex Dieter <rdieter@fedoraproject.org> 6:4.9.95-2
- Conflicts: kdelibs3 < 3.5.10-42
* Wed Dec 19 2012 Rex Dieter <rdieter@fedoraproject.org> - 6:4.9.95-1
- 4.9.95