* Wed Aug 22 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 6:3.5.7-21

- vcard30 patch (kde#115219,rh#253496)
- -devel: restore awol Requires (< f8 only) (#253801)
- License: LGPLv2

kdelibs-3.5.7-kde#115219.patch

@@ -0,0 +1,63 @@
+diff -up kdelibs-3.5.7/kabc/vcardtool.cpp.kde#115219 kdelibs-3.5.7/kabc/vcardtool.cpp
+--- kdelibs-3.5.7/kabc/vcardtool.cpp.kde#115219	2006-03-17 04:19:10.000000000 -0600
++++ kdelibs-3.5.7/kabc/vcardtool.cpp	2007-08-22 08:27:19.000000000 -0500
+@@ -242,8 +242,12 @@ QString VCardTool::createVCards( Address
+     card.addLine( noteLine );
+ 
+     // ORG
+-    VCardLine orgLine( "ORG", (*addrIt).organization() );
+-    if ( version == VCard::v2_1 && needsEncoding( (*addrIt).organization() ) ) {
++    QStringList organization;
++    organization.append( ( *addrIt ).organization().replace( ';', "\\;" ) );
++    if ( !( *addrIt ).department().isEmpty() )
++      organization.append( ( *addrIt ).department().replace( ';', "\\;" ) );
++    VCardLine orgLine( "ORG", organization.join( ";" ) );
++    if ( version == VCard::v2_1 && needsEncoding( organization.join( ";" ) ) ) { 
+       orgLine.addParameter( "charset", "UTF-8" );
+       orgLine.addParameter( "encoding", "QUOTED-PRINTABLE" );
+     }
+@@ -506,8 +510,13 @@ Addressee::List VCardTool::parseVCards( 
+           addr.setNote( (*lineIt).value().asString() );
+ 
+         // ORGANIZATION
+-        else if ( identifier == "org" )
+-          addr.setOrganization( (*lineIt).value().asString() );
++        else if ( identifier == "org" ) {
++          const QStringList orgParts = splitString( semicolonSep, (*lineIt).value().toString() );
++          if ( orgParts.count() > 0 )
++            addr.setOrganization( orgParts[ 0 ] );
++          if ( orgParts.count() > 1 )
++            addr.setDepartment( orgParts[ 1 ] ); 
++        }
+ 
+         // PHOTO
+         else if ( identifier == "photo" )
+diff -up kdelibs-3.5.7/kabc/ldifconverter.cpp.kde#115219 kdelibs-3.5.7/kabc/ldifconverter.cpp
+--- kdelibs-3.5.7/kabc/ldifconverter.cpp.kde#115219	2005-10-10 10:05:53.000000000 -0500
++++ kdelibs-3.5.7/kabc/ldifconverter.cpp	2007-08-22 08:24:25.000000000 -0500
+@@ -141,7 +141,13 @@ bool LDIFConverter::addresseeToLDIF( con
+   ldif_out( t, "o", addr.organization() );
+   ldif_out( t, "organization", addr.organization() );
+   ldif_out( t, "organizationname", addr.organization() );
+-  ldif_out( t, "department", addr.custom("KADDRESSBOOK", "X-Department") );
++
++  // Compatibility with older kabc versions.
++  if ( !addr.department().isEmpty() )
++    ldif_out( t, "department", addr.department() );
++  else
++    ldif_out( t, "department", addr.custom("KADDRESSBOOK", "X-Department") );
++
+   ldif_out( t, "workurl", addr.url().prettyURL() );
+   ldif_out( t, "homeurl", addr.url().prettyURL() );
+   ldif_out( t, "description", addr.note() );
+diff -up kdelibs-3.5.7/kabc/scripts/entrylist.kde#115219 kdelibs-3.5.7/kabc/scripts/entrylist
+--- kdelibs-3.5.7/kabc/scripts/entrylist.kde#115219	2007-05-14 02:52:37.000000000 -0500
++++ kdelibs-3.5.7/kabc/scripts/entrylist	2007-08-22 08:25:05.000000000 -0500
+@@ -63,6 +63,7 @@ ALE,geographic position,,Geo,geo,,.asStr
+ ALFE,title,person,QString,title,Organization
+ ALFE,role,person in organization,QString,role,Organization
+ ALFE,organization,,QString,organization,Organization
++ALFE,department,,QString,department,Organization
+ 
+ ALFE,note,,QString,note
+ 

kdelibs.spec

@@ -21,7 +21,7 @@
 
 Summary: K Desktop Environment - Libraries
 Version: 3.5.7
-Release: 20%{?dist}
+Release: 21%{?dist}
 
 %if 0%{?fedora} > 8
 Name: kdelibs3
@@ -34,9 +34,7 @@ Obsoletes: kdelibs3 = %{version}-%{release}
 Provides: kdelibs3 = %{version}-%{release}
 %endif
 
-# LGPLv2: everything, except (see below)
-# BSD: dcop/
-License: BSD and LGPLv2
+License: LGPLv2
 Url: http://www.kde.org/
 Group: System Environment/Libraries
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) 
@@ -79,6 +77,8 @@ Patch500: kdelibs-3.5.7-kde#146105.patch
 Patch501: kdelibs-3.5.7-rh#244065.patch
 # http://www.kde.org/info/security/advisory-20070815-1.txt
 Patch502: ftp://ftp.kde.org/pub/kde/security_patches/post-3.5.7-kdelibs-kdecore.diff
+# vcard30 patch, http://bugs.kde.org/115219
+Patch115219: kdelibs-3.5.7-kde#115219.patch
 
 %{?arts:Requires: arts >= %{arts_epoch}:%{arts_version}}
 Requires: qt >= %{qt_epoch}:%{qt_ver}
@@ -174,9 +174,23 @@ Provides:  kdelibs-devel = 6:%{version}-%{release}
 %endif
 Requires: %{name} = %{?epoch:%{epoch}:}%{version}-%{release}
 Requires: qt-devel
+Requires: openssl-devel
 %{?arts:Requires: arts-devel}
 %{?libkdnssd:Requires: libkdnssd-devel}
-Requires: openssl-devel
+%if 0%{?fedora} > 7
+## those below can/should be omitted from future builds -- Rex
+%else
+Requires: bzip2-devel
+Requires: libacl-devel
+Requires: libart_lgpl-devel
+Requires: libidn-devel
+Requires: libxslt-devel
+Requires: libjpeg-devel
+Requires: libtiff-devel
+%{?_with_libutempter:Requires: libutempter-devel}
+Requires: pcre-devel
+Requires: zlib-devel
+%endif
 %description devel
 This package includes the header files you will need to compile
 applications for KDE.
@@ -225,6 +239,7 @@ format for easy browsing
 %patch500 -p0 -b .kde#146105
 %patch501 -p4 -b .rh#244065
 %patch502 -p0 -b .advisory-20070815-1
+%patch115219 -p1 -b .kde#115219
 
 sed -i -e "s,^#define KDE_VERSION_STRING .*,#define KDE_VERSION_STRING \"%{version}-%{release} %{distname}\"," kdecore/kdeversion.h
 
@@ -398,6 +413,7 @@ touch --no-create %{_datadir}/icons/crystalsvg 2> /dev/null || :
 
 %files
 %defattr(-,root,root,-)
+%doc README
 %doc COPYING.LIB
 %config(noreplace) %{_sysconfdir}/profile.d/*
 %{_bindir}/artsmessage
@@ -506,6 +522,11 @@ touch --no-create %{_datadir}/icons/crystalsvg 2> /dev/null || :
 
 
 %changelog
+* Wed Aug 22 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 6:3.5.7-21
+- vcard30 patch (kde#115219,rh#253496)
+- -devel: restore awol Requires (< f8 only) (#253801)
+- License: LGPLv2
+
 * Wed Aug 15 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 6:3.5.7-20
 - CVE-2007-3820, CVE-2007-4224, CVE-2007-4225
 - clarify licensing