[sssd/f17] Switch unicode library from libunistring to Glib

[Stephen Gallagher]

commit 75380a749d3839f369477415acaf1817e4cc495b
Author: Stephen Gallagher <sgallagh at redhat.com>
Date:   Wed Jun 20 10:32:39 2012 -0400

    Switch unicode library from libunistring to Glib
    
    - Drop unnecessary explicit Requires on keyutils
    - Guarantee that versioned Requires include the correct architecture
    
    Conflicts:
    	sssd.spec

 sssd.spec |   26 +++++++++++++++-----------
 1 files changed, 15 insertions(+), 11 deletions(-)
---
diff --git a/sssd.spec b/sssd.spec
index db5d12a..7a9b89b 100644
--- a/sssd.spec
+++ b/sssd.spec
@@ -12,11 +12,11 @@
 
 # Determine the location of the LDB modules directory
 %global ldb_modulesdir %(pkg-config --variable=modulesdir ldb)
-%global ldb_version 1.1.4
+%global ldb_version 1.1.6
 
 Name: sssd
 Version: 1.8.4
-Release: 13%{?dist}
+Release: 14%{?dist}
 Group: Applications/System
 Summary: System Security Services Daemon
 License: GPLv3+
@@ -37,8 +37,7 @@ Requires: libtdb%{?_isa} >= 1.1.3
 Requires: sssd-client%{?_isa} = %{version}-%{release}
 Requires: cyrus-sasl-gssapi%{?_isa}
 Requires: libipa_hbac%{?_isa} = %{version}-%{release}
-Requires: krb5-libs%{?_isa} >= 1.9
-Requires: keyutils-libs%{?_isa}
+Requires: krb5-libs%{?_isa} >= 1.10
 Requires(post): systemd-units initscripts chkconfig /sbin/ldconfig
 Requires(preun): systemd-units initscripts chkconfig
 Requires(postun): systemd-units initscripts chkconfig /sbin/ldconfig
@@ -79,7 +78,7 @@ BuildRequires: pcre-devel
 BuildRequires: libxslt
 BuildRequires: libxml2
 BuildRequires: docbook-style-xsl
-BuildRequires: krb5-devel >= 1.9
+BuildRequires: krb5-devel >= 1.10
 BuildRequires: c-ares-devel
 BuildRequires: python-devel
 BuildRequires: check-devel
@@ -91,7 +90,7 @@ BuildRequires: keyutils-libs-devel
 BuildRequires: libnl-devel
 BuildRequires: gettext-devel
 BuildRequires: pkgconfig
-BuildRequires: libunistring-devel
+BuildRequires: glib2-devel
 BuildRequires: findutils
 
 %description
@@ -203,7 +202,8 @@ autoreconf -ivf
     --disable-static \
     --disable-rpath \
     --with-test-dir=/dev/shm \
-    --enable-all-experimental-features
+    --enable-all-experimental-features \
+    --with-unicode-lib=glib2
 
 make %{?_smp_mflags} all docs
 
@@ -244,7 +244,7 @@ cp src/sysv/systemd/sssd.service $RPM_BUILD_ROOT/%{_unitdir}/
 find $RPM_BUILD_ROOT -name "*.la" -exec rm -f {} \;
 
 # Suppress developer-only documentation
-rm -Rf ${RPM_BUILD_ROOT}/%{_docdir}/%{name}/doc
+rm -Rf ${RPM_BUILD_ROOT}/%{_docdir}/%{name}
 
 # Older versions of rpmbuild can only handle one -f option
 # So we need to append to the sssd.lang file
@@ -457,6 +457,12 @@ fi
 %postun -n libipa_hbac -p /sbin/ldconfig
 
 %changelog
+* Wed Jun 20 2012 Stephen Gallagher <sgallagh at redhat.com> - 1.8.4-14
+- Switch unicode library from libunistring to Glib
+- Drop unnecessary explicit Requires on keyutils
+- Guarantee that versioned Requires include the correct architecture
+- Rebuild against newer libldb
+
 * Wed Jun 13 2012 Stephen Gallagher <sgallagh at redhat.com> - 1.8.4-13
 - Fix several issues with the SSH key integration
 - Fix for multilib issuss with libipa_hbac-devel and libsss_sudo-devel
@@ -537,9 +543,7 @@ fi
                           against AD
 - Resolves: rhbz#773706 - SSSD fails during autodetection of search bases for
                           new LDAP features
-
-* Thu Feb 23 2012 Stephen Gallagher <sgallagh at redhat.com> - 1.8.0-5.beta3.1
-- Remove patch for changing default credential cache. Deferred to F18
+- Resolves: rhbz#786957 - sssd and kerberos should change the default location for create the Credential Cashes to /run/usr/USERNAME/krb5cc
 
 * Wed Feb 22 2012 Stephen Gallagher <sgallagh at redhat.com> - 1.8.0-5.beta3
 - Change default kerberos credential cache location to /run/user/<username>