SPECS: kde4-kdenetwork.spec - fix Rs - kill kde3 stuff

shadzik shadzik at pld-linux.org
Sat Feb 2 02:53:45 CET 2008


Author: shadzik                      Date: Sat Feb  2 01:53:45 2008 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- fix Rs
- kill kde3 stuff

---- Files affected:
SPECS:
   kde4-kdenetwork.spec (1.13 -> 1.14) 

---- Diffs:

================================================================
Index: SPECS/kde4-kdenetwork.spec
diff -u SPECS/kde4-kdenetwork.spec:1.13 SPECS/kde4-kdenetwork.spec:1.14
--- SPECS/kde4-kdenetwork.spec:1.13	Sat Feb  2 02:41:57 2008
+++ SPECS/kde4-kdenetwork.spec	Sat Feb  2 02:53:39 2008
@@ -108,9 +108,7 @@
 Requires:	%{name}-libkopete_oscar = %{epoch}:%{version}-%{release}
 Requires:	%{name}-libkopete_videodevice = %{epoch}:%{version}-%{release}
 Requires:	%{name}-librss = %{epoch}:%{version}-%{release}
-Requires:	kdelibs4-devel >= %{_minlibsevr}
-Obsoletes:	kdenetwork-librss-devel
-Obsoletes:	kdenetwork-rss-devel
+Requires:	kde4-kdelibs-devel >= %{_minlibsevr}
 
 %description devel
 kdenetwork header files.
@@ -126,8 +124,7 @@
 Summary:	File sharing plugins
 Summary(pl.UTF-8):	Wtyczki obsługujące współdzielenie plików
 Group:		X11/Applications
-Requires:	kdebase4-core >= %{_minlibsevr}
-Obsoletes:	kcm_sambaconf
+Requires:	kde4-kdebase-core >= %{_minlibsevr}
 
 %description filesharing
 File sharing plugins.
@@ -151,8 +148,7 @@
 Summary:	KDE Internet Daemon
 Summary(pl.UTF-8):	Demon internetowy KDE
 Group:		X11/Applications
-Requires:	kdelibs4 >= %{_minlibsevr}
-Obsoletes:	kdenetwork-krfb < 9:3.1-6
+Requires:	kde4-kdelibs >= %{_minlibsevr}
 
 %description kinetd
 A KDE daemon that listen on TCP ports and starts programs when a
@@ -184,7 +180,7 @@
 Summary:	File downloand manager
 Summary(pl.UTF-8):	Zarządca ściągania plików
 Group:		X11/Applications
-Requires:	kdebase4-core >= %{_minbaseevr}
+Requires:	kde4-kdebase-core >= %{_minbaseevr}
 
 %description kget
 A GetRight-like file download manager with resuming support and
@@ -222,8 +218,7 @@
 Summary(pl.UTF-8):	Komunikator obsługujący wiele protokołów
 Group:		X11/Applications
 Requires:	%{name}-libkopete = %{epoch}:%{version}-%{release}
-Requires:	kdebase4-core >= %{_minbaseevr}
-Obsoletes:	kdenetwork-kit
+Requires:	kde4-kdebase-core >= %{_minbaseevr}
 Obsoletes:	kopete
 Obsoletes:	kopete-plugin-protocols-aim
 Obsoletes:	kopete-plugin-protocols-gg
@@ -471,7 +466,6 @@
 Group:		X11/Applications/Networking
 Requires:	%{name}-kopete = %{epoch}:%{version}-%{release}
 Obsoletes:	kopete-tool-alias
-Conflicts:	kdenetwork-kopete < 10:3.2.90.040312-1
 
 %description kopete-tool-alias
 Kopete plugin to add custom aliases for commands.
@@ -484,7 +478,6 @@
 Summary(pl.UTF-8):	Wtyczka Kopete do automatycznego przechodzenia w stan zajęty
 Group:		X11/Applications/Networking
 Requires:	%{name}-kopete = %{epoch}:%{version}-%{release}
-Obsoletes:	kopete-tool-avdeviceconfig
 
 %description kopete-tool-avdeviceconfig
 Kopete plugin which automatically changes status to away. Conditions
@@ -499,7 +492,6 @@
 Summary(pl.UTF-8):	Wtyczka Kopete do automatycznego przechodzenia w stan zajęty
 Group:		X11/Applications/Networking
 Requires:	%{name}-kopete = %{epoch}:%{version}-%{release}
-Obsoletes:	kopete-tool-smpppdcs
 
 %description kopete-tool-smpppdcs
 Kopete plugin which automatically changes status to away. Conditions
@@ -514,7 +506,6 @@
 Summary(pl.UTF-8):	Wtyczka Kopete do automatycznej zamiany tekstu
 Group:		X11/Applications/Networking
 Requires:	%{name}-kopete = %{epoch}:%{version}-%{release}
