Hello community, here is the log from the commit of package kdepim4 checked in at Thu Jun 26 01:33:59 CEST 2008. -------- --- KDE/kdepim4/kdepim4.changes 2008-06-06 19:39:32.000000000 +0200 +++ kdepim4/kdepim4.changes 2008-06-24 13:14:34.000000000 +0200 @@ -1,0 +2,15 @@ +Tue Jun 24 09:18:19 CEST 2008 - dmueller@suse.de + +- update to 4.1 beta2 + +------------------------------------------------------------------- +Sat Jun 14 09:33:24 CEST 2008 - schwab@suse.de + +- Use -mminimal-toc on ppc64. + +------------------------------------------------------------------- +Wed Jun 11 22:25:29 CEST 2008 - dmueller@suse.de + +- remove kpilot/kmobiletools packages + +------------------------------------------------------------------- Old: ---- disable-planner.diff disable-plasma-dependencies.diff kdepim-4.0.80.tar.bz2 kdepim_kleopatra_versioning-r811208.diff kmail_revert_krichtext-r809981.diff New: ---- 4_1_BRANCH.diff kdepim-4.0.83.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kdepim4.spec ++++++ --- /var/tmp/diff_new_pack.j19082/_old 2008-06-26 01:32:58.000000000 +0200 +++ /var/tmp/diff_new_pack.j19082/_new 2008-06-26 01:32:58.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package kdepim4 (Version 4.0.80) +# spec file for package kdepim4 (Version 4.0.83) # # Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -16,37 +16,31 @@ BuildRequires: kdebase4-workspace-devel libsoprano-devel BuildRequires: libmysqlclient-devel oxygen-icon-theme %define with_kitchensync 0 +%define with_kpilot 0 +%define with_kmobiletools 0 %if %with_kitchensync BuildRequires: libopensync-devel %endif -%if %suse_version > 1020 BuildRequires: fdupes libassuan-devel libmal1-devel libpisock-devel -%else -BuildRequires: libassuan libmal-devel pilot-link-devel -%endif License: LGPL v2.1 or later Group: System/GUI/KDE Summary: Base package of kdepim Url: http://www.kde.org -Version: 4.0.80 -Release: 10 +Version: 4.0.83 +Release: 1 Source0: kdepim-%version.tar.bz2 -#Patch: 4_1_BRANCH.diff +Patch: 4_1_BRANCH.diff Patch1: akregator-useragent.diff Patch4: desktop-files.diff Patch5: disable-nepomuk-agents.diff Patch6: disable-knut.diff -Patch7: disable-plasma-dependencies.diff Patch8: kmail_revert_krichtext-r810400.diff -Patch9: kmail_revert_krichtext-r809981.diff Patch10: kdelibs40.diff Patch11: disable-kjots.diff Patch12: disable-new-kkeyseqwidget-api-r809986.diff Patch13: use-old-signatureconfigurator-location-r806301.diff Patch14: disable-korganizer-richtexteditwidget-r808952+808798.diff Patch15: disable-akonadi-kresources.diff -Patch16: kdepim_kleopatra_versioning-r811208.diff -Patch17: disable-planner.diff BuildRoot: %{_tmppath}/%{name}-%{version}-build %kde4_runtime_requires Suggests: kde4-ktnef @@ -65,8 +59,12 @@ Suggests: kde4-kitchensync %endif Suggests: libkdepim4 +%if %with_kpilot Suggests: kde4-kpilot +%endif +%if %with_kmobiletools Suggests: kde4-kmobiletools +%endif %description This package contains the core files of the kdepim module. @@ -79,24 +77,26 @@ %prep %setup -q -n kdepim-%version -#%patch +%patch #%patch1 %patch4 %patch5 %patch6 -%patch7 %patch8 -%patch9 %patch10 %patch11 +v=%{_kde_platform_version} +if test "${v##*.}" -lt 80; then %patch12 %patch13 %patch14 %patch15 -%patch16 -%patch17 +fi %build +%ifarch ppc64 +RPM_OPT_FLAGS="$RPM_OPT_FLAGS -mminimal-toc" +%endif %if ! %with_kitchensync rm -rf kitchensync %endif @@ -130,11 +130,15 @@ %create_subdir_filelist -d kalarm -v devel %create_subdir_filelist -d kmail -v devel %create_subdir_filelist -d knode -v devel +%if %with_kpilot %create_subdir_filelist -d kpilot -v devel +%endif %create_subdir_filelist -d kontact -v devel %create_subdir_filelist -d kontactinterfaces -f libkdepim -v libkdepim.devel %create_subdir_filelist -d wizards +%if %with_kmobiletools %create_subdir_filelist -d kmobiletools -v devel +%endif %if %with_kitchensync %create_subdir_filelist -d kitchensync -v devel %endif @@ -144,22 +148,26 @@ %create_subdir_filelist -d korn %create_subdir_filelist -d kaddressbook -v devel %create_subdir_filelist -d libkdepim -v libkdepim.devel +#assuan is too old on 10.3 so no kleopatra +%if %suse_version > 1030 %create_subdir_filelist -d kleopatra/libkleopatraclient -f libkdepim -v libkdepim.devel +%endif %if 0 %create_subdir_filelist -d akonadi -v akonadi.devel cat filelists/akonadi.devel | while read line; do echo "%exclude $line";done >>filelists/devel %endif cd .. #remove kontact plugins' desktop files that are in subpackages from the kontact list - akregatorplugins="/usr/%_lib/kde4/kontact_akregatorplugin.so /usr/share/kde4/services/kontact/akregatorplugin.desktop /usr/share/kde4/services/kontact/akregatorplugin3.2.desktop" + akregatorplugins="/usr/%_lib/kde4/kontact_akregatorplugin.so /usr/share/kde4/services/kontact/akregatorplugin.desktop" korganizerplugins="/usr/%_lib/kde4/kontact_journalplugin.so /usr/%_lib/kde4/kontact_korganizerplugin.so /usr/%_lib/kde4/kontact_todoplugin.so /usr/share/kde4/services/kontact/korganizerplugin.desktop /usr/share/kde4/services/kontact/journalplugin.desktop /usr/share/kde4/services/kontact/todoplugin.desktop" kaddressbookplugin="/usr/%_lib/kde4/kontact_kaddressbookplugin.so /usr/share/kde4/services/kontact/kaddressbookplugin.desktop" - karmplugin="/usr/%_lib/kde4/kontact_karmplugin.so /usr/share/kde4/services/kontact/karmplugin.desktop" kmailplugin="/usr/%_lib/kde4/kontact_kmailplugin.so /usr/share/kde4/services/kontact/kmailplugin.desktop" +%if %with_kmobiletools kmobiletoolsplugin="/usr/%_lib/kde4/kontact_kmobiletoolsplugin.so /usr/share/kde4/services/kontact/kmobiletools.desktop" +%endif knodeplugin="/usr/%_lib/kde4/kontact_knodeplugin.so /usr/share/kde4/services/kontact/knodeplugin.desktop" knotesplugin="/usr/%_lib/kde4/kontact_knotesplugin.so /usr/share/kde4/services/kontact/knotesplugin.desktop" - for i in $akregatorplugins $korganizerplugins $kaddressbookplugin $karmplugin $kmailplugin $kmobiletoolsplugin $knodeplugin $knotesplugin + for i in $akregatorplugins $korganizerplugins $kaddressbookplugin $kmailplugin $kmobiletoolsplugin $knodeplugin $knotesplugin do sed -ri s,$i,, filelists/kontact done @@ -175,10 +183,6 @@ do echo $i >> filelists/kaddressbook done - for i in $karmplugin - do - echo $i >> filelists/ktimetracker - done for i in $kmailplugin do echo $i >> filelists/kmail @@ -214,17 +218,19 @@ %suse_update_desktop_file -u ktnef Network Email %suse_update_desktop_file groupwarewizard Utility DesktopSettings %suse_update_desktop_file akregator Network RSS-News +%if %with_kpilot %suse_update_desktop_file kpilot Utility PDA SyncUtility +%endif %suse_update_desktop_file kcontactmanager Office ContactManagement +%if %with_kmobiletools %suse_update_desktop_file -G "Mobile Phone Tool" -C "" kmobiletools Utility Telephony +%endif %if %with_kitchensync %suse_update_desktop_file kitchensync Utility X-SuSE-SyncUtility %endif rm -rf %{buildroot}/usr/share/akonadi/agents %kde_post_install - %if %suse_version > 1020 %fdupes -s $RPM_BUILD_ROOT - %endif %kde_post_install %post -p /sbin/ldconfig @@ -652,6 +658,7 @@ %files -n libkdepim4-devel -f filelists/libkdepim.devel %defattr(-,root,root) %doc COPYING COPYING.LIB COPYING.DOC README +%if %with_kpilot %package -n kde4-kpilot License: LGPL v2.1 or later @@ -676,6 +683,7 @@ %files -n kde4-kpilot -f filelists/kpilot %defattr(-,root,root) %doc COPYING COPYING.LIB COPYING.DOC README +%endif %package devel License: LGPL v2.1 or later @@ -703,10 +711,10 @@ %files devel -f filelists/devel %defattr(-,root,root) %doc COPYING COPYING.LIB COPYING.DOC README -%exclude /usr/%_lib/libkpilot_conduit_base.so /usr/%_lib/*.so /usr/include/* %_kde_share_dir/apps/cmake/modules/* +%if %with_kmobiletools %package -n kde4-kmobiletools License: GPL v2 or later @@ -731,6 +739,7 @@ %files -n kde4-kmobiletools -f filelists/kmobiletools %defattr(-,root,root) %doc COPYING COPYING.LIB COPYING.DOC README +%endif %files -f filelists/exclude %defattr(-,root,root) @@ -754,6 +763,12 @@ /usr/share/icons/hicolor/*/apps/office-address-book.* %changelog +* Tue Jun 24 2008 dmueller@suse.de +- update to 4.1 beta2 +* Sat Jun 14 2008 schwab@suse.de +- Use -mminimal-toc on ppc64. +* Thu Jun 12 2008 dmueller@suse.de +- remove kpilot/kmobiletools packages * Fri Jun 06 2008 wstephenson@suse.de - Remove kpilot and kmobiletools dependency as these are not part of KDE 4.1 ++++++ 4_1_BRANCH.diff ++++++ package: kdepim-4.0.82.tar.bz2 kdemod: kdepim --- BRANCH_STATUS +++ BRANCH_STATUS @@ -0,0 +1,2 @@ +current HEAD: 819737 +svn di between //trunk/KDE/kdepim@819047 and //trunk/KDE/kdepim ++++++ disable-kjots.diff ++++++ --- /var/tmp/diff_new_pack.j19082/_old 2008-06-26 01:32:59.000000000 +0200 +++ /var/tmp/diff_new_pack.j19082/_new 2008-06-26 01:32:59.000000000 +0200 @@ -1,7 +1,5 @@ -Index: doc/CMakeLists.txt -=================================================================== ---- doc/CMakeLists.txt (revision 810647) -+++ doc/CMakeLists.txt (working copy) +--- doc/CMakeLists.txt ++++ doc/CMakeLists.txt @@ -17,7 +17,6 @@ if(NOT WIN32) endif(NOT WIN32) @@ -10,10 +8,8 @@ add_subdirectory(knotes) add_subdirectory(konsolekalendar) add_subdirectory(kontact) -Index: CMakeLists.txt -=================================================================== ---- CMakeLists.txt (revision 810647) -+++ CMakeLists.txt (working copy) +--- CMakeLists.txt ++++ CMakeLists.txt @@ -162,7 +162,6 @@ else ( ONLY_KLEO ) macro_optional_add_subdirectory(akregator) macro_optional_add_subdirectory(doc) @@ -22,15 +18,12 @@ if(QGPGME_FOUND) set(KMAIL_SUPPORTED TRUE) -Index: kontact/plugins/CMakeLists.txt -=================================================================== ---- kontact/plugins/CMakeLists.txt (revision 810647) -+++ kontact/plugins/CMakeLists.txt (working copy) -@@ -16,7 +16,6 @@ if(QGPGME_FOUND) +--- kontact/plugins/CMakeLists.txt ++++ kontact/plugins/CMakeLists.txt +@@ -16,6 +16,5 @@ if(QGPGME_FOUND) endif(QGPGME_FOUND) add_subdirectory( knotes ) add_subdirectory( knode ) -add_subdirectory( kjots ) - add_subdirectory( newsticker ) add_subdirectory( akregator ) if(KTIMETRACKER_SUPPORTED) ++++++ kdepim-4.0.80.tar.bz2 -> kdepim-4.0.83.tar.bz2 ++++++ KDE/kdepim4/kdepim-4.0.80.tar.bz2 kdepim4/kdepim-4.0.83.tar.bz2 differ: byte 11, line 1 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org