From cb080cb6988b290de0873c01438bd7c48518df25b32f0b0f2c519ef8fd9bb34c Mon Sep 17 00:00:00 2001
From: Marcus Rueckert <mrueckert@suse.com>
Date: Thu, 14 Apr 2011 13:04:56 +0000
Subject: [PATCH] Accepting request 67284 from network:ldap

Accepted submit request 67284 from user coolo

OBS-URL: https://build.opensuse.org/request/show/67284
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/sssd?expand=0&rev=24
---
 sssd-1.5.4.tar.bz2 |  3 ---
 sssd-1.5.5.tar.bz2 |  3 +++
 sssd.changes       | 15 +++++++++++++++
 sssd.spec          | 20 +++++++++++++++++++-
 4 files changed, 37 insertions(+), 4 deletions(-)
 delete mode 100644 sssd-1.5.4.tar.bz2
 create mode 100644 sssd-1.5.5.tar.bz2

diff --git a/sssd-1.5.4.tar.bz2 b/sssd-1.5.4.tar.bz2
deleted file mode 100644
index b9ced6d..0000000
--- a/sssd-1.5.4.tar.bz2
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:83e3c3cc49780087e6d3e54306bcc991c3e81944dae2eb7883dad6dbbf3b933d
-size 1291491
diff --git a/sssd-1.5.5.tar.bz2 b/sssd-1.5.5.tar.bz2
new file mode 100644
index 0000000..c3eb4ea
--- /dev/null
+++ b/sssd-1.5.5.tar.bz2
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:8c55e2676839d8991a6287038c63deccf95123562842958df99011c30bd05408
+size 1292470
diff --git a/sssd.changes b/sssd.changes
index 427bef7..2158f93 100644
--- a/sssd.changes
+++ b/sssd.changes
@@ -1,3 +1,18 @@
+-------------------------------------------------------------------
+Thu Apr 14 11:31:38 UTC 2011 - rhafer@suse.de
+
+- Update to 1.5.5
+ * Fixes for several crash bugs
+ * LDAP group lookups will no longer abort if there is a
+   zero-length member attribute
+ * Add automatic fallback to 'cn' if the 'gecos' attribute does not
+   exist
+
+-------------------------------------------------------------------
+Wed Mar 30 09:47:23 UTC 2011 - rhafer@suse.de
+
+- Should build in SLE-11-SP1 now
+
 -------------------------------------------------------------------
 Tue Mar 29 13:23:57 UTC 2011 - rhafer@suse.de
 
diff --git a/sssd.spec b/sssd.spec
index f96fa37..e1eba1f 100644
--- a/sssd.spec
+++ b/sssd.spec
@@ -18,7 +18,7 @@
 
 
 Name:           sssd
-Version:        1.5.4
+Version:        1.5.5
 Release:        1
 Group:          System/Daemons
 Summary:        System Security Services Daemon
@@ -34,6 +34,12 @@ BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 %define pipepath %{sssdstatedir}/pipes
 %define pubconfpath %{sssdstatedir}/pubconf
 
+# SLES11 doesn't know the python_* macros
+%if %suse_version <= 1110
+%define python_sitelib %py_sitedir
+%define python_sitearch %py_sitedir
+%endif
+
 ### Build Dependencies ###
 BuildRequires:  autoconf
 BuildRequires:  automake
@@ -149,6 +155,18 @@ rm -f \
     $RPM_BUILD_ROOT/%{_libdir}/sssd/libsss_ipa.la \
     $RPM_BUILD_ROOT/%{_libdir}/sssd/libsss_simple.la \
     $RPM_BUILD_ROOT/%{_libdir}/krb5/plugins/libkrb5/sssd_krb5_locator_plugin.la
+
+%if %suse_version <= 1110
+# remove some unsupported languages, sssd does not contain
+# translations for these anyway
+rm -rf \
+    $RPM_BUILD_ROOT/usr/share/locale/fa_IR \
+    $RPM_BUILD_ROOT/usr/share/locale/ja_JP \
+    $RPM_BUILD_ROOT/usr/share/locale/lt_LT \
+    $RPM_BUILD_ROOT/usr/share/locale/ta_IN \
+    $RPM_BUILD_ROOT/usr/share/locale/vi_VN
+%endif
+
 %find_lang %{name} --all-name
 
 %clean