-Obsoletes:	kopete-tool-autoreplace
 
 %description kopete-tool-autoreplace
 Kopete plugin which autoreplaces some text you can choose.
@@ -527,9 +518,6 @@
 Summary(pl.UTF-8):	Wykrywacz połączeń internetowych dla Kopete
 Group:		X11/Applications/Networking
 Requires:	%{name}-kopete = %{epoch}:%{version}-%{release}
-Provides:	kdenetwork-kopete-tool-conectionstatus
-Obsoletes:	kdenetwork-kopete-tool-conectionstatus
-Obsoletes:	kopete-tool-connectionstatus
 
 %description kopete-tool-connectionstatus
 Kopete tool which automatically detects whether the internet
@@ -583,8 +571,6 @@
 Summary(pl.UTF-8):	Wtyczka Kopete renderująca tekst w formacie LaTeXa
 Group:		X11/Applications/Networking
 Requires:	%{name}-kopete = %{epoch}:%{version}-%{release}
-Obsoletes:	kopete-tool-latex
-Conflicts:	kdenetwork-kopete < 10:3.4.89-1
 
 %description kopete-tool-latex
 A LaTeX plugin for Kopete.
@@ -597,7 +583,6 @@
 Summary(pl.UTF-8):	Wtyczka Kopete obsługująca historię rozmów
 Group:		X11/Applications/Networking
 Requires:	%{name}-kopete = %{epoch}:%{version}-%{release}
-Obsoletes:	kopete-tool-history
 
 %description kopete-tool-history
 A history plugin for Kopete.
@@ -610,7 +595,6 @@
 Summary(pl.UTF-8):	Importer kontaktów dla Kopete
 Group:		X11/Applications/Networking
 Requires:	%{name}-kopete = %{epoch}:%{version}-%{release}
-Obsoletes:	kopete-tool-importer
 
 %description kopete-tool-importer
 Kopete tool which allows importing contacts from other instant
@@ -625,7 +609,6 @@
 Summary(pl.UTF-8):	Wtyczka Kopete zmieniająca status na zajęty jeśli nie wykrywa ruchu wokół komputera
 Group:		X11/Applications/Networking
 Requires:	%{name}-kopete = %{epoch}:%{version}-%{release}
-Obsoletes:	kopete-tool-motionaway
 
 %description kopete-tool-motionaway
 This Kopete plugin sets away status when not detecting movement near
@@ -640,7 +623,6 @@
 Summary(pl.UTF-8):	Informator o playliście dla Kopete
 Group:		X11/Applications/Networking
 Requires:	%{name}-kopete = %{epoch}:%{version}-%{release}
-Obsoletes:	kopete-tool-nowlistening
 
 %description kopete-tool-nowlistening
 This Kopete plugin tells selected live chats what you're currently
@@ -655,7 +637,6 @@
 Summary(pl.UTF-8):	Wtyczka Kopete sprawdzająca pisownie
 Group:		X11/Applications/Networking
 Requires:	%{name}-kopete = %{epoch}:%{version}-%{release}
-Obsoletes:	kopete-tool-spellcheck
 
 %description kopete-tool-spellcheck
 A spell checking plugin for Kopete.
@@ -668,7 +649,6 @@
 Summary(pl.UTF-8):	Wtyczka Kopete dodająca ładne efekty do wiadomości
 Group:		X11/Applications/Networking
 Requires:	%{name}-kopete = %{epoch}:%{version}-%{release}
-Obsoletes:	kopete-tool-texteffect
 
 %description kopete-tool-texteffect
 Kopete plugin that adds nice effects to your messages.
@@ -681,7 +661,6 @@
 Summary(pl.UTF-8):	Wtyczka Kopete wykorzystująca babelfish do tłumaczenia wiadomości
 Group:		X11/Applications/Networking
 Requires:	%{name}-kopete = %{epoch}:%{version}-%{release}
