SPECS: kopete.spec - gsmlib-devel not libgsm-devel - cleanups, mor...

[glen]

Author: glen                         Date: Wed Mar 22 09:28:18 2006 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- gsmlib-devel not libgsm-devel
- cleanups, more bconds

---- Files affected:
SPECS:
   kopete.spec (1.45 -> 1.46) 

---- Diffs:

================================================================
Index: SPECS/kopete.spec
diff -u SPECS/kopete.spec:1.45 SPECS/kopete.spec:1.46
--- SPECS/kopete.spec:1.45	Wed Mar 22 10:00:18 2006
+++ SPECS/kopete.spec	Wed Mar 22 10:28:12 2006
@@ -5,17 +5,19 @@
 # Conditional build:
 %bcond_without	xmms
 %bcond_without	noatun
-%bcond_with	meanwhile
-%bcond_without	smpppd # support for the SuSE Meta PPP Daemon (smpppd)
+%bcond_with	meanwhile	# Kopete Meanwhile plugin (Lotus Sametime support)
+%bcond_without	smpppd		# support for the SuSE Meta PPP Daemon (smpppd)
 %bcond_without	winpopup
-%bcond_without	sms # partial BR!!
+%bcond_without	smsgsm			# GSM SMS protocol
+%bcond_without	slp			# don't require libslp (Browsing in krfb and krdc not possible)
+%bcond_with		jingle		# enable Jabber Jingle voice support
 #
 %define		_snap	beta2
 Summary:	Multi-protocol plugin-based instant messenger
 Summary(pl):	Komunikator obsługujący wiele protokołów
 Name:		kopete
 Version:	0.12
-Release:	0.%{_snap}.2
+Release:	0.%{_snap}.4
 Epoch:		1
 License:	GPL
 Group:		X11/Applications/Networking
@@ -30,12 +32,12 @@
 BuildRequires:	kdemultimedia-kscd >= 3.1
 %{?with_noatun:BuildRequires:	kdemultimedia-noatun >= 3.1}
 BuildRequires:	libgadu-devel >= 1.0
-BuildRequires:	libgsm-devel
+%{?with_smsgsm:BuildRequires:	gsmlib-devel}
 #BuildRequires:	libpsi-devel >= 20021108
 BuildRequires:	libxml2-devel >= 2.4.8
 BuildRequires:	libxslt-devel >= 1.0.7
-%{?with_meanwhile:BuildRequires:	meanwhile-devel >= 1.0.1}
 %{?with_meanwhile:BuildRequires:	meanwhile-devel <= 1.1.0}
+%{?with_meanwhile:BuildRequires:	meanwhile-devel >= 1.0.1}
 BuildRequires:	openssl-devel
 BuildRequires:	perl-devel
 BuildRequires:	qt-devel >= 3.1
@@ -633,7 +635,10 @@
 	--disable-testbed \
 	%{!?debug:--disable-rpath} \
 	--%{?with_meanwhile:en}%{!?with_meanwhile:dis}able-meanwhile \
-	--%{?with_smpppd:en}%{!?with_smpppd:dis}able-smpppd
+	--%{?with_smpppd:en}%{!?with_smpppd:dis}able-smpppd \
+	--%{?with_jingle:en}%{!?with_jingle:dis}able-jingle \
+	--%{?with_smsgsm:en}%{!?with_smsgsm:dis}able-smsgsm \
+	--%{?with_slp:en}%{!?with_slp:dis}able-slp \
 
 %{__make} \
 	CXXLD=%{_host_cpu}-%{_vendor}-%{_os}-g++ \
@@ -659,6 +664,9 @@
 
 %find_lang %{name} --with-kde
 
+# in kdelibs
+rm -f $RPM_BUILD_ROOT%{_datadir}/mimelnk/application/x-icq.desktop
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -882,7 +890,7 @@
 %{_datadir}/apps/kopete_skype
 %endif
 
-%if %{with sms}
+%if %{with smsgsm}
 %files protocol-sms
 %defattr(644,root,root,755)
 %{_libdir}/kde3/kopete*sms*.la
@@ -1098,6 +1106,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.46  2006/03/22 09:28:12  glen
+- gsmlib-devel not libgsm-devel
+- cleanups, more bconds
+
 Revision 1.45  2006/03/22 09:00:18  glen
 - there's no sometime plugin, but meanwhile option
 
================================================================

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