Mailinglist Archive: opensuse-commit (858 mails)

[root@xxxxxxxxxxxxxxx (h_root)]

Hello community,

here is the log from the commit of package kdepim4
checked in at Thu Nov 22 17:46:24 CET 2007.

--------
--- KDE/kdepim4/kdepim4.changes 2007-11-14 17:36:52.000000000 +0100
+++ /mounts/work_src_done/STABLE/kdepim4/kdepim4.changes        2007-11-22 
16:58:36.000000000 +0100
@@ -1,0 +2,10 @@
+Thu Nov 22 16:58:32 CET 2007 - stbinner@xxxxxxx
+
+- fix file conflicts
+
+-------------------------------------------------------------------
+Wed Nov 21 18:57:55 CET 2007 - dmueller@xxxxxxx
+
+- update to 3.96.1
+
+-------------------------------------------------------------------

Old:
----
  kdepim-3.96.0.tar.bz2

New:
----
  kdepim-3.96.1.tar.bz2

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

Other differences:
------------------
++++++ kdepim4.spec ++++++
--- /var/tmp/diff_new_pack.tp3582/_old  2007-11-22 17:46:03.000000000 +0100
+++ /var/tmp/diff_new_pack.tp3582/_new  2007-11-22 17:46:03.000000000 +0100
@@ -1,5 +1,5 @@
 #
-# spec file for package kdepim4 (Version 3.96.0)
+# spec file for package kdepim4 (Version 3.96.1)
 #
 # Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany.
 # This file and all modifications and additions to the pristine
@@ -22,9 +22,9 @@
 Group:          System/GUI/KDE
 Summary:        Base package of kdepim
 Url:            http://www.kde.org
-Version:        3.96.0
+Version:        3.96.1
 Release:        1
-%define rversion 3.96.0
+%define rversion 3.96.1
 Source0:        kdepim-%rversion.tar.bz2
 Source1:        _upstream
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
@@ -73,7 +73,7 @@
   %create_subdir_filelist -d korganizer -n kdepim-%rversion -o devel
   %create_subdir_filelist -d kalarm -n kdepim-%rversion -o devel
   %create_subdir_filelist -d kmail -n kdepim-%rversion -o devel
-  %create_subdir_filelist -d knode -n kdepim-%rversion
+  %create_subdir_filelist -d knode -n kdepim-%rversion -o devel
   %create_subdir_filelist -d kpilot -n kdepim-%rversion -o devel
   %create_subdir_filelist -d kontact -n kdepim-%rversion -o devel
   %create_subdir_filelist -d wizards -n kdepim-%rversion
@@ -87,15 +87,17 @@
   %create_subdir_filelist -d akonadi -n kdepim-%rversion -o devel
   cd ..
   cat filelists/akregator.devel filelists/kaddressbook.devel 
filelists/kmail.devel filelists/kontact.devel \
-      filelists/kpilot.devel filelists/kmobiletools.devel 
filelists/korganizer.devel filelists/kalarm.devel >filelists/devel
+      filelists/kpilot.devel filelists/kmobiletools.devel 
filelists/korganizer.devel filelists/kalarm.devel \
+      filelists/knode.devel >filelists/devel
   rm filelists/akregator.devel filelists/kaddressbook.devel 
filelists/kmail.devel filelists/kontact.devel \
-      filelists/kpilot.devel filelists/kmobiletools.devel 
filelists/korganizer.devel filelists/kalarm.devel
+     filelists/kpilot.devel filelists/kmobiletools.devel 
filelists/korganizer.devel filelists/kalarm.devel \
+     filelists/knode.devel
   cat filelists/akonadi.devel | while read line; do echo "%exclude $line";done 
> > filelists/devel
+  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
   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
-  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
   cat filelists/* | while read line; do echo "%exclude $line";done 
> filelists/exclude
   %suse_update_desktop_file korganizer      Office   Calendar
   %suse_update_desktop_file kalarm          Utility  TimeUtility
@@ -125,7 +127,7 @@
 
 %clean
   rm -rf $RPM_BUILD_ROOT
-#  rm -rf filelists
+  rm -rf filelists
 
 %package -n libakonadi1
 Group:          System/GUI/KDE
@@ -167,13 +169,13 @@
 --------
     The KDE Team <kde@xxxxxxx>
 
-
 %files -n akonadi -f filelists/akonadi
 %defattr(-,root,root)
 %doc COPYING COPYING.LIB COPYING-DOCS README
 %dir /etc/kde4/akonadi
 %dir /usr/share/akonadi
 %dir /usr/share/akonadi/agents
+%exclude 
/usr/share/kde4/apps/akonadi/plugins/serializer/akonadi_serializer_sms.desktop
 
 %package -n akonadi-devel
 Group:          System/GUI/KDE
@@ -345,6 +347,7 @@
 %files -n kde4-knotes -f filelists/knotes
 %defattr(-,root,root)
 %doc COPYING COPYING.LIB COPYING-DOCS README
+%exclude /usr/share/kde4/apps/knotes/knotes_part.rc
 
 %package -n kde4-kontact
 Group:          Productivity/Other
@@ -530,7 +533,6 @@
 --------
     The KDE Team <kde@xxxxxxx>
 
-
 %files -n libkdepim4-devel -f filelists/libkdepim.devel
 %defattr(-,root,root)
 %doc COPYING COPYING.LIB COPYING-DOCS README
@@ -584,6 +586,7 @@
 %files devel -f filelists/devel
 %defattr(-,root,root)
 %doc COPYING COPYING.LIB COPYING-DOCS README
+%exclude /usr/%_lib/libkpilot_conduit_base.so
 /usr/%_lib/*.so
 /usr/include/*
 %_kde_share_dir/apps/cmake/modules/*
@@ -629,7 +632,12 @@
 /usr/share/kde4/config.kcfg
 /usr/share/kde4/services
 %doc %lang(en) /usr/share/doc/kde/HTML/en/konsolekalendar
+
 %changelog
+* Thu Nov 22 2007 - stbinner@xxxxxxx
+- fix file conflicts
+* Wed Nov 21 2007 - dmueller@xxxxxxx
+- update to 3.96.1
 * Wed Nov 14 2007 - dmueller@xxxxxxx
 - update to 3.96.0
 * Wed Nov 07 2007 - dmueller@xxxxxxx

++++++ kdepim-3.96.0.tar.bz2 -> kdepim-3.96.1.tar.bz2 ++++++
KDE/kdepim4/kdepim-3.96.0.tar.bz2 
/mounts/work_src_done/STABLE/kdepim4/kdepim-3.96.1.tar.bz2 differ: byte 11, 
line 1



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



Remember to have fun...

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