SPECS (AC-branch): kopete.spec, kdenetwork.spec - synced kopete fi...

[glen]

Author: glen                         Date: Thu Oct  5 21:33:48 2006 GMT
Module: SPECS                         Tag: AC-branch
---- Log message:
- synced kopete files between kopete.spec and kdenetwork.spec

---- Files affected:
SPECS:
   kopete.spec (1.58 -> 1.59) , kdenetwork.spec (1.212.2.13 -> 1.212.2.14) 

---- Diffs:

================================================================
Index: SPECS/kopete.spec
diff -u SPECS/kopete.spec:1.58 SPECS/kopete.spec:1.59
--- SPECS/kopete.spec:1.58	Thu Oct  5 23:06:34 2006
+++ SPECS/kopete.spec	Thu Oct  5 23:33:43 2006
@@ -916,7 +916,6 @@
 %attr(755,root,root) %{_libdir}/kde3/kcm_kopete_avdeviceconfig.so
 %{_datadir}/services/kopete_avdeviceconfig.desktop
 %{_datadir}/apps/kopete/icons/*/*/*/kopete_avdevice*.*
-#%{_datadir}/services/kconfiguredialog/kopete_avdeviceconfig.desktop
 
 %files tool-connectionstatus
 %defattr(644,root,root,755)
@@ -989,14 +988,14 @@
 %if %{with smpppd}
 %files tool-smpppdcs
 %defattr(644,root,root,755)
-%{_datadir}/config.kcfg/smpppdcs.kcfg
 %{_libdir}/kde3/kcm_kopete_smpppdcs.la
 %attr(755,root,root) %{_libdir}/kde3/kcm_kopete_smpppdcs.so
 %{_libdir}/kde3/kopete*smpppdcs*.la
 %attr(755,root,root) %{_libdir}/kde3/kopete*smpppdcs*.so
 %{_datadir}/apps/kopete/icons/crystalsvg/*/*/smpppdcs.png
-%{_datadir}/services/kopete_smpppdcs.desktop
+%{_datadir}/config.kcfg/smpppdcs.kcfg
 %{_datadir}/services/kconfiguredialog/kopete_smpppdcs_config.desktop
+%{_datadir}/services/kopete_smpppdcs.desktop
 %endif
 
 %files tool-texteffect
@@ -1055,6 +1054,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.59  2006/10/05 21:33:43  glen
+- synced kopete files between kopete.spec and kdenetwork.spec
+
 Revision 1.58  2006/10/05 21:06:34  glen
 - kconf_update scripts as executables (just in case)
 

================================================================
Index: SPECS/kdenetwork.spec
diff -u SPECS/kdenetwork.spec:1.212.2.13 SPECS/kdenetwork.spec:1.212.2.14
--- SPECS/kdenetwork.spec:1.212.2.13	Thu Oct  5 23:28:11 2006
+++ SPECS/kdenetwork.spec	Thu Oct  5 23:33:43 2006
@@ -1406,9 +1406,9 @@
 %attr(755,root,root) %{_libdir}/kde3/kopete*jabber*.so
 %{_libdir}/kde3/kio_jabberdisco.la
 %attr(755,root,root) %{_libdir}/kde3/kio_jabberdisco.so
+%{_datadir}/apps/kopete_jabber
 %{_datadir}/services/jabberdisco.protocol
 %{_datadir}/services/kopete_jabber.desktop
-%{_datadir}/apps/kopete_jabber/jabberchatui.rc
 
 %files kopete-protocol-meanwhile
 %defattr(644,root,root,755)
@@ -1425,9 +1425,9 @@
 %attr(755,root,root) %{_libdir}/kde3/kopete*msn*.so
 %{_libdir}/kde3/kopete_netmeeting.la
 %attr(755,root,root) %{_libdir}/kde3/kopete_netmeeting.so
+%{_datadir}/apps/kopete/icons/crystalsvg/*/*/msn*
 %{_datadir}/apps/kopete_msn
 %{_datadir}/apps/kopete_netmeeting
-%{_datadir}/apps/kopete/icons/crystalsvg/*/*/msn*
 %{_datadir}/services/kconfiguredialog/kopete_msn_config.desktop
 %{_datadir}/services/kconfiguredialog/kopete_netmeeting_config.desktop
 %{_datadir}/services/kopete_msn.desktop
@@ -1745,6 +1745,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.212.2.14  2006/10/05 21:33:43  glen
+- synced kopete files between kopete.spec and kdenetwork.spec
+
 Revision 1.212.2.13  2006/10/05 21:28:11  glen
 - kopete files sorted
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/kopete.spec?r1=1.58&r2=1.59&f=u
    http://cvs.pld-linux.org/SPECS/kdenetwork.spec?r1=1.212.2.13&r2=1.212.2.14&f=u