[kdelibs] 6:4.8.97-6

[Rex Dieter]

commit 2f1030de8b765077543685b765f2c19f18429bf6
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Sat Jul 21 17:49:44 2012 -0500

    6:4.8.97-6
    
    - -devel: move only conflicting lib symlinks to kde4/devel
    - drop old Conflicts/Obsoletes

 kdelibs.spec |   50 +++++++++++++-------------------------------------
 1 files changed, 13 insertions(+), 37 deletions(-)
---
diff --git a/kdelibs.spec b/kdelibs.spec
index 3c5954b..39d54f1 100644
--- a/kdelibs.spec
+++ b/kdelibs.spec
@@ -25,7 +25,7 @@
 
 Summary: KDE Libraries
 Version: 4.8.97
-Release: 5%{?dist}
+Release: 6%{?dist}
 
 Name: kdelibs
 Epoch: 6
@@ -156,14 +156,6 @@ Patch200: kdelibs-4.3.1-CVE-2009-2702.patch
 # rhel patches
 Patch300: kdelibs-4.8.3-webkit.patch
 
-# force upgrade of apps using the discontinued KatePart Smart* interfaces to
-# versions using the new Moving* interfaces instead
-# conditionize these?  how long to carry them?  -- rex
-Conflicts: kdevplatform < 1.1.80
-Conflicts: kdevelop < 9:4.1.80
-# 2.1-0.9.b4.fc15 is the first build with the fix from beta 5 backported
-Conflicts: kile < 2.1-0.9
-Conflicts: rkward < 0.5.4
 # kmailservice moved here
 Conflicts: kdelibs3 < 3.5.10-38
 
@@ -209,12 +201,11 @@ BuildRequires: pkgconfig(phonon) >= %{phonon_ver}
 BuildRequires: pkgconfig(polkit-qt-1)
 BuildRequires: pkgconfig(qca2)
 BuildRequires: pkgconfig(shared-desktop-ontologies) >= %{shared_desktop_ontologies_ver} 
+BuildRequires: pkgconfig(shared-mime-info)
 BuildRequires: pkgconfig(soprano) >= %{soprano_ver}
-BuildRequires: shared-mime-info
-BuildRequires: zlib-devel
+BuildRequires: pkgconfig(zlib)
 # extra X deps (seemingly needed and/or checked-for by most kde4 buildscripts)
-#define x_deps libSM-devel libXcomposite-devel libXdamage-devel libxkbfile-devel libXpm-devel libXScrnSaver-devel libXtst-devel libXv-devel libXxf86misc-devel
-%define x_deps pkgconfig(sm) pkgconfig(xcomposite) pkgconfig(xdamage) pkgconfig(xkbfile) pkgconfig(xpm) pkgconfig(xscrnsaver) pkgconfig(xtst) pkgconfig(xv) pkgconfig(xxf86misc)
+%define x_deps pkgconfig(sm) pkgconfig(xcomposite) pkgconfig(xdamage) pkgconfig(xkbfile) pkgconfig(xpm) pkgconfig(xproto) pkgconfig(xscrnsaver) pkgconfig(xtst) pkgconfig(xv) pkgconfig(xxf86misc)
 %{?x_deps:BuildRequires: %{x_deps}}
 
 Requires: %{?udisks} upower
@@ -227,19 +218,11 @@ BuildRequires: graphviz
 BuildRequires: qt4-doc
 %endif
 
+Provides: katepart = %{version}-%{release}
+Provides: katepart%{?_isa} = %{version}-%{release}
 Provides: kross(javascript) = %{version}-%{release}
 Provides: kross(qtscript) = %{version}-%{release}
 
-Provides: kdelibs-experimental = %{version}-%{release} 
-Obsoletes: kdelibs-experimental < 4.3.75 
-
-Provides: katepart = %{version}-%{release}
-# not sure this one is needed -- rex
-%{?_isa:Provides: katepart%{?_isa} = %{version}-%{release}}
-
-%if 0%{?fedora} && 0%{?fedora} < 15
-Obsoletes: webkitkde < 0.0.6
-%endif
 
 %description
 Libraries for KDE 4.
@@ -255,15 +238,12 @@ 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
-%if 0%{?fedora} && 0%{?fedora} < 15
-Obsoletes: webkitkde-devel < 0.0.6
-%endif
 Provides: plasma-devel = %{version}-%{release}
 Provides: nepomuk-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:  kdelibs4-devel%{?_isa} = %{version}-%{release}
 Requires: automoc4 >= 0.9.88
 Requires: cmake >= 2.6.4
 Requires: pkgconfig(libattica) >= %{attica_ver} 
@@ -275,10 +255,6 @@ Requires: qt4-devel
 %if 0%{?fedora}
 Requires: pkgconfig(QtWebKit)
 %endif
-# do we really still need all these below? -- Rex
-Requires: pkgconfig(libstreams)
-Requires: pkgconfig(gamin)
-Requires: bzip2-devel libacl-devel
 %{?x_deps:Requires: %{x_deps}}
 
 %description devel
@@ -288,8 +264,6 @@ applications for KDE 4.
 %package apidocs
 Group: Development/Documentation
 Summary: KDE 4 API documentation
-# Not strictly required -- Rex
-# Requires: %{name} = %{?epoch:%{epoch}:}%{version}
 Requires: kde-filesystem
 Provides: kdelibs4-apidocs = %{version}-%{release}
 BuildArch: noarch
@@ -301,8 +275,6 @@ format for easy browsing.
 %package apidocs-qch
 Group: Development/Documentation
 Summary: KDE 4 API documentation for Qt Assistant
-# Not strictly required -- Rex
-# Requires: %{name} = %{?epoch:%{epoch}:}%{version}
 # Directory ownership (%{_qt4_docdir}/qch)
 Requires: qt4
 Provides: kdelibs4-apidocs-qch = %{version}-%{release}
@@ -432,8 +404,8 @@ do
   case "$i" in
     libkdeinit4_*.so)
       ;;
-    ## FIXME/TODO: imo, should leave everything except for known-conflicts -- Rex
-    *)
+    # conflicts with kdelibs3
+    libkdecore.so|libkdefakes.so|libkdesu.so|libkdeui.so|libkhtml.so|libkimproxy.so|libkio.so|libkjs.so|libkmediaplayer.so|libkntlm.so|libkparts.so|libktexteditor.so|libkunittest.so|libkutils.so)
       linktarget=`readlink "$i"`
       rm -f "$i"
       ln -sf "../../$linktarget" "kde4/devel/$i"
@@ -622,6 +594,10 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Sat Jul 21 2012 Rex Dieter <rdieter at fedoraproject.org> - 6:4.8.97-6
+- -devel: move only conflicting lib symlinks to kde4/devel 
+- drop old Conflicts/Obsoletes
+
 * Wed Jul 18 2012 Lukas Tinkl <ltinkl at redhat.com> - 6:4.8.97-5
 - respin the udisks2 backend patch
 - fix k3b not recognizing any CD/DVD burning device