SPECS (AC-branch): kdenetwork.spec - meanwhile always enabled (as ...

[glen]

Author: glen                         Date: Sun Oct 29 19:33:41 2006 GMT
Module: SPECS                         Tag: AC-branch
---- Log message:
- meanwhile always enabled (as BR can be filled)

---- Files affected:
SPECS:
   kdenetwork.spec (1.212.2.18 -> 1.212.2.19) 

---- Diffs:

================================================================
Index: SPECS/kdenetwork.spec
diff -u SPECS/kdenetwork.spec:1.212.2.18 SPECS/kdenetwork.spec:1.212.2.19
--- SPECS/kdenetwork.spec:1.212.2.18	Wed Oct 25 23:34:50 2006
+++ SPECS/kdenetwork.spec	Sun Oct 29 20:33:35 2006
@@ -9,7 +9,6 @@
 %bcond_without	xmms
 %bcond_with	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}
@@ -21,7 +20,7 @@
 Summary(pt_BR):	K Desktop Environment - aplicaçőes de rede
 Name:		kdenetwork
 Version:	3.5.5
-Release:	0.4
+Release:	0.7
 Epoch:		10
 License:	GPL
 Group:		X11/Libraries
@@ -49,8 +48,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
@@ -1407,14 +1405,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)
@@ -1745,6 +1741,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.212.2.19  2006/10/29 19:33:35  glen
+- meanwhile always enabled (as BR can be filled)
+
 Revision 1.212.2.18  2006/10/25 21:34:50  glen
 - branch patch enabled
 
================================================================

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