SPECS: kopete.spec - add Provides for kdenetwork packages for easi...

glen glen at pld-linux.org
Tue Mar 21 20:52:36 CET 2006


Author: glen                         Date: Tue Mar 21 19:52:36 2006 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- add Provides for kdenetwork packages for easier migrate
- ccache/distcc build hack (redefine *LD make vars)

---- Files affected:
SPECS:
   kopete.spec (1.41 -> 1.42) 

---- Diffs:

================================================================
Index: SPECS/kopete.spec
diff -u SPECS/kopete.spec:1.41 SPECS/kopete.spec:1.42
--- SPECS/kopete.spec:1.41	Tue Mar 21 19:53:51 2006
+++ SPECS/kopete.spec	Tue Mar 21 20:52:31 2006
@@ -5,9 +5,10 @@
 # Conditional build:
 %bcond_without	xmms
 %bcond_without	noatun
-%bcond_without	meanwhile
+%bcond_without	meanwhile # partial BR!!
 %bcond_without	smpppd
 %bcond_without	winpopup
+%bcond_without	sms # partial BR!!
 #
 %define		_snap	beta2
 Summary:	Multi-protocol plugin-based instant messenger
@@ -43,6 +44,7 @@
 Requires:	kdebase-core >= 3.5.
 Requires:	perl-modules
 Requires:	qt >= 3.1
+Provides:	kdenetwork-kopete
 Obsoletes:	kdenetwork-kopete
 Obsoletes:	kdenetwork-kopete-protocol-testbed
 Obsoletes:	kopete-plugin-protocols-aim
@@ -129,6 +131,7 @@
 Summary(pl):	Wtyczka Kopete do dodawania własnych aliasów dla poleceń
 Group:		X11/Applications/Networking
 Requires:	%{name} = %{epoch}:%{version}-%{release}
+Provides:	kdenetwork-kopete-tool-alias
 Obsoletes:	kdenetwork-kopete-tool-alias
 
 %description tool-alias
@@ -142,6 +145,7 @@
 Summary(pl):	Wtyczka Kopete do automatycznego przechodzenia w stan zajęty
 Group:		X11/Applications/Networking
 Requires:	%{name} = %{epoch}:%{version}-%{release}
+Provides:	kdenetwork-kopete-tool-autoaway
 Obsoletes:	kdenetwork-kopete-tool-autoaway
 
 %description tool-autoaway
@@ -157,6 +161,7 @@
 Summary(pl):	Wtyczka Kopete do automatycznej zamiany tekstu
 Group:		X11/Applications/Networking
 Requires:	%{name} = %{epoch}:%{version}-%{release}
+Provides:	kdenetwork-kopete-tool-autoreplace
 Obsoletes:	kdenetwork-kopete-tool-autoreplace
 
 %description tool-autoreplace
@@ -170,6 +175,7 @@
 Summary(pl):	Wtyczka Kopete do automatycznego przechodzenia w stan zajęty
 Group:		X11/Applications/Networking
 Requires:	%{name} = %{epoch}:%{version}-%{release}
+Provides:	kdenetwork-kopete-tool-avdeviceconfig
 Obsoletes:	kdenetwork-kopete-tool-avdeviceconfig
 
 %description tool-avdeviceconfig
@@ -185,8 +191,8 @@
 Summary(pl):	Wykrywacz połączeń internetowych dla Kopete
 Group:		X11/Applications/Networking
 Requires:	%{name} = %{epoch}:%{version}-%{release}
+Provides:	kdenetwork-kopete-tool-conectionstatus
 Obsoletes:	kdenetwork-kopete-tool-conectionstatus
-Obsoletes:	kopete-tool-conectionstatus
 
 %description tool-connectionstatus
 Kopete tool which automatically detects whether the internet
@@ -201,6 +207,7 @@
 Summary(pl):	Narzędzie Kopete do dodawania notatek do kontaktów
 Group:		X11/Applications/Networking
 Requires:	%{name} = %{epoch}:%{version}-%{release}
