diff --git a/kdelibs.spec b/kdelibs.spec index c1c8c8e..128ef24 100644 --- a/kdelibs.spec +++ b/kdelibs.spec @@ -8,7 +8,7 @@ Summary: KDE Libraries Version: 4.4.1 -Release: 7%{?dist} +Release: 8%{?dist} Name: kdelibs Epoch: 6 @@ -159,6 +159,10 @@ Provides: kross(qtscript) = %{version}-%{release} Provides: kdelibs-experimental = %{version}-%{release} Obsoletes: kdelibs-experimental < 4.3.75 +%if 0%{?fedora} && 0%{?fedora} < 13 +Obsoletes: webkitkde < 0.0.3 +%endif + %description Libraries for KDE 4. @@ -183,9 +187,11 @@ Requires: %{name} = %{?epoch:%{epoch}:}%{version}-%{release} Obsoletes: kdelibs4-devel < %{version}-%{release} Provides: kdelibs4-devel = %{version}-%{release} %{?_isa:Provides: kdelibs4-devel%{?_isa} = %{version}-%{release}} -Obsoletes: kdelibs-experimental-devel < 4.3.75 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 @@ -200,9 +206,6 @@ Requires: strigi-devel Requires: bzip2-devel gamin-devel libacl-devel %{?x_deps:Requires: %{x_deps}} -Provides: kdelibs-experimental-devel = %{version}-%{release} -Obsoletes: kdelibs-experimental-devel < %{version}-%{release} - %description devel This package includes the header files you will need to compile applications for KDE 4. @@ -436,6 +439,9 @@ rm -rf %{buildroot} %changelog +* Wed Mar 24 2010 Rex Dieter 6:4.4.1-8 +- Obsoletes: webkitkde (#576634) + * Sat Mar 20 2010 Rex Dieter 6:4.4.1-7 - KDE default in noisy debug mode to stdout/stderr (kde#227089) - backport trunk/ fix building against qt-4.7