diff --git a/kdelibs.spec b/kdelibs.spec index 30bef97..49de89b 100644 --- a/kdelibs.spec +++ b/kdelibs.spec @@ -8,7 +8,7 @@ Summary: KDE Libraries Version: 4.4.2 -Release: 2%{?dist} +Release: 3%{?dist} Name: kdelibs Epoch: 6 @@ -111,7 +111,7 @@ BuildRequires: automoc4 >= 0.9.88 BuildRequires: avahi-devel BuildRequires: bison flex BuildRequires: bzip2-devel -BuildRequires: cmake >= 2.6.2-3 +BuildRequires: cmake >= 2.6.4 BuildRequires: cups-devel cups BuildRequires: enchant-devel BuildRequires: gamin-devel @@ -153,7 +153,7 @@ Provides: kross(qtscript) = %{version}-%{release} Provides: kdelibs-experimental = %{version}-%{release} Obsoletes: kdelibs-experimental < 4.3.75 -%if 0%{?fedora} && 0%{?fedora} < 13 +%if 0%{?fedora} && 0%{?fedora} < 15 Obsoletes: webkitkde < 0.0.6 %endif @@ -175,20 +175,20 @@ Conflicts: kdebase-runtime < 4.2.90 %endif %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 Provides: plasma-devel = %{version}-%{release} Requires: %{name} = %{?epoch:%{epoch}:}%{version}-%{release} Obsoletes: kdelibs4-devel < %{version}-%{release} Provides: kdelibs4-devel = %{version}-%{release} %{?_isa:Provides: kdelibs4-devel%{?_isa} = %{version}-%{release}} -Provides: kdelibs-experimental-devel = %{version}-%{release} -%if 0%{?fedora} && 0%{?fedora} < 13 -Obsoletes: kdelibs-experimental-devel < 4.3.75 -Obsoletes: webkitkde-devel < 0.0.3 -%endif Requires: attica-devel >= %{attica_ver} Requires: automoc4 >= 0.9.88 -Requires: cmake >= 2.6.2-3 +Requires: cmake >= 2.6.4 Requires: openssl-devel Requires: phonon-devel Provides: nepomuk-devel = %{version}-%{release} @@ -431,6 +431,10 @@ rm -rf %{buildroot} %changelog +* Thu Apr 15 2010 Rex Dieter - 6:4.4.2-3 +- cleanup/fix webkitkde Obsoletes a bit more (#582469) +- (Build)Requies: cmake >= 2.6.4 + * Fri Apr 09 2010 Rex Dieter - 6:4.4.2-2 - Obsoletes: webkitkde < 0.0.6 (#576634)