resolve conflict

OBS-URL: https://build.opensuse.org/package/show/network:ldap/sssd?expand=0&rev=164

sssd-1.13.1.tar.gz

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:ff6425d455a5cae2359e32c8627832e67b5cc0bbec4081a16d926b6e1b431ae7
-size 4517171

sssd-1.13.1.tar.gz.asc

@@ -1,7 +0,0 @@
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1
-
-iEYEABECAAYFAlYLta0ACgkQHsardTLnvCX0lwCgzMl3DT9BbTgcXGcM0Q2AGLUf
-+8QAoK5LZJdWZ+HcXC7ZIOTJ0vv9a9FB
-=z5ez
------END PGP SIGNATURE-----

sssd-1.13.2.tar.gz

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:0914e746adb770a712aa9ccbdc8a4332cb20317fbefa367124e696993dfcf8f0
+size 4641810

sssd-1.13.2.tar.gz.asc

@@ -0,0 +1,7 @@
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1
+
+iEYEABECAAYFAlZN6VQACgkQHsardTLnvCUm0wCeLdBktjtQbTnZqEOPQOJc9Fwj
+tWkAmQE5GN6d3DvKSbuZ55jwUVJTUzt+
+=O4fe
+-----END PGP SIGNATURE-----

sssd.changes

@@ -1,3 +1,13 @@
+-------------------------------------------------------------------
+Fri Nov 20 10:39:56 UTC 2015 - jengelh@inai.de
+
+- Update to new upstream release 1.13.2
+* Initial support for Smart Card authentication was added.
+* The PAM prompting was enhanced so that when Two-Factor
+  Authentication is used, both factors (password and token) can be
+  entered separately on separate prompts.
+* This release supports authenticating againt a KDC proxy.
+
 -------------------------------------------------------------------
 Wed Sep 30 11:44:21 UTC 2015 - michael@stroeder.com
 

sssd.spec

@@ -17,7 +17,7 @@
 
 
 Name:           sssd
-Version:        1.13.1
+Version:        1.13.2
 Release:        0
 Summary:        System Security Services Daemon
 License:        GPL-3.0+ and LGPL-3.0+
@@ -616,6 +616,7 @@ rm -f /var/lib/sss/db/*.ldb
 %_sbindir/sss_groupshow
 %_sbindir/sss_seed
 %_sbindir/sss_obfuscate
+%_sbindir/sss_override
 %_sbindir/sss_useradd
 %_sbindir/sss_userdel
 %_sbindir/sss_usermod
@@ -689,46 +690,38 @@ rm -f /var/lib/sss/db/*.ldb
 %files -n python-ipa_hbac
 %defattr(-,root,root)
 %dir %python_sitearch
-%python_sitearch/_py2hbac.so
 %python_sitearch/pyhbac.so
 
 %files -n python3-ipa_hbac
 %defattr(-,root,root)
 %dir %python3_sitearch
-%python3_sitearch/_py3hbac.so
 %python3_sitearch/pyhbac.so
 
 %files -n python-sss-murmur
 %defattr(-,root,root)
-%python_sitearch/_py2sss_murmur.so
 %python_sitearch/pysss_murmur.so
 
 %files -n python3-sss-murmur
 %defattr(-,root,root)
-%python3_sitearch/_py3sss_murmur.so
 %python3_sitearch/pysss_murmur.so
 
 %files -n python-sss_nss_idmap
 %defattr(-,root,root)
 %dir %python_sitearch
-%python_sitearch/_py2sss_nss_idmap.so
 %python_sitearch/pysss_nss_idmap.so
 
 %files -n python3-sss_nss_idmap
 %defattr(-,root,root)
 %dir %python3_sitearch
-%python3_sitearch/_py3sss_nss_idmap.so
 %python3_sitearch/pysss_nss_idmap.so
 
 %files -n python-sssd-config
 %defattr(-,root,root)
-%python_sitearch/_py2sss.so
 %python_sitearch/pysss.so
 %python_sitelib/SSSDConfig*
 
 %files -n python3-sssd-config
 %defattr(-,root,root)
-%python3_sitearch/_py3sss.so
 %python3_sitearch/pysss.so
 %python3_sitelib/SSSDConfig*