Hello community,

here is the log from the commit of package kdepim3 for openSUSE:Factory checked 
in at 2012-03-01 17:20:47
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/kdepim3 (Old)
 and      /work/SRC/openSUSE:Factory/.kdepim3.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Package is "kdepim3", Maintainer is "[email protected]"

Changes:
--------
--- /work/SRC/openSUSE:Factory/kdepim3/kdepim3.changes  2011-12-13 
11:48:52.000000000 +0100
+++ /work/SRC/openSUSE:Factory/.kdepim3.new/kdepim3.changes     2012-03-01 
17:20:48.000000000 +0100
@@ -1,0 +2,10 @@
+Mon Feb 13 10:48:04 UTC 2012 - [email protected]
+
+- patch license to follow spdx.org standard
+
+-------------------------------------------------------------------
+Tue Jan 31 14:48:08 UTC 2012 - [email protected]
+
+- reverting back to gcc-4.3 due to another crash when starting kmail from 
kontact
+
+-------------------------------------------------------------------

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

Other differences:
------------------
++++++ kdepim3.spec ++++++
--- /var/tmp/diff_new_pack.GBGYIf/_old  2012-03-01 17:20:51.000000000 +0100
+++ /var/tmp/diff_new_pack.GBGYIf/_new  2012-03-01 17:20:51.000000000 +0100
@@ -1,7 +1,7 @@
 #
 # spec file for package kdepim3
 #
-# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -13,20 +13,31 @@
 # published by the Open Source Initiative.
 
 # Please submit bugfixes or comments via http://bugs.opensuse.org/
+#
 
 
 Name:           kdepim3
-BuildRequires:  cyrus-sasl-devel flex kdelibs3-devel libassuan-devel 
libmal-devel python-devel fdupes
+BuildRequires:  cyrus-sasl-devel
+BuildRequires:  fdupes
+BuildRequires:  flex
+BuildRequires:  kdelibs3-devel
+BuildRequires:  libassuan-devel
+BuildRequires:  libmal-devel
+BuildRequires:  python-devel
 %if %suse_version < 1210
 BuildRequires:  hal-devel
 %endif
-BuildRequires:  gnokii-devel libopensync-devel pilot-link-devel
-BuildRequires:  gpgme-devel gpg2
+BuildRequires:  gnokii-devel
+BuildRequires:  libopensync-devel
+BuildRequires:  pilot-link-devel
+BuildRequires:  gpg2
+BuildRequires:  gpgme-devel
+BuildRequires:  gcc43-c++
+Summary:        Personal Information Manager Software for KDE
 License:        GPL-2.0
 Group:          System/GUI/KDE
-Summary:        Personal Information Manager Software for KDE
 Version:        3.5.10
-Release:        9
+Release:        0
 Url:            http://www.kde.org/
 Requires:       suse_help_viewer
 Requires:       libkcal2
@@ -84,32 +95,32 @@
 * Various wizards to connect to groupware servers
 
 %package -n libktnef1
-License:        GPL-2.0
 Summary:        Library to read TNEF
+License:        GPL-2.0
 Group:          System/GUI/KDE
 
 %description -n libktnef1
 This package contains a library to read the TNEF format.
 
 %package -n libkmime2
-License:        GPL-2.0
 Summary:        Library to read MIME messages
+License:        GPL-2.0
 Group:          System/GUI/KDE
 
 %description -n libkmime2
 This package contains a library to read MIME messages.
 
 %package -n libkmime-devel
-License:        GPL-2.0
 Summary:        Library to read MIME messages
+License:        GPL-2.0
 Group:          System/GUI/KDE
 
 %description -n libkmime-devel
 This package contains a library to read MIME messages.
 
 %package -n libktnef-devel
-License:        GPL-2.0
 Summary:        Library to read TNEF
+License:        GPL-2.0
 Group:          System/GUI/KDE
 Requires:       libktnef1
 
@@ -117,8 +128,8 @@
 This package contains a library to read the TNEF format.
 
 %package -n libkcal2