+Provides:	kdenetwork-kopete-tool-contactnotes
 Obsoletes:	kdenetwork-kopete-tool-contactnotes
 
 %description tool-contactnotes
@@ -214,6 +221,7 @@
 Summary(pl):	Program do szyfrowania wiadomości dla Kopete
 Group:		X11/Applications/Networking
 Requires:	%{name} = %{epoch}:%{version}-%{release}
+Provides:	kdenetwork-kopete-tool-cryptography
 Obsoletes:	kdenetwork-kopete-tool-cryptography
 
 %description tool-cryptography
@@ -227,6 +235,7 @@
 Summary(pl):	Wtyczka Kopete podkreślająca wybrane teksty
 Group:		X11/Applications/Networking
 Requires:	%{name} = %{epoch}:%{version}-%{release}
+Provides:	kdenetwork-kopete-tool-highlight
 Obsoletes:	kdenetwork-kopete-tool-highlight
 
 %description tool-highlight
@@ -240,6 +249,7 @@
 Summary(pl):	Wtyczka Kopete obsługująca historię rozmów
 Group:		X11/Applications/Networking
 Requires:	%{name} = %{epoch}:%{version}-%{release}
+Provides:	kdenetwork-kopete-tool-history
 Obsoletes:	kdenetwork-kopete-tool-history
 
 %description tool-history
@@ -253,6 +263,7 @@
 Summary(pl):	Importer kontaktów dla Kopete
 Group:		X11/Applications/Networking
 Requires:	%{name} = %{epoch}:%{version}-%{release}
+Provides:	kdenetwork-kopete-tool-importer
 Obsoletes:	kdenetwork-kopete-tool-importer
 
 %description tool-importer
@@ -268,6 +279,7 @@
 Summary(pl):	Wtyczka Kopete renderująca tekst w formacie latexu
 Group:		X11/Applications/Networking
 Requires:	%{name} = %{epoch}:%{version}-%{release}
+Provides:	kdenetwork-kopete-tool-latex
 Obsoletes:	kdenetwork-kopete-tool-latex
 
 %description tool-latex
@@ -281,6 +293,7 @@
 Summary(pl):	Wtyczka Kopete zmieniająca status na zajęty jeśli nie wykrywa ruchu wokół komputera
 Group:		X11/Applications/Networking
 Requires:	%{name} = %{epoch}:%{version}-%{release}
+Provides:	kdenetwork-kopete-tool-motionaway
 Obsoletes:	kdenetwork-kopete-tool-motionaway
 
 %description tool-motionaway
@@ -301,6 +314,7 @@
 %if %{with xmms}
 Requires:	xmms >= 1.0.0
 %endif
+Provides:	kdenetwork-kopete-tool-nowlistening
 Obsoletes:	kdenetwork-kopete-tool-nowlistening
 
 %description tool-nowlistening
@@ -316,6 +330,7 @@
 Summary(pl):	Wtyczka Kopete do automatycznego przechodzenia w stan zajęty
 Group:		X11/Applications/Networking
 Requires:	%{name} = %{epoch}:%{version}-%{release}
+Provides:	kdenetwork-kopete-tool-smpppdcs
 Obsoletes:	kdenetwork-kopete-tool-smpppdcs
 
 %description tool-smpppdcs
@@ -331,6 +346,7 @@
 Summary(pl):	Wtyczka Kopete sprawdzająca pisownie
 Group:		X11/Applications/Networking
 Requires:	%{name} = %{epoch}:%{version}-%{release}
+Provides:	kdenetwork-kopete-tool-spellcheck
 Obsoletes:	kdenetwork-kopete-tool-spellcheck
 
 %description tool-spellcheck
@@ -344,6 +360,7 @@
 Summary(pl):	Wtyczka Kopete dodająca ładne efekty do wiadomości
 Group:		X11/Applications/Networking
 Requires:	%{name} = %{epoch}:%{version}-%{release}
+Provides:	kdenetwork-kopete-tool-texteffect
 Obsoletes:	kdenetwork-kopete-tool-texteffect
 
 %description tool-texteffect
