Mailinglist Archive: opensuse-commit (1670 mails)

< Previous Next >
commit kdepim3
  • From: root@xxxxxxx (h_root)
  • Date: Mon, 23 Oct 2006 18:44:00 +0200 (CEST)
  • Message-id: <20061023164400.9DFC984789@xxxxxxxxxxxxxxx>

Hello community,

here is the log from the commit of package kdepim3
checked in at Mon Oct 23 18:44:00 CEST 2006.

--------
--- KDE/kdepim3/kdepim3.changes 2006-10-23 10:34:55.000000000 +0200
+++ /mounts/work_src_done/STABLE/kdepim3/kdepim3.changes 2006-10-23 18:25:23.000000000 +0200
@@ -1,0 +2,6 @@
+Mon Oct 23 16:36:27 CEST 2006 - dgollub@xxxxxxx
+
+- disabled kitchensync build
+- changed to kitchensync with OpenSync integration
+
+-------------------------------------------------------------------

Old:
----
kitchensync.desktop

New:
----
disable-kitchensync.diff

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ kdepim3.spec ++++++
--- /var/tmp/diff_new_pack.M5yZl5/_old 2006-10-23 18:43:51.000000000 +0200
+++ /var/tmp/diff_new_pack.M5yZl5/_new 2006-10-23 18:43:51.000000000 +0200
@@ -21,7 +21,7 @@
Group: System/GUI/KDE
Summary: Personal Information Manager Software for KDE
Version: 3.5.5
-Release: 13
+Release: 14
URL: http://www.kde.org/
Requires: kdelibs3 >= %( echo `rpm -q --queryformat '%{VERSION}' kdelibs3` )
Requires: kdebase3 >= %( echo `rpm -q --queryformat '%{VERSION}' kdelibs3` )
@@ -30,7 +30,6 @@
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Source0: kdepim-%{version}.tar.bz2
Source1: korganizer-import.desktop
-Source4: kitchensync.desktop
Source5: groupwarewizard.desktop
#Patch0: 3_5_BRANCH.diff
Patch1: install-headers.diff
@@ -48,6 +47,7 @@
Patch24: kmail_attachment_size.diff
Patch25: kmail-crash.diff
Patch26: korganizer-start.diff
+Patch27: disable-kitchensync.diff
Provides: cryptplug
Obsoletes: cryptplug
Provides: kdepim
@@ -142,23 +142,6 @@
--------
The KDE Team <kde@xxxxxxx>

-%package sync
-# usesubdirs kitchensync
-#ksync
-Summary: This Package allows Communication with Mobile Phones
-Provides: kdepim3:/opt/kde3/bin/kitchensync
-Group: System/GUI/KDE
-
-%description sync
-This package contains Kandy, a tool for syncing the KDE address book
-with the phone book on a mobile phone.
-
-
-
-Authors:
---------
- The KDE Team.
-
%package kpilot
# usesubdirs kpilot
Summary: This Package allows Communication with the 3COM Palm Pilot
@@ -218,6 +201,7 @@
%patch24
%patch25
%patch26
+%patch27
. /etc/opt/kde3/common_options
update_admin

@@ -242,8 +226,6 @@
F=$RPM_BUILD_ROOT/opt/kde3/share/applnk/.hidden/
mkdir -p $F
install -m 0644 %SOURCE1 $F
-install -m 0644 %SOURCE4 %SOURCE5 \
- $RPM_BUILD_ROOT/opt/kde3/share/applications/kde/
%suse_update_desktop_file korganizer-import
%suse_update_desktop_file korganizer Office Calendar
%suse_update_desktop_file kalarm Utility TimeUtility
@@ -257,14 +239,8 @@
%suse_update_desktop_file kpilot Utility PDA SyncUtility
%suse_update_desktop_file -u kpalmdoc Utility PDA
%suse_update_desktop_file -u ktnef Network Email
-%if %suse_version > 1000
-%suse_update_desktop_file -G "Synchronization" kitchensync Utility SyncUtility
-%else
-%suse_update_desktop_file kitchensync Utility SyncUtility
-%endif
%suse_update_desktop_file groupwarewizard Utility DesktopSettings
%suse_update_desktop_file kandy Utility Telephony
-%suse_update_desktop_file multisynk Utility SyncUtility
%suse_update_desktop_file akregator Network RSS-News

%post
@@ -273,12 +249,6 @@
%postun
%run_ldconfig

-%post sync
-%run_ldconfig
-
-%postun sync
-%run_ldconfig
-
%post kpilot
%run_ldconfig

