SPECS (AC-branch): kdenetwork.spec - fix kopete files - add meanwh...

[glen]

Author: glen                         Date: Thu Oct  5 21:45:36 2006 GMT
Module: SPECS                         Tag: AC-branch
---- Log message:
- fix kopete files
- add meanwhile bcond for kopete

---- Files affected:
SPECS:
   kdenetwork.spec (1.212.2.15 -> 1.212.2.16) 

---- Diffs:

================================================================
Index: SPECS/kdenetwork.spec
diff -u SPECS/kdenetwork.spec:1.212.2.15 SPECS/kdenetwork.spec:1.212.2.16
--- SPECS/kdenetwork.spec:1.212.2.15	Thu Oct  5 23:41:35 2006
+++ SPECS/kdenetwork.spec	Thu Oct  5 23:45:30 2006
@@ -7,6 +7,7 @@
 %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}
@@ -46,7 +47,8 @@
 BuildRequires:	libtool
 BuildRequires:	libxml2-progs
 BuildRequires:	libxslt-devel >= 1.0.7
-BuildRequires:	meanwhile-devel
+%{?with_meanwhile:BuildRequires:	meanwhile-devel <= 1.1.0}
+%{?with_meanwhile:BuildRequires:	meanwhile-devel >= 1.0.1}
 BuildRequires:	openslp-devel
 BuildRequires:	openssl-devel >= 0.9.7d
 BuildRequires:	pcre-devel
@@ -1215,9 +1217,6 @@
 
 %files kopete -f kopete.lang
 %defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/kconf_update_bin/kopete-account-kconf_update
-%attr(755,root,root) %{_libdir}/kconf_update_bin/kopete-nameTracking-kconf_update
-%attr(755,root,root) %{_libdir}/kconf_update_bin/kopete-pluginloader2-kconf_update
 %attr(755,root,root) %{_bindir}/kopete
 %{_libdir}/kde3/kcm_kopete_addbookmarks.la
 %attr(755,root,root) %{_libdir}/kde3/kcm_kopete_addbookmarks.so
@@ -1347,7 +1346,6 @@
 %{_iconsdir}/*/*/apps/jabber_gateway_tlen.png
 %{_iconsdir}/*/*/apps/jabber_gateway_yahoo.png
 %{_iconsdir}/*/*/apps/jabber_protocol.png
-%{_iconsdir}/*/*/apps/jabber_protocol.png
 %{_iconsdir}/*/*/apps/kopete.png
 %{_iconsdir}/*/*/apps/kopete2.svgz
 %{_iconsdir}/*/*/apps/kopete_all_away.png
@@ -1408,12 +1406,14 @@
 %{_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)
@@ -1744,6 +1744,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.212.2.16  2006/10/05 21:45:30  glen
+- fix kopete files
+- add meanwhile bcond for kopete
+
 Revision 1.212.2.15  2006/10/05 21:41:35  glen
 - more sync kopete files between kopete.spec and kdenetwork.spec
 
================================================================

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