@@ -357,6 +374,7 @@
 Summary(pl):	Wtyczka Kopete wykorzystująca babelfish do tłumaczenia wiadomości
 Group:		X11/Applications/Networking
 Requires:	%{name} = %{epoch}:%{version}-%{release}
+Provides:	kdenetwork-kopete-tool-translator
 Obsoletes:	kdenetwork-kopete-tool-translator
 
 %description tool-translator
@@ -373,6 +391,7 @@
 Requires:	%{name} = %{epoch}:%{version}-%{release}
 Requires:	libxml2 >= 2.4.8
 Requires:	libxslt >= 1.0.7
+Provides:	kopete-tool-webpresence
 Obsoletes:	kopete-tool-webpresence
 
 %description tool-webpresence
@@ -388,6 +407,7 @@
 Group:		X11/Applications/Networking
 Requires:	%{name} = %{epoch}:%{version}-%{release}
 Requires:	%{name}-libkopete_oscar = %{epoch}:%{version}-%{release}
+Provides:	kdenetwork-kopete-protocol-aim
 Obsoletes:	kdenetwork-kopete-protocol-aim
 
 %description protocol-aim
@@ -401,6 +421,7 @@
 Summary(pl):	Wtyczka Kopete dodająca obsługę protokołu GaduGadu
 Group:		X11/Applications/Networking
 Requires:	%{name} = %{epoch}:%{version}-%{release}
+Provides:	kdenetwork-kopete-protocol-gg
 Obsoletes:	kdenetwork-kopete-protocol-gg
 
 %description protocol-gg
@@ -414,6 +435,7 @@
 Summary(pl):	Wtyczka Kopete dodająca obsługę protokołu Groupwise
 Group:		X11/Applications/Networking
 Requires:	%{name} = %{epoch}:%{version}-%{release}
+Provides:	kdenetwork-kopete-protocol-groupwise
 Obsoletes:	kdenetwork-kopete-protocol-groupwise
 
 %description protocol-groupwise
@@ -428,6 +450,7 @@
 Group:		X11/Applications/Networking
 Requires:	%{name} = %{epoch}:%{version}-%{release}
 Requires:	%{name}-libkopete_oscar = %{epoch}:%{version}-%{release}
+Provides:	kdenetwork-kopete-protocol-icq
 Obsoletes:	kdenetwork-kopete-protocol-icq
 
 %description protocol-icq
@@ -441,6 +464,7 @@
 Summary(pl):	Wtyczka Kopete dodająca obsługę IRC-a
 Group:		X11/Applications/Networking
 Requires:	%{name} = %{epoch}:%{version}-%{release}
+Provides:	kdenetwork-kopete-protocol-irc
 Obsoletes:	kdenetwork-kopete-protocol-irc
 
 %description protocol-irc
@@ -454,7 +478,7 @@
 Summary(pl):	Wtyczka Kopete dodająca obsługę protokołu Jabber
 Group:		X11/Applications/Networking
 Requires:	%{name} = %{epoch}:%{version}-%{release}
-#Requires:	libpsi >= 20021108
+Provides:	kdenetwork-kopete-protocol-jabber
 Obsoletes:	kdenetwork-kopete-protocol-jabber
 
 %description protocol-jabber
@@ -469,6 +493,7 @@
 Group:		X11/Applications/Networking
 Requires:	%{name} = %{epoch}:%{version}-%{release}
 Requires:	%{name}-libkopete_msn = %{epoch}:%{version}-%{release}
+Provides:	kdenetwork-kopete-protocol-msn
 Obsoletes:	kdenetwork-kopete-protocol-msn
 
 %description protocol-msn
@@ -482,6 +507,7 @@
 Summary(pl):	Wtyczka Kopete dodająca obsługę protokołu Lotus Sametime
 Group:		X11/Applications/Networking
 Requires:	%{name} = %{epoch}:%{version}-%{release}
+Provides:	kdenetwork-kopete-protocol-meanwhile
 Obsoletes:	kdenetwork-kopete-protocol-meanwhile
 
 %description protocol-meanwhile
