Hello community,
here is the log from the commit of package kdepim4
checked in at Sat Apr 26 11:33:33 CEST 2008.
--------
--- KDE/kdepim4/kdepim4.changes 2008-04-15 15:03:53.000000000 +0200
+++ /mounts/work_src_done/STABLE/kdepim4/kdepim4.changes 2008-04-24 15:27:18.000000000 +0200
@@ -1,0 +2,20 @@
+Thu Apr 24 15:26:34 CEST 2008 - wstephenson@suse.de
+
+- Adapt to new Akonadi location, update to 4.0.71
+
+-------------------------------------------------------------------
+Tue Apr 22 10:26:54 CEST 2008 - wstephenson@suse.de
+
+- remove weather kontact plugin - kweather is broken
+
+-------------------------------------------------------------------
+Mon Apr 21 16:03:28 CEST 2008 - dmueller@suse.de
+
+- remove plasmabiff (doesn't build against KDE 4.0 anymore)
+
+-------------------------------------------------------------------
+Fri Apr 18 12:12:12 CEST 2008 - dmueller@suse.de
+
+- update to 4.0.70
+
+-------------------------------------------------------------------
@@ -22,0 +43,5 @@
+Mon Apr 14 13:16:08 CEST 2008 - dmueller@suse.de
+
+- fix build once again, fix packaging errors
+
+-------------------------------------------------------------------
Old:
----
kdepim-4.0.69.tar.bz2
New:
----
disable-kontact-weather-plugin.diff
disable-plasma-dependencies.diff
kdepim-4.0.71.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ kdepim4.spec ++++++
--- /var/tmp/diff_new_pack.t12294/_old 2008-04-26 11:33:23.000000000 +0200
+++ /var/tmp/diff_new_pack.t12294/_new 2008-04-26 11:33:23.000000000 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package kdepim4 (Version 4.0.69)
+# spec file for package kdepim4 (Version 4.0.71)
#
# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine
@@ -28,17 +28,18 @@
Group: System/GUI/KDE
Summary: Base package of kdepim
Url: http://www.kde.org
-Version: 4.0.69
-Release: 6
+Version: 4.0.71
+Release: 1
Source0: kdepim-%version.tar.bz2
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: disable-kontact-weather-plugin.diff
BuildRoot: %{_tmppath}/%{name}-%{version}-build
%kde4_runtime_requires
-Suggests: akonadi
Suggests: kde4-ktnef
Suggests: kde4-akregator
Suggests: kde4-kaddressbook
@@ -74,6 +75,8 @@
%patch4
%patch5
%patch6
+%patch7
+%patch8
%build
%if ! %with_kitchensync
@@ -85,19 +88,6 @@
%install
cd build
%makeinstall
- rm -fv /usr/%_lib/libgwsoap.so
- rm -fv /usr/%_lib/libkabcscalix.so
- rm -fv /usr/%_lib/libkcal_groupdav.so
- rm -fv /usr/%_lib/libkcal_resourceblog.so
- rm -fv /usr/%_lib/libkcal_resourcefeatureplan.so
- rm -fv /usr/%_lib/libkcal_resourceremote.so
- rm -fv /usr/%_lib/libkcal_slox.so
- rm -fv /usr/%_lib/libkcal_xmlrpc.so
- rm -fv /usr/%_lib/libkcalkolab.so
- rm -fv /usr/%_lib/libkcalscalix.so
- rm -fv /usr/%_lib/libkmailprivate.so
- rm -fv /usr/%_lib/libknodecommon.so
- rm -fv /usr/%_lib/libknotesscalix.so
mkdir -p $RPM_BUILD_ROOT/usr/share/icons/hicolor/{16x16,22x22,32x32,48x48,64x64,128x128}/apps
cp /usr/share/icons/oxygen/128x128/apps/internet-mail.png $RPM_BUILD_ROOT/usr/share/icons/hicolor/128x128/apps/
cp /usr/share/icons/oxygen/16x16/apps/internet-mail.png $RPM_BUILD_ROOT/usr/share/icons/hicolor/16x16/apps/
@@ -135,30 +125,27 @@
%create_subdir_filelist -d korn
%create_subdir_filelist -d kaddressbook -v devel
%create_subdir_filelist -d libkdepim -v libkdepim.devel
+%if 0
%create_subdir_filelist -d akonadi -v akonadi.devel
- cd ..
cat filelists/akonadi.devel | while read line; do echo "%exclude $line";done >>filelists/devel
-# we don't need this anymore and it seems to cause http://rafb.net/p/316gsy49.html (dirk)
-%if 0
- grep "/usr/lib" filelists/akonadi | grep -v "/kde4/" >filelists/akonadi.libs
- cat filelists/akonadi.libs | while read line; do echo "%exclude $line";done >>filelists/akonadi
%endif
+ cd ..
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
%create_exclude_filelist
%suse_update_desktop_file korganizer Office Calendar
%suse_update_desktop_file kalarm Utility TimeUtility
- %suse_update_desktop_file kalarmd Utility TimeUtility
+ #%x_suse_update_desktop_file kalarmd Utility TimeUtility
%suse_update_desktop_file karm Utility TimeUtility
%suse_update_desktop_file kaddressbook Office ContactManagement
%suse_update_desktop_file knotes Utility DesktopUtility
%suse_update_desktop_file KMail Network Email
%suse_update_desktop_file -u akonadiconsole Network Email
+ %suse_update_desktop_file -u akonaditray Network Email
%suse_update_desktop_file -r KOrn Utility Applet
%suse_update_desktop_file KNode Network News
%suse_update_desktop_file Kontact Office Core-Office
- %suse_update_desktop_file akonaditray Office Core-Office
%suse_update_desktop_file -u ktnef Network Email
%suse_update_desktop_file groupwarewizard Utility DesktopSettings
%suse_update_desktop_file akregator Network RSS-News
@@ -168,6 +155,7 @@
%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
@@ -181,6 +169,7 @@
%clean
rm -rf $RPM_BUILD_ROOT
rm -rf filelists
+%if 0
%package -n akonadi
License: LGPL v2.1 or later
@@ -199,11 +188,9 @@
--------
The KDE Team
-%post -n akonadi
-/sbin/ldconfig
+%post -n akonadi -p /sbin/ldconfig
-%postun -n akonadi
-/sbin/ldconfig
+%postun -n akonadi -p /sbin/ldconfig
%files -n akonadi -f filelists/akonadi
%defattr(-,root,root)
@@ -229,15 +216,14 @@
--------
The KDE Team
-%post -n akonadi-devel
-/sbin/ldconfig
+%post -n akonadi-devel -p /sbin/ldconfig
-%postun -n akonadi-devel
-/sbin/ldconfig
+%postun -n akonadi-devel -p /sbin/ldconfig
%files -n akonadi-devel -f filelists/akonadi.devel
%defattr(-,root,root)
%doc COPYING COPYING.LIB COPYING.DOC README
+%endif
%package -n kde4-ktnef
License: LGPL v2.1 or later
@@ -254,11 +240,9 @@
--------
The KDE Team
-%post -n kde4-ktnef
-/sbin/ldconfig
+%post -n kde4-ktnef -p /sbin/ldconfig
-%postun -n kde4-ktnef
-/sbin/ldconfig
+%postun -n kde4-ktnef -p /sbin/ldconfig
%files -n kde4-ktnef -f filelists/ktnef
%defattr(-,root,root)
@@ -268,7 +252,9 @@
License: LGPL v2.1 or later
Group: Productivity/Networking/News/Utilities
Summary: RSS Feed Reader
+Requires: libkdepim4 >= %version
%kde4_runtime_requires
+%kde4_pimlibs_requires
%description -n kde4-akregator
A KDE Feed Aggregator
@@ -279,11 +265,9 @@
--------
The KDE Team
-%post -n kde4-akregator
-/sbin/ldconfig
+%post -n kde4-akregator -p /sbin/ldconfig
-%postun -n kde4-akregator
-/sbin/ldconfig
+%postun -n kde4-akregator -p /sbin/ldconfig
%files -n kde4-akregator -f filelists/akregator
%defattr(-,root,root)
@@ -293,7 +277,9 @@
License: LGPL v2.1 or later
Group: Productivity/Networking/Email/Utilities
Summary: Address Manager
+Requires: libkdepim4 >= %version
%kde4_runtime_requires
+%kde4_pimlibs_requires
%description -n kde4-kaddressbook
The KDE Address Book
@@ -304,11 +290,9 @@
--------
The KDE Team
-%post -n kde4-kaddressbook
-/sbin/ldconfig
+%post -n kde4-kaddressbook -p /sbin/ldconfig
-%postun -n kde4-kaddressbook
-/sbin/ldconfig
+%postun -n kde4-kaddressbook -p /sbin/ldconfig
%files -n kde4-kaddressbook -f filelists/kaddressbook
%defattr(-,root,root)
@@ -318,6 +302,7 @@
License: LGPL v2.1 or later
Group: Productivity/Networking/Email/Clients
Summary: Mail Client
+Requires: libkdepim4 >= %version
%kde4_runtime_requires
%description -n kde4-kmail
@@ -329,11 +314,9 @@
--------
The KDE Team
-%post -n kde4-kmail
-/sbin/ldconfig
+%post -n kde4-kmail -p /sbin/ldconfig
-%postun -n kde4-kmail
-/sbin/ldconfig
+%postun -n kde4-kmail -p /sbin/ldconfig
%files -n kde4-kmail -f filelists/kmail
%defattr(-,root,root)
@@ -346,6 +329,7 @@
License: LGPL v2.1 or later
Group: Productivity/Networking/News/Clients
Summary: News Reader
+Requires: libkdepim4 >= %version
%kde4_runtime_requires
%description -n kde4-knode
@@ -357,11 +341,9 @@
--------
The KDE Team
-%post -n kde4-knode
-/sbin/ldconfig
+%post -n kde4-knode -p /sbin/ldconfig
-%postun -n kde4-knode
-/sbin/ldconfig
+%postun -n kde4-knode -p /sbin/ldconfig
%files -n kde4-knode -f filelists/knode
%defattr(-,root,root)
@@ -371,6 +353,7 @@
License: LGPL v2.1 or later
Group: Productivity/Other
Summary: Popup Notes
+Requires: libkdepim4 >= %version
%kde4_runtime_requires
%description -n kde4-knotes
@@ -382,11 +365,9 @@
--------
The KDE Team
-%post -n kde4-knotes
-/sbin/ldconfig
+%post -n kde4-knotes -p /sbin/ldconfig
-%postun -n kde4-knotes
-/sbin/ldconfig
+%postun -n kde4-knotes -p /sbin/ldconfig
%files -n kde4-knotes -f filelists/knotes
%defattr(-,root,root)
@@ -397,6 +378,7 @@
License: LGPL v2.1 or later
Group: Productivity/Other
Summary: Personal Information Manager
+Requires: libkdepim4 >= %version
%kde4_runtime_requires
%description -n kde4-kontact
@@ -409,11 +391,9 @@
--------
The KDE Team
-%post -n kde4-kontact
-/sbin/ldconfig
+%post -n kde4-kontact -p /sbin/ldconfig
-%postun -n kde4-kontact
-/sbin/ldconfig
+%postun -n kde4-kontact -p /sbin/ldconfig
%files -n kde4-kontact -f filelists/kontact
%defattr(-,root,root)
@@ -435,11 +415,9 @@
--------
The KDE Team
-%post -n kde4-kitchensync
-/sbin/ldconfig
+%post -n kde4-kitchensync -p /sbin/ldconfig
-%postun -n kde4-kitchensync
-/sbin/ldconfig
+%postun -n kde4-kitchensync -p /sbin/ldconfig
%files -n kde4-kitchensync -f filelists/kitchensync
%defattr(-,root,root)
@@ -450,6 +428,7 @@
License: LGPL v2.1 or later
Group: Productivity/Office/Organizers
Summary: Personal Organizer
+Requires: libkdepim4 >= %version
%kde4_runtime_requires
%description -n kde4-korganizer
@@ -461,11 +440,9 @@
--------
The KDE Team
-%post -n kde4-korganizer
-/sbin/ldconfig
+%post -n kde4-korganizer -p /sbin/ldconfig
-%postun -n kde4-korganizer
-/sbin/ldconfig
+%postun -n kde4-korganizer -p /sbin/ldconfig
%files -n kde4-korganizer -f filelists/korganizer
%defattr(-,root,root)
@@ -488,11 +465,9 @@
--------
The KDE Team
-%post -n kde4-korn
-/sbin/ldconfig
+%post -n kde4-korn -p /sbin/ldconfig
-%postun -n kde4-korn
-/sbin/ldconfig
+%postun -n kde4-korn -p /sbin/ldconfig
%files -n kde4-korn -f filelists/korn
%defattr(-,root,root)
@@ -502,6 +477,7 @@
License: LGPL v2.1 or later
Group: Productivity/Other
Summary: Personal Time Tracker
+Requires: libkdepim4 >= %version
%kde4_runtime_requires
%description -n kde4-ktimetracker
@@ -513,11 +489,9 @@
--------
The KDE Team
-%post -n kde4-ktimetracker
-/sbin/ldconfig
+%post -n kde4-ktimetracker -p /sbin/ldconfig
-%postun -n kde4-ktimetracker
-/sbin/ldconfig
+%postun -n kde4-ktimetracker -p /sbin/ldconfig
%files -n kde4-ktimetracker -f filelists/ktimetracker
%defattr(-,root,root)
@@ -538,11 +512,9 @@
--------
The KDE Team
-%post wizards
-/sbin/ldconfig
+%post wizards -p /sbin/ldconfig
-%postun wizards
-/sbin/ldconfig
+%postun wizards -p /sbin/ldconfig
%files wizards -f filelists/wizards
%defattr(-,root,root)
@@ -552,7 +524,9 @@
License: LGPL v2.1 or later
Group: Productivity/Other
Summary: Personal Alarm Scheduler
+Requires: libkdepim4 >= %version
%kde4_runtime_requires
+%kde4_pimlibs_requires
%description -n kde4-kalarm
Personal alarm message, command and email scheduler for KDE
@@ -563,11 +537,9 @@
--------
The KDE Team
-%post -n kde4-kalarm
-/sbin/ldconfig
+%post -n kde4-kalarm -p /sbin/ldconfig
-%postun -n kde4-kalarm
-/sbin/ldconfig
+%postun -n kde4-kalarm -p /sbin/ldconfig
%files -n kde4-kalarm -f filelists/kalarm
%defattr(-,root,root)
@@ -577,7 +549,7 @@
License: LGPL v2.1 or later
Group: System/GUI/KDE
Summary: KDE PIM Libraries
-Requires: kdepim4 akonadi
+%requires_eq akonadi
%description -n libkdepim4
This package contains the basic packages for KDE PIM applications.
@@ -588,11 +560,9 @@
--------
The KDE Team
-%post -n libkdepim4
-/sbin/ldconfig
+%post -n libkdepim4 -p /sbin/ldconfig
-%postun -n libkdepim4
-/sbin/ldconfig
+%postun -n libkdepim4 -p /sbin/ldconfig
%files -n libkdepim4 -f filelists/libkdepim.libs
%defattr(-,root,root)
@@ -622,6 +592,7 @@
Group: Hardware/Palm
Summary: HotSync Software
%kde4_runtime_requires
+%kde4_pimlibs_requires
%description -n kde4-kpilot
HotSync software for KDE
@@ -632,11 +603,9 @@
--------
The KDE Team
-%post -n kde4-kpilot
-/sbin/ldconfig
+%post -n kde4-kpilot -p /sbin/ldconfig
-%postun -n kde4-kpilot
-/sbin/ldconfig
+%postun -n kde4-kpilot -p /sbin/ldconfig
%files -n kde4-kpilot -f filelists/kpilot
%defattr(-,root,root)
@@ -648,7 +617,9 @@
Summary: KDE Personal Information Management Base Package: Build Environment
Requires: libkdepim4-devel kde4-korganizer kde4-kontact kde4-knode kde4-kmail
Requires: kdepim4 = %version kde4-kalarm = %version
-Requires: kde4-kaddressbook = %version kde4-akregator = %version kde4-kpilot = %version kde4-kmobiletools = %version
+Requires: kde4-kaddressbook = %version
+Requires: kde4-akregator = %version kde4-kpilot = %version
+Requires: kde4-kmobiletools = %version
%description devel
This packages contains development files of the kdepim module.
@@ -659,17 +630,14 @@
--------
The KDE Team
-%post devel
-/sbin/ldconfig
+%post devel -p /sbin/ldconfig
-%postun devel
-/sbin/ldconfig
+%postun devel -p /sbin/ldconfig
%files devel -f filelists/devel
%defattr(-,root,root)
%doc COPYING COPYING.LIB COPYING.DOC README
%exclude /usr/%_lib/libkpilot_conduit_base.so
-%exclude /usr/%_lib/libtestlib.so
/usr/%_lib/*.so
/usr/include/*
%_kde_share_dir/apps/cmake/modules/*
@@ -690,11 +658,9 @@
--------
The KDE Team
-%post -n kde4-kmobiletools
-/sbin/ldconfig
+%post -n kde4-kmobiletools -p /sbin/ldconfig
-%postun -n kde4-kmobiletools
-/sbin/ldconfig
+%postun -n kde4-kmobiletools -p /sbin/ldconfig
%files -n kde4-kmobiletools -f filelists/kmobiletools
%defattr(-,root,root)
@@ -721,6 +687,14 @@
/usr/share/icons/hicolor/*/apps/office-address-book.*
%changelog
+* Thu Apr 24 2008 wstephenson@suse.de
+- Adapt to new Akonadi location, update to 4.0.71
+* Tue Apr 22 2008 wstephenson@suse.de
+- remove weather kontact plugin - kweather is broken
+* Mon Apr 21 2008 dmueller@suse.de
+- remove plasmabiff (doesn't build against KDE 4.0 anymore)
+* Fri Apr 18 2008 dmueller@suse.de
+- update to 4.0.70
* Tue Apr 15 2008 coolo@suse.de
- give akonadi %%post a ldconfig
* Tue Apr 15 2008 coolo@suse.de
@@ -730,6 +704,7 @@
vs them and they break kdepim3 apps as ld.so tries to link them
* Mon Apr 14 2008 dmueller@suse.de
- fix build once again, fix packaging errors
+- fix build once again, fix packaging errors
* Sat Apr 12 2008 dmueller@suse.de
- update to 4.0.69:
* fixes almost build (finally)
++++++ 4_1_BRANCH.diff ++++++
--- /var/tmp/diff_new_pack.t12294/_old 2008-04-26 11:33:23.000000000 +0200
+++ /var/tmp/diff_new_pack.t12294/_new 2008-04-26 11:33:23.000000000 +0200
@@ -1,7 +1,7 @@
-package: kdepim-4.0.68.tar.bz2
-kdemod: kdepim
+package: kdebase-runtime-4.0.66.tar.bz2
+kdemod: kdebase/runtime
--- BRANCH_STATUS
+++ BRANCH_STATUS
@@ -0,0 +1,2 @@
-+current HEAD: 792928
-+svn di between //trunk/KDE/kdepim@792854 and //trunk/KDE/kdepim
++current HEAD: 785576
++svn di between //trunk/KDE/kdebase/runtime@785500 and //trunk/KDE/kdebase/runtime
++++++ desktop-files.diff ++++++
--- /var/tmp/diff_new_pack.t12294/_old 2008-04-26 11:33:23.000000000 +0200
+++ /var/tmp/diff_new_pack.t12294/_new 2008-04-26 11:33:23.000000000 +0200
@@ -1,15 +1,5 @@
---- ./kalarm/kalarmd/kalarmd.desktop 2007/05/18 19:24:53 1.1
-+++ ./kalarm/kalarmd/kalarmd.desktop 2007/05/18 19:25:02
-@@ -47,7 +47,6 @@
- Name[x-test]=xxKAlarm Daemonxx
- Name[zh_TW]=KAlarm 守護程式
- Exec=kalarmd
--Icon=kalarmd
- Type=Application
- Terminal=false
- X-DBUS-StartupType=Unique
---- ./kpilot/conduits/docconduit/kpalmdoc.desktop 2007/06/04 13:30:13 1.1
-+++ ./kpilot/conduits/docconduit/kpalmdoc.desktop 2007/06/04 13:30:18
+--- kpilot/conduits/docconduit/kpalmdoc.desktop
++++ kpilot/conduits/docconduit/kpalmdoc.desktop
@@ -46,7 +46,6 @@
GenericName[uk]=Перетворювач PalmDOC
GenericName[zh_TW]=PalmDOC 轉換器
@@ -18,15 +8,15 @@
Type=Application
DocPath=kpalmdoc/index.html
Terminal=false
---- korn/KOrn.desktop 2007/06/23 06:27:00 1.1
-+++ korn/KOrn.desktop 2007/06/23 06:27:13
+--- korn/KOrn.desktop
++++ korn/KOrn.desktop
@@ -65,3 +65,4 @@
Name[zh_TW]=Korn 信件通知
X-DBUS-StartupType=Unique
Categories=Qt;KDE;Network;X-KDE-More;
+OnlyShownIn=KDE;
---- ./ktimetracker/support/karm.desktop 2007/09/14 08:29:59 1.1
-+++ ./ktimetracker/support/karm.desktop 2007/09/14 08:30:04
+--- ktimetracker/support/karm.desktop
++++ ktimetracker/support/karm.desktop
@@ -59,7 +59,6 @@
GenericName[xh]=Umfumani Wexesha Lobuqu
GenericName[zh_TW]=個人時程記錄
++++++ disable-kontact-weather-plugin.diff ++++++
Index: kontact/plugins/CMakeLists.txt
===================================================================
--- kontact/plugins/CMakeLists.txt (revision 799334)
+++ kontact/plugins/CMakeLists.txt (working copy)
@@ -22,5 +22,5 @@
if(KMOBILETOOLS_SUPPORTED)
add_subdirectory( kmobiletools )
endif(KMOBILETOOLS_SUPPORTED)
-add_subdirectory( weather )
+#add_subdirectory( weather )
++++++ disable-plasma-dependencies.diff ++++++
--- akonadi/clients/CMakeLists.txt
+++ akonadi/clients/CMakeLists.txt
@@ -3,6 +3,3 @@ add_subdirectory(akonadiconsole)
add_subdirectory(kabc)
add_subdirectory(akonamail)
add_subdirectory(akonalendar)
-if(Q_WS_X11)
- add_subdirectory(plasma)
-endif(Q_WS_X11)
++++++ kdepim-4.0.69.tar.bz2 -> kdepim-4.0.71.tar.bz2 ++++++
KDE/kdepim4/kdepim-4.0.69.tar.bz2 /mounts/work_src_done/STABLE/kdepim4/kdepim-4.0.71.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