update

2 files changed, 14 insertions, 36 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 27e8dd29a2c0..d89fc006af8d 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = sssd-git
 	pkgdesc = System Security Services Daemon
-	pkgver = 1.12.0.r147.gfe00819
+	pkgver = 1.13.0.r69.gafa6ac7
 	pkgrel = 1
 	url = https://fedorahosted.org/sssd/
 	arch = i686
@@ -8,7 +8,7 @@ pkgbase = sssd-git
 	license = GPL3
 	makedepends = docbook-xsl
 	makedepends = doxygen
-	makedepends = git
+	makedepends = python
 	makedepends = python2
 	makedepends = samba
 	depends = augeas
@@ -31,19 +31,12 @@ pkgbase = sssd-git
 	depends = talloc
 	depends = tdb
 	depends = tevent
+	provides = sssd=1.13.0.r69.gafa6ac7
+	conflicts = sssd
 	source = git://git.fedorahosted.org/git/sssd.git
 	source = sssd.service
 	sha1sums = SKIP
 	sha1sums = 2d10db3d6f54a58bbf8d1f27328e68555256e0ce
 
 pkgname = sssd-git
-	provides = sssd=1.12.0.r147.gfe00819
-	conflicts = sssd
-
-pkgname = sssd-libwbclient-git
-	pkgdesc = System Security Services Daemon – libwbclient emulation library
-	depends = sssd
-	provides = sssd-libwbclient=1.12.0.r147.gfe00819
-	conflicts = sssd-libwbclient
-	conflicts = libwbclient
 
diff --git a/PKGBUILD b/PKGBUILD
index 417434a532c1..00bbbcd332ff 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,8 +1,7 @@
 # Maintainer: Mantas Mikulėnas <grawity@gmail.com>
 
-pkgbase=sssd-git
-pkgname=(sssd-git sssd-libwbclient-git)
-pkgver=1.12.0.r147.gfe00819
+pkgname=sssd-git
+pkgver=1.13.0.r69.gafa6ac7
 pkgrel=1
 pkgdesc="System Security Services Daemon"
 arch=('i686' 'x86_64')
@@ -33,10 +32,12 @@ depends=(
 makedepends=(
   'docbook-xsl'
   'doxygen'
-  'git'
+  'python'
   'python2'
   'samba'         # for libndr-nbt headers
 )
+provides=("sssd=$pkgver")
+conflicts=('sssd')
 source=('git://git.fedorahosted.org/git/sssd.git'
         'sssd.service')
 sha1sums=('SKIP'
@@ -68,19 +69,18 @@ build() {
     --with-initscript=systemd                     \
     --with-os=fedora                              \
     --with-pid-path=/run                          \
-    --with-python-bindings                        \
+    --with-python2-bindings                       \
+    --with-python3-bindings                       \
+    --with-syslog=journald                        \
     --without-selinux                             \
     --without-semanage                            \
-    --with-syslog=journald                        \
     --with-systemdunitdir=/usr/lib/systemd/system \
     ;
+  sed -i '/\<HAVE_KRB5_SET_TRACE_CALLBACK\>/d' config.h
   make
 }
 
-package_sssd-git() {
-  provides=("sssd=$pkgver")
-  conflicts=('sssd')
-
+package() {
   cd "$srcdir/sssd"
   make DESTDIR="$pkgdir/" install
   rm -rf "$pkgdir/etc/rc.d"
@@ -93,21 +93,6 @@ package_sssd-git() {
   cd "$srcdir"
   rm -rf "$pkgdir/etc/systemd" # remove the drop-in
   install -Dm644 sssd.service  "$pkgdir/usr/lib/systemd/system/sssd.service"
-
-  rm -rf "$srcdir/_libwbclient"
-  install -dm755 "$srcdir/_libwbclient/usr/lib/pkgconfig"
-  for f in /usr/lib/{libwbclient.so{,.0},pkgconfig/wbclient.pc}; do
-    mv "$pkgdir/$f" "$srcdir/_libwbclient/$f"
-  done
-}
-
-package_sssd-libwbclient-git() {
-  pkgdesc="System Security Services Daemon – libwbclient emulation library"
-  provides=("sssd-libwbclient=$pkgver")
-  conflicts=('sssd-libwbclient' 'libwbclient')
-  depends=('sssd')
-
-  bsdtar -C "$srcdir/_libwbclient" -cf - . | bsdtar -C "$pkgdir" -xf -
 }
 
 # vim: ts=2:sw=2:et