@@ -495,6 +521,7 @@
 Summary(pl):	Wtyczka Kopete dodająca obsługę kontaktów SMS
 Group:		X11/Applications/Networking
 Requires:	%{name} = %{epoch}:%{version}-%{release}
+Provides:	kdenetwork-kopete-protocol-sms
 Obsoletes:	kdenetwork-kopete-protocol-sms
 
 %description protocol-sms
@@ -508,6 +535,7 @@
 Summary(pl):	Wtyczka Kopete dodająca obsługę komunikacji przez WinPopUp
 Group:		X11/Applications/Networking
 Requires:	%{name} = %{epoch}:%{version}-%{release}
+Provides:	kdenetwork-kopete-protocol-winpopup
 Obsoletes:	kdenetwork-kopete-protocol-winpopup
 
 %description protocol-winpopup
@@ -521,6 +549,7 @@
 Summary(pl):	Wtyczka Kopete dodająca obsługę protokołu Yahoo
 Group:		X11/Applications/Networking
 Requires:	%{name} = %{epoch}:%{version}-%{release}
+Provides:	kdenetwork-kopete-protocol-yahoo
 Obsoletes:	kdenetwork-kopete-protocol-yahoo
 
 %description protocol-yahoo
@@ -535,6 +564,7 @@
 Summary(pl):	Biblioteka kopete
 Group:		X11/Libraries
 Requires:	kdelibs >= %{_minlibsevr}
+Provides:	kdenetwork-libkopete
 Obsoletes:	kdenetwork-libkopete
 
 %description libkopete
@@ -548,6 +578,7 @@
 Summary(pl):	Biblioteka współdzielona dla protokołu MSN
 Group:		X11/Libraries
 Requires:	%{name}-libkopete = %{epoch}:%{version}-%{release}
+Provides:	kdenetwork-libkopete_msn
 Obsoletes:	kdenetwork-libkopete_msn
 
 %description libkopete_msn
@@ -561,6 +592,7 @@
 Summary(pl):	Biblioteka z obsługą urządzeń wejścia video dla kopete
 Group:		X11/Libraries
 Requires:	%{name}-libkopete = %{epoch}:%{version}-%{release}
+Provides:	kdenetwork-libkopete_videodevice
 Obsoletes:	kdenetwork-libkopete_videodevice
 
 %description libkopete_videodevice
@@ -602,7 +634,11 @@
 	%{!?debug:--disable-rpath} \
 	--%{?with_smpppd:en}%{!?with_smpppd:dis}able-smpppd
 
-%{__make}
+%{__make} \
+	CXXLD=%{_host_cpu}-%{_vendor}-%{_os}-g++ \
+	CCLD=%{_host_cpu}-%{_vendor}-%{_os}-gcc \
+	AM_MAKEFLAGS='CXXLD=$(CXXLD) CCLD=$(CCLD)'
+
 %if %{with winpopup}
 %{__make} -C kopete/protocols/winpopup
 %endif
@@ -844,12 +880,14 @@
 %{_datadir}/apps/kopete_skype
 %endif
 
+%if %{with sms}
 %files protocol-sms
 %defattr(644,root,root,755)
 %{_libdir}/kde3/kopete*sms*.la
 %attr(755,root,root) %{_libdir}/kde3/kopete*sms*.so
 %{_datadir}/apps/kopete/icons/crystalsvg/*/*/sms*
 %{_datadir}/services/kopete_sms.desktop
+%endif
 
 #%files protocol-testbed
 #%defattr(644,root,root,755)
@@ -1057,6 +1095,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.42  2006/03/21 19:52:31  glen
+- add Provides for kdenetwork packages for easier migrate
+- ccache/distcc build hack (redefine *LD make vars)
+
 Revision 1.41  2006/03/21 18:53:51  glen
 - fetch beta2, adapterized
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/kopete.spec?r1=1.41&r2=1.42&f=u



More information about the pld-cvs-commit mailing list