-License:        GPL-2.0
 Summary:        Calendaring Classes
+License:        GPL-2.0
 Group:          System/GUI/KDE
 Requires:       libkcal
 
@@ -129,8 +140,8 @@
 be GUI independent and suitable for writing command line applications.
 
 %package -n libkcal-devel
-License:        GPL-2.0
 Summary:        Calendering Classes
+License:        GPL-2.0
 Group:          System/GUI/KDE
 Requires:       libkcal2
 
@@ -141,8 +152,8 @@
 be GUI independent and suitable for writing command line applications.
 
 %package -n libkcal
-License:        GPL-2.0
 Summary:        Calendaring Classes
+License:        GPL-2.0
 Group:          System/GUI/KDE
 Requires:       libkcal2
 
@@ -153,10 +164,10 @@
 be GUI independent and suitable for writing command line applications.
 
 %package devel
-License:        GPL-2.0
 Provides:       kdenetwork3-devel  = 3.2.1
 Obsoletes:      kdenetwork3-devel <= 3.2.1
 Summary:        Personal Information Manager software for KDE
+License:        GPL-2.0
 Group:          System/GUI/KDE
 Requires:       %name = %version libktnef-devel libkmime-devel libkcal-devel
 
@@ -164,10 +175,10 @@
 This package contains tools for address and date organization.
 
 %package mobile
-License:        LGPL-2.0.1 or later
 # usesubdirs kandy kmobile
 Provides:       kdepim3:/opt/kde3/bin/kandy
 Summary:        Cell Phone Support
+License:        LGPL-2.1+
 Group:          Hardware/Mobile
 
 %description mobile
@@ -179,10 +190,10 @@
 cell phones)
 
 %package time-management
-License:        GPL-2.0
 # usesubdirs karm konsolekalendar kalarm
 Provides:       kdepim3:/opt/kde3/bin/karm
 Summary:        Personal Information Manager
+License:        GPL-2.0
 Group:          System/GUI/KDE
 
 %description time-management
@@ -190,9 +201,9 @@
 
 
 %package kpilot
-License:        LGPL-2.0.1 or later
 # usesubdirs kpilot
 Summary:        This Package allows Communication with the 3COM Palm Pilot
+License:        LGPL-2.1+
 Group:          Hardware/Mobile
 
 %description kpilot
@@ -200,8 +211,8 @@
 Pilot via the Palm Cradle.
 
 %package notes
-License:        GPL-2.0
 Summary:        Note taking application
+License:        GPL-2.0
 Group:          System/GUI/KDE
 Provides:       kdepim3:/opt/kde3/bin/knotes
 Requires:       kdepim3
@@ -210,8 +221,8 @@
 This package contains the notes application KNotes.
 
 %package -n kitchensync
-License:        GPL-2.0; LGPL-2.0.1 or later
 Summary:        KDE Synchronization application based on OpenSync
+License:        GPL-2.0 ; LGPL-2.1+
 Group:          Hardware/PDA
 Provides:       kdepim3-sync
 Obsoletes:      kdepim3-sync
@@ -252,13 +263,13 @@
 %patch130 -p1
 %patch131 -p3
 %patch132 -p1
-%patch133 -p1
-
+#%patch133 -p1
 . /etc/opt/kde3/common_options
 update_admin
 
 %build
-
+export CC=gcc-4.3
+export CXX=g++-4.3
 . /etc/opt/kde3/common_options
 export CXXFLAGS="$CXXFLAGS -Wl,--add-needed"
 configopts="--disable-final"
@@ -266,7 +277,7 @@
   --without-arts --disable-final \
   --enable-newdistrlists=no
 # may fail with higher number of jobs
-do_make -j4
+do_make -j2
 
 %install
 . /etc/opt/kde3/common_options
@@ -320,7 +331,6 @@
 
 %postun -n kitchensync -p /sbin/ldconfig
 
-
 %files
 %defattr(-,root,root)
 %dir /opt/kde3/share/icons/hicolor/16x16

-- 
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]

Reply via email to