Hello community, here is the log from the commit of package kdepimlibs4 for openSUSE:Factory checked in at 2013-06-14 15:44:58 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kdepimlibs4 (Old) and /work/SRC/openSUSE:Factory/.kdepimlibs4.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "kdepimlibs4" Changes: -------- --- /work/SRC/openSUSE:Factory/kdepimlibs4/kdepimlibs4.changes 2013-06-11 09:31:39.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.kdepimlibs4.new/kdepimlibs4.changes 2013-06-14 15:45:00.000000000 +0200 @@ -1,0 +2,5 @@ +Thu Jun 6 13:50:42 UTC 2013 - [email protected] + +- Added ldapkio-kolab3.diff to add LDAP config for Kolab 3 + +------------------------------------------------------------------- New: ---- ldapkio-kolab3.diff ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kdepimlibs4.spec ++++++ --- /var/tmp/diff_new_pack.8xFAev/_old 2013-06-14 15:45:01.000000000 +0200 +++ /var/tmp/diff_new_pack.8xFAev/_new 2013-06-14 15:45:01.000000000 +0200 @@ -25,6 +25,8 @@ Url: http://www.kde.org Source0: kdepimlibs-%{version}.tar.xz Patch1: disable-pth-build.diff +# ldapkio-kolab3.diff: Add LDAP config for Kolab 3 +Patch2: ldapkio-kolab3.diff BuildRequires: boost-devel BuildRequires: cyrus-sasl-devel BuildRequires: fdupes @@ -58,6 +60,7 @@ %prep %setup -q -n kdepimlibs-%{version} %patch1 +%patch2 %build %cmake_kde4 -d build -- -DKDE4_ENABLE_FINAL=1 ++++++ ldapkio-kolab3.diff ++++++ --- kabc/plugins/ldapkio/resourceldapkioconfig.cpp.orig 2013-06-06 15:38:53.879540239 +0200 +++ kabc/plugins/ldapkio/resourceldapkioconfig.cpp 2013-06-06 15:37:32.421630520 +0200 @@ -251,17 +251,20 @@ AttributesDialog::AttributesDialog( cons mDefaultMap.insert( QLatin1String( "jpegPhoto" ), QLatin1String( "jpegPhoto" ) ); // overwrite the default values here - QMap<QString, QString> kolabMap, netscapeMap, evolutionMap, outlookMap; + QMap<QString, QString> kolab2Map, kolab3Map, netscapeMap, evolutionMap, outlookMap; - // kolab - kolabMap.insert( QLatin1String( "formattedName" ), QLatin1String( "display-name" ) ); - kolabMap.insert( QLatin1String( "mailAlias" ), QLatin1String( "mailalias" ) ); + // Kolab 2 + kolab2Map.insert( QLatin1String( "formattedName" ), QLatin1String( "display-name" ) ); + kolab2Map.insert( QLatin1String( "mailAlias" ), QLatin1String( "mailalias" ) ); + // Kolab 3 + kolab3Map.insert( QLatin1String( "mailAlias" ), QLatin1String( "alias" ) ); // evolution evolutionMap.insert( QLatin1String( "formattedName" ), QLatin1String( "fileAs" ) ); mMapList.append( attributes ); - mMapList.append( kolabMap ); + mMapList.append( kolab2Map ); + mMapList.append( kolab3Map ); mMapList.append( netscapeMap ); mMapList.append( evolutionMap ); mMapList.append( outlookMap ); @@ -276,7 +279,8 @@ AttributesDialog::AttributesDialog( cons layout->addWidget( mMapCombo, 0, 1 ); mMapCombo->addItem( i18n( "User Defined" ) ); - mMapCombo->addItem( i18n( "Kolab" ) ); + mMapCombo->addItem( i18n( "Kolab 2" ) ); + mMapCombo->addItem( i18n( "Kolab 3" ) ); mMapCombo->addItem( i18n( "Netscape" ) ); mMapCombo->addItem( i18n( "Evolution" ) ); mMapCombo->addItem( i18n( "Outlook" ) ); diff -Ppru kabc/plugins/ldapkio/resourceldapkioconfig.h.orig kabc/plugins/ldapkio/resourceldapkioconfig.h --- kabc/plugins/ldapkio/resourceldapkioconfig.h.orig 2013-06-06 15:38:53.879540239 +0200 +++ kabc/plugins/ldapkio/resourceldapkioconfig.h 2013-06-06 15:37:33.320596433 +0200 @@ -85,7 +85,8 @@ class AttributesDialog : public KDialog private: enum { UserMap, - KolabMap, + Kolab2Map, + Kolab3Map, NetscapeMap, EvolutionMap, OutlookMap -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
