Hello community, here is the log from the commit of package kdepim4 checked in at Sun Jun 8 11:59:37 CEST 2008. -------- --- KDE/kdepim4/kdepim4.changes 2008-06-03 16:33:53.000000000 +0200 +++ /mounts/work_src_done/STABLE/STABLE/kdepim4/kdepim4.changes 2008-06-06 19:39:32.000000000 +0200 @@ -1,0 +2,7 @@ +Fri Jun 6 09:50:31 CEST 2008 - wstephenson@suse.de + +- Remove kpilot and kmobiletools dependency as these are not part + of KDE 4.1 +- Disable Kontact planner plugin, not part of KDE 4.1 + +------------------------------------------------------------------- New: ---- disable-planner.diff ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kdepim4.spec ++++++ --- /var/tmp/diff_new_pack.r26351/_old 2008-06-08 11:59:28.000000000 +0200 +++ /var/tmp/diff_new_pack.r26351/_new 2008-06-08 11:59:28.000000000 +0200 @@ -29,7 +29,7 @@ Summary: Base package of kdepim Url: http://www.kde.org Version: 4.0.80 -Release: 7 +Release: 10 Source0: kdepim-%version.tar.bz2 #Patch: 4_1_BRANCH.diff Patch1: akregator-useragent.diff @@ -46,6 +46,7 @@ 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 @@ -93,6 +94,7 @@ %patch14 %patch15 %patch16 +%patch17 %build %if ! %with_kitchensync @@ -130,7 +132,7 @@ %create_subdir_filelist -d knode -v devel %create_subdir_filelist -d kpilot -v devel %create_subdir_filelist -d kontact -v devel - %create_subdir_filelist -d kontactinterfaces -f kontact -v devel + %create_subdir_filelist -d kontactinterfaces -f libkdepim -v libkdepim.devel %create_subdir_filelist -d wizards %create_subdir_filelist -d kmobiletools -v devel %if %with_kitchensync @@ -149,14 +151,14 @@ %endif cd .. #remove kontact plugins' desktop files that are in subpackages from the kontact list - akregatorplugins="/usr/share/kde4/services/kontact/akregatorplugin.desktop /usr/share/kde4/services/kontact/akregatorplugin3.2.desktop" - korganizerplugins="/usr/share/kde4/services/kontact/korganizerplugin.desktop /usr/share/kde4/services/kontact/journalplugin.desktop /usr/share/kde4/services/kontact/todoplugin.desktop" - kaddressbookplugin="/usr/share/kde4/services/kontact/kaddressbookplugin.desktop" - karmplugin="/usr/share/kde4/services/kontact/karmplugin.desktop" - kmailplugin="/usr/share/kde4/services/kontact/kmailplugin.desktop" - kmobiletoolsplugin="/usr/share/kde4/services/kontact/kmobiletools.desktop" - knodeplugin="/usr/share/kde4/services/kontact/knodeplugin.desktop" - knotesplugin="/usr/share/kde4/services/kontact/knotesplugin.desktop" + akregatorplugins="/usr/%_lib/kde4/kontact_akregatorplugin.so /usr/share/kde4/services/kontact/akregatorplugin.desktop /usr/share/kde4/services/kontact/akregatorplugin3.2.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" + kmobiletoolsplugin="/usr/%_lib/kde4/kontact_kmobiletoolsplugin.so /usr/share/kde4/services/kontact/kmobiletools.desktop" + 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 do sed -ri s,$i,, filelists/kontact @@ -169,12 +171,30 @@ do echo $i >> filelists/korganizer done - echo $kaddressbookplugin >> filelists/kaddressbook - echo $karmplugin >> filelists/ktimetracker - echo $kmailplugin >> filelists/kmail - echo $kmobiletoolsplugin >> filelists/kmobiletools - echo $knodeplugin >> filelists/knode - echo $knotesplugin >> filelists/knotes + for i in $kaddressbookplugin + 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 + done + for i in $kmobiletoolsplugin + do + echo $i >> filelists/kmobiletools + done + for i in $knodeplugin + do + echo $i >> filelists/knode + done + for i in $knotesplugin + do + echo $i >> filelists/knotes + done cat filelists/libkdepim.devel | while read line; do echo "%exclude $line";done >>filelists/devel grep "/usr/lib" filelists/libkdepim | grep -v "/kde4/" >filelists/libkdepim.libs cat filelists/libkdepim.libs | while read line; do echo "%exclude $line";done >>filelists/libkdepim @@ -664,8 +684,8 @@ Requires: libkdepim4-devel kde4-korganizer kde4-kontact kde4-knode kde4-kmail Requires: kdepim4 = %version kde4-kalarm = %version Requires: kde4-kaddressbook = %version -Requires: kde4-akregator = %version kde4-kpilot = %version -Requires: kde4-kmobiletools = %version +Requires: kde4-akregator = %version +#Requires: kde4-kmobiletools = %version kde4-kpilot = %version %description devel This packages contains development files of the kdepim module. @@ -734,6 +754,10 @@ /usr/share/icons/hicolor/*/apps/office-address-book.* %changelog +* Fri Jun 06 2008 wstephenson@suse.de +- Remove kpilot and kmobiletools dependency as these are not part + of KDE 4.1 +- Disable Kontact planner plugin, not part of KDE 4.1 * Tue Jun 03 2008 stbinner@suse.de - don't install /usr/share/applications/kde4/kcontactmanager.desktop * Thu May 29 2008 wstephenson@suse.de ++++++ disable-planner.diff ++++++ --- kontact/plugins/CMakeLists.txt +++ kontact/plugins/CMakeLists.txt @@ -12,7 +12,7 @@ add_subdirectory( korganizer ) add_subdirectory( summary ) add_subdirectory( specialdates ) - add_subdirectory( planner ) + # add_subdirectory( planner ) endif(QGPGME_FOUND) add_subdirectory( knotes ) add_subdirectory( knode ) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org