[packages/kdelibs/dev-trinity] drop dozen of outdated obsoletes/conflicts

glen glen at pld-linux.org
Tue Jun 3 21:29:41 CEST 2014


commit 462571291a482800e84e1c8ff5096ec0edf88e97
Author: Elan Ruusamäe <glen at delfi.ee>
Date:   Tue Jun 3 22:28:57 2014 +0300

    drop dozen of outdated obsoletes/conflicts

 kdelibs.spec | 62 ------------------------------------------------------------
 1 file changed, 62 deletions(-)
---
diff --git a/kdelibs.spec b/kdelibs.spec
index 59ba1ec..171faa0 100644
--- a/kdelibs.spec
+++ b/kdelibs.spec
@@ -127,59 +127,6 @@ Requires:	libxml2-progs
 Requires:	qt >= 6:3.3.3-4
 Requires:	setup >= 2.4.6-7
 Requires:	xorg-app-iceauth
-Obsoletes:	arts-kde
-Obsoletes:	kde-theme-keramik
-Obsoletes:	kdelibs-kabc
-Obsoletes:	kdelibs-libs < 9:3.5.10-17
-Obsoletes:	kdelibs-shared
-Obsoletes:	kdelibs-sound
-Obsoletes:	kdelibs2
-Obsoletes:	kdelibs2-sound
-Obsoletes:	kdesupport
-Obsoletes:	kdesupport-devel
-Obsoletes:	kdesupport-mimelib
-Obsoletes:	kdesupport-mimelib-devel
-Obsoletes:	kdesupport-mimelib-static
-Obsoletes:	kdesupport-static
-Obsoletes:	kimproxy
-# No longer supported/existing
-Obsoletes:	arts-message
-Obsoletes:	kde-sdscreen-KDEGirl
-Obsoletes:	kde-sdscreen-default
-Obsoletes:	kde-splash-KDEGirl < 03-5
-Obsoletes:	kde-splash-default
-Obsoletes:	kde-splash-keramik
-Obsoletes:	kdeadmin-kwuftpd
-Obsoletes:	kdeadmin-kxconfig
-Obsoletes:	kdebase-kwmtheme
-Obsoletes:	kdebase-mailnews
-Obsoletes:	kdeedu-kgeo
-Obsoletes:	kdegames-megami
-Obsoletes:	kdenetwork-kmail
-Obsoletes:	kdenetwork-knode
-Obsoletes:	kdenetwork-kxmlrpcd
-Obsoletes:	kdepim-commonlibs
-Obsoletes:	kdepim-kaplan
-# More
-Obsoletes:	kde-style-plastik
-Obsoletes:	kdepim-kaddressbook < 3:3.1.91.030918-1
-Obsoletes:	kdepim-kmail < 3:3.1.91.030918-1
-Obsoletes:	kdepim-kontact < 3:3.1.91.030918-1
-Obsoletes:	kdepim-korganizer < 3:3.1.91.030918-1
-Obsoletes:	kdepim-libkcal < 3:3.1.91.030918-1
-Obsoletes:	kdepim-libkdenetwork < 3:3.1.91.030918-1
-Obsoletes:	kdepim-libkdepim < 3:3.2.90
-Obsoletes:	kdetoys-kaphorism < 9:3.2.0
-Obsoletes:	openoffice-mimelinks
-Conflicts:	kaffeine <= 0.5-1
-Conflicts:	kdeaddons-konqueror < 1:3.4.0
-Conflicts:	kdebase-core < 9:3.4.0
-Conflicts:	kdenetwork-kit < 10:3.3.0
-Conflicts:	kdepim-devel < 3:3.2.90
-Conflicts:	kmplayer <= 2:0.8.4-1
-Conflicts:	kplayer < 0.5.1-5
-Conflicts:	pixieplus < 0.3-4
-Conflicts:	sim < 0.9.3-4
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %define		_libexecdir	%{_libdir}/kde3
@@ -265,13 +212,6 @@ Requires:	pcre-devel
 Requires:	qt-devel >= 6:3.3.3-4
 Requires:	xorg-lib-libXmu-devel
 Requires:	xorg-lib-libXt-devel
-Obsoletes:	arts-kde-devel
-Obsoletes:	kdelibs-sound-devel
-Obsoletes:	kdelibs-static
-Obsoletes:	kdelibs2-devel
-Obsoletes:	kdelibs2-sound-devel
-Obsoletes:	kttsd-devel
-Conflicts:	kdebase-devel <= 9:3.1.90
 
 %description devel
 This package contains header files and development documentation for
@@ -297,7 +237,6 @@ Summary:	API documentation
 Summary(pl.UTF-8):	Dokumentacja API
 Group:		Documentation
 Requires:	%{name} = %{epoch}:%{version}-%{release}
-Obsoletes:	kttsd-apidocs
 
 %description apidocs
 Annotated reference of KDE libraries programming interface including:
@@ -316,7 +255,6 @@ Summary:	Program used to display aRts daemon messages
 Summary(pl.UTF-8):	Program do wyświetlania komunikatów demona aRts
 Group:		Applications
 Requires:	%{name} = %{epoch}:%{version}-%{release}
-Obsoletes:	arts-message
 
 %description artsmessage
 This program is run when a -m option argument is passed to aRts
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/kdelibs.git/commitdiff/462571291a482800e84e1c8ff5096ec0edf88e97



More information about the pld-cvs-commit mailing list