@@ -404,9 +374,9 @@
/opt/kde3/%_lib/libqgpgme.*
/opt/kde3/%_lib/libkleopatra*
/opt/kde3/%_lib/libknodecommon*
-/opt/kde3/%_lib/libkonnector.*
+#/opt/kde3/%_lib/libkonnector.*
/opt/kde3/%_lib/libindex.*
-/opt/kde3/%_lib/libksync2.*
+#/opt/kde3/%_lib/libksync2.*
/opt/kde3/%_lib/kde3/libakregatorpart.*
/opt/kde3/%_lib/kde3/libkontact_akregator.*
/opt/kde3/%_lib/kde3/kabc_*
@@ -430,7 +400,6 @@
/opt/kde3/share/applications/kde/ktnef.desktop
/opt/kde3/share/applications/kde/kleopatra_import.desktop
/opt/kde3/share/applications/kde/kmail_view.desktop
-/opt/kde3/share/applications/kde/multisynk.desktop
/opt/kde3/share/applications/kde/akregator.desktop
/opt/kde3/share/applnk/.hidden/*.desktop
/opt/kde3/share/apps/akregator
@@ -515,10 +484,9 @@
/opt/kde3/share/services/kontact/akregatorplugin.desktop
/opt/kde3/share/services/kontact/akregatorplugin3.2.desktop
/opt/kde3/share/services/kontact/journalplugin.desktop
-/opt/kde3/share/services/kontact/multisynk.desktop
/opt/kde3/share/services/kontact/specialdatesplugin.desktop
/opt/kde3/share/services/kresources/kcal_manager.desktop
-/opt/kde3/share/services/kresources/konnector_manager.desktop
+#/opt/kde3/share/services/kresources/konnector_manager.desktop
/opt/kde3/share/services/kontact/kaddressbookplugin.desktop
/opt/kde3/share/services/kontact/kmailplugin.desktop
/opt/kde3/share/services/kontact/knodeplugin.desktop
@@ -565,12 +533,12 @@
/opt/kde3/share/services/kmail_*.desktop
/opt/kde3/share/services/knode_*.desktop
/opt/kde3/share/services/kcmkontactknt.desktop
-/opt/kde3/share/services/overview.desktop
+#/opt/kde3/share/services/overview.desktop
/opt/kde3/share/services/korganizer
/opt/kde3/share/services/webcal.protocol
/opt/kde3/share/services/korganizer_*
/opt/kde3/share/services/sieve.protocol
-/opt/kde3/share/servicetypes/filter.desktop
+#/opt/kde3/share/servicetypes/filter.desktop
/opt/kde3/share/servicetypes/korgprintplugin.desktop
/opt/kde3/share/services/kontact/korganizerplugin.desktop
/opt/kde3/share/servicetypes/calendar*
@@ -585,10 +553,10 @@
/opt/kde3/bin/indexlib-config
/opt/kde3/%_lib/kde3/libakregator_mk4storage_plugin.la
/opt/kde3/%_lib/kde3/libakregator_mk4storage_plugin.so
-/opt/kde3/%_lib/kde3/libksfilter_addressbook.la
-/opt/kde3/%_lib/kde3/libksfilter_addressbook.so
-/opt/kde3/%_lib/kde3/libksfilter_calendar.la
-/opt/kde3/%_lib/kde3/libksfilter_calendar.so
+#/opt/kde3/%_lib/kde3/libksfilter_addressbook.la
+#/opt/kde3/%_lib/kde3/libksfilter_addressbook.so
+#/opt/kde3/%_lib/kde3/libksfilter_calendar.la
+#/opt/kde3/%_lib/kde3/libksfilter_calendar.so
/opt/kde3/share/apps/libical
/opt/kde3/share/config.kcfg/mk4config.kcfg
/opt/kde3/share/services/akregator_mk4storage_plugin.desktop
@@ -664,35 +632,6 @@
/opt/kde3/share/services/mal_conduit.desktop
%endif

-%files sync
-%defattr(-,root,root)
-/opt/kde3/bin/kitchensync
-/opt/kde3/bin/multisynk
-/opt/kde3/%_lib/kde3/libkitchensyncpart.*
-/opt/kde3/%_lib/kde3/libksync_*
-/opt/kde3/%_lib/kde3/liboverviewpart.*
-/opt/kde3/%_lib/kde3/libkontact_multisynk.*
-/opt/kde3/%_lib/kde3/libmultisynkpart.*
-/opt/kde3/%_lib/libkabckonnector.*
-/opt/kde3/%_lib/libkitchensyncui.*
-/opt/kde3/%_lib/libkcalkonnector.*
-/opt/kde3/%_lib/liblocalkonnector.*
-/opt/kde3/%_lib/libqtopiakonnector.*
-/opt/kde3/%_lib/libremotekonnector.*
-/opt/kde3/%_lib/libmultisynk.*
-/opt/kde3/share/applications/kde/kitchensync.desktop
-/opt/kde3/share/apps/kitchensync
-/opt/kde3/share/apps/multisynk
-/opt/kde3/share/services/kitchensync
-/opt/kde3/share/services/kresources/konnector
-/opt/kde3/share/servicetypes/kitchensync.desktop
-/opt/kde3/share/servicetypes/konnector.desktop
-%dir /opt/kde3/share/apps/konqueror
-%dir /opt/kde3/share/apps/konqueror/servicemenus
-/opt/kde3/share/apps/konqueror/servicemenus/kitchensync-*.desktop
-/opt/kde3/share/icons/*/*/*/multisynk.*
-%doc %lang(en) /opt/kde3/share/doc/HTML/en/multisynk
-
%files time-management
%defattr(-,root,root)
/opt/kde3/bin/kalarm
@@ -727,6 +666,9 @@
/opt/kde3/%_lib/kde3/plugins/designer/kpartsdesignerplugin.*

%changelog -n kdepim3
+* Mon Oct 23 2006 - dgollub@xxxxxxx
+- disabled kitchensync build
+- changed to kitchensync with OpenSync integration
* Mon Oct 23 2006 - stbinner@xxxxxxx
- fix Korganizer fails to start from menu or minicli (#214256)
* Wed Oct 18 2006 - dmueller@xxxxxxx

++++++ disable-kitchensync.diff ++++++
--- kitchensync/configure.in.in
+++ kitchensync/configure.in.in
@@ -1 +1 @@
-#DO_NOT_COMPILE="$DO_NOT_COMPILE kitchensync"
+DO_NOT_COMPILE="$DO_NOT_COMPILE kitchensync"




++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++



Remember to have fun...

---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe@xxxxxxxxxxxx
For additional commands, e-mail: opensuse-commit+help@xxxxxxxxxxxx

< Previous Next >