-Obsoletes:	kopete-tool-translator
 
 %description kopete-tool-translator
 This Kopete plugin uses web translating engines (like Altavista's
@@ -697,7 +676,6 @@
 Requires:	%{name}-kopete = %{epoch}:%{version}-%{release}
 Requires:	libxml2 >= 2.4.8
 Requires:	libxslt >= 1.0.7
-Obsoletes:	kopete-tool-webpresence
 
 %description kopete-tool-webpresence
 This Kopete plugin shows the status of your IM accounts on a webpage.
@@ -756,7 +734,7 @@
 Summary(pl.UTF-8):	Program do połączeń modemowych dla KDE
 Summary(pt_BR.UTF-8):	O discador para Internet
 Group:		X11/Applications
-Requires:	kdebase4-core >= %{_minbaseevr}
+Requires:	kde4-kdebase-core >= %{_minbaseevr}
 Requires:	ppp
 
 %description kppp
@@ -801,7 +779,7 @@
 Summary(pl.UTF-8):	Klient IRC dla KDE
 Summary(pt_BR.UTF-8):	Cliente de IRC do KDE
 Group:		X11/Applications
-Requires:	kdebase4-core >= %{_minbaseevr}
+Requires:	kde4-kdebase-core >= %{_minbaseevr}
 Requires:	perl-IO-Socket-SSL
 Requires:	perl-Socket6 >= 0.11
 
@@ -821,7 +799,7 @@
 Summary(pl.UTF-8):	Wirtualne biurka
 Group:		X11/Applications
 Requires:	%{name}-kinetd = %{epoch}:%{version}-%{release}
-Requires:	kdebase4-core >= %{_minbaseevr}
+Requires:	kde4-kdebase-core >= %{_minbaseevr}
 Suggests:	rdesktop
 
 %description krfb
@@ -844,7 +822,7 @@
 Summary:	Talk daemon
 Summary(pl.UTF-8):	Daemon talk
 Group:		X11/Applications
-Requires:	kdebase4-core >= %{_minbaseevr}
+Requires:	kde4-kdebase-core >= %{_minbaseevr}
 
 %description ktalkd
 A talk daemon replacement. Support the talk protocol and features an
@@ -860,9 +838,8 @@
 Summary:	Wireless LAN
 Summary(pl.UTF-8):	Bezprzewodowy LAN
 Group:		X11/Applications
-Requires:	kdelibs4 >= %{_minlibsevr}
+Requires:	kde4-kdelibs >= %{_minlibsevr}
 Requires:	wireless-tools
-Obsoletes:	kwifimanager
 
 %description kwifimanager
 The KWiFiManager suite is a set of tools which allows you to manage
@@ -884,7 +861,7 @@
 Summary:	KDE XmlRpc Daemon
 Summary(pl.UTF-8):	Deamon XmlRpc dla KDE
 Group:		X11/Applications
-Requires:	kdelibs4 >= %{_minlibsevr}
+Requires:	kde4-kdelibs >= %{_minlibsevr}
 
 %description kxmlrpcd
 KDE XmlRpc Daemon.
@@ -900,9 +877,6 @@
 Requires:	konqueror >= %{_minbaseevr}
 Requires:	rc-scripts
 Requires:	samba-client
-Provides:	lisa
-Obsoletes:	kdenetwork-lisa
-Obsoletes:	lisa
 
 %description lanbrowser
 A browser for Samba shares in your Local Area Network.
@@ -914,8 +888,7 @@
 Summary:	kopete library
 Summary(pl.UTF-8):	Biblioteka kopete
 Group:		X11/Libraries
-Requires:	kdelibs4 >= %{_minlibsevr}
-Obsoletes:	kdenetwork-kopete < 10:3.1.93.031114-3
+Requires:	kde4-kdelibs >= %{_minlibsevr}
 
 %description libkopete
 kopete library.
@@ -928,7 +901,6 @@
 Summary(pl.UTF-8):	Biblioteka współdzielona dla protokołu MSN
 Group:		X11/Libraries
 Requires:	%{name}-libkopete = %{epoch}:%{version}-%{release}
-Obsoletes:	kdenetwork-kopete-protocol-msn < 10:3.1.93.031114-3
 
 %description libkopete_msn
 MSN protocol shared library.
@@ -953,7 +925,6 @@
 Summary(pl.UTF-8):	Biblioteka dodająca obsługę protokołu OSCAR
 Group:		X11/Applications/Networking
 Requires:	%{name}-libkopete = %{epoch}:%{version}-%{release}
-Obsoletes:	kdenetwork-kopete-protocol-oscar < 10:3.1.93.031114-3
 
 %description libkopete_oscar
 A shared library which adds OSCAR protocol support needed eg. by AIM
@@ -967,8 +938,7 @@
 Summary:	RSS library
 Summary(pl.UTF-8):	Biblioteka RSS
 Group:		X11/Libraries
-Requires:	kdelibs4 >= %{_minlibsevr}
-Obsoletes:	kdenetwork-rss < 10:3.1.93.031114-3
+Requires:	kde4-kdelibs >= %{_minlibsevr}
 
 %description librss
 Library for RSS/RDF/XML parsers in KDE.
@@ -1596,6 +1566,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.14  2008-02-02 01:53:39  shadzik
+- fix Rs
+- kill kde3 stuff
+
 Revision 1.13  2008-02-02 01:41:57  shadzik
 - almost all files packaged
 - fixed BRs
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/kde4-kdenetwork.spec?r1=1.13&r2=1.14&f=u



More information about the pld-cvs-commit mailing list