SPECS: kdenetwork.spec - meanwhile always enabled (as BR can be fi...

glen glen at pld-linux.org
Fri Nov 3 10:38:20 CET 2006


Author: glen                         Date: Fri Nov  3 09:38:20 2006 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- meanwhile always enabled (as BR can be filled)

---- Files affected:
SPECS:
   kdenetwork.spec (1.234 -> 1.235) 

---- Diffs:

================================================================
Index: SPECS/kdenetwork.spec
diff -u SPECS/kdenetwork.spec:1.234 SPECS/kdenetwork.spec:1.235
--- SPECS/kdenetwork.spec:1.234	Fri Nov  3 05:49:01 2006
+++ SPECS/kdenetwork.spec	Fri Nov  3 10:38:15 2006
@@ -9,7 +9,6 @@
 %bcond_without	xmms
 %bcond_without	hidden_visibility	# pass '--fvisibility=hidden' & '--fvisibility-inlines-hidden' to g++
 %bcond_with	skype			# incomplete!
-%bcond_with	meanwhile	# Kopete Meanwhile plugin (Lotus Sametime support)
 
 %define		_state		stable
 %define		_minlibsevr	9:%{version}
@@ -52,8 +51,7 @@
 BuildRequires:	libtool
 BuildRequires:	libxml2-progs
 BuildRequires:	libxslt-devel >= 1.0.7
-%{?with_meanwhile:BuildRequires:	meanwhile-devel <= 1.1.0}
-%{?with_meanwhile:BuildRequires:	meanwhile-devel >= 1.0.1}
+BuildRequires:	meanwhile-devel >= 1.0.1
 BuildRequires:	openslp-devel
 BuildRequires:	openssl-devel >= 0.9.7d
 BuildRequires:	pcre-devel
@@ -1414,14 +1412,12 @@
 %{_datadir}/services/jabberdisco.protocol
 %{_datadir}/services/kopete_jabber.desktop
 
-%if %{with meanwhile}
 %files kopete-protocol-meanwhile
 %defattr(644,root,root,755)
 %{_libdir}/kde3/kopete*meanwhile*.la
 %attr(755,root,root) %{_libdir}/kde3/kopete*meanwhile*.so
 %{_datadir}/apps/kopete/icons/crystalsvg/*/*/meanwhile*
 %{_datadir}/services/kopete_meanwhile.desktop
-%endif
 
 %files kopete-protocol-msn
 %defattr(644,root,root,755)
@@ -1752,6 +1748,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.235  2006/11/03 09:38:15  glen
+- meanwhile always enabled (as BR can be filled)
+
 Revision 1.234  2006/11/03 04:49:01  shadzik
 - fix ICQ connection in kopete
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/kdenetwork.spec?r1=1.234&r2=1.235&f=u



More information about the pld-cvs-commit mailing list