From 80be49d3d22d35b6c9df6e7b2879e8a59e182ddd191618082e50ea653ee1f459 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ismail=20D=C3=B6nmez?= <ismail@i10z.com>
Date: Fri, 22 Jul 2016 11:04:02 +0000
Subject: [PATCH] Fixup

OBS-URL: https://build.opensuse.org/package/show/network/krb5?expand=0&rev=173
---
 krb5-mini.spec | 34 ++++++++++++++++++----------------
 krb5.spec      | 41 ++++++++++++++++++++++-------------------
 2 files changed, 40 insertions(+), 35 deletions(-)

diff --git a/krb5-mini.spec b/krb5-mini.spec
index 0d4fec1..d7b86da 100644
--- a/krb5-mini.spec
+++ b/krb5-mini.spec
@@ -48,10 +48,11 @@ Conflicts:      krb5-plugin-kdb-ldap
 Conflicts:      krb5-plugin-preauth-pkinit
 Conflicts:      krb5-plugin-preauth-otp
 # both tar.gz and .tar.gz.asc extracted from the http://web.mit.edu/kerberos/dist/krb5/1.13/krb5-1.13.2-signed.tar
-Source:         krb5-%{version}.tar.gz
-Source43:       krb5.keyring
-Source1:        vendor-files.tar.bz2
-Source2:        baselibs.conf
+Source0:        krb5-%{version}.tar.gz
+Source1:        krb5-%{version}.tar.gz.asc
+Source2:        krb5.keyring
+Source3:        vendor-files.tar.bz2
+Source4:        baselibs.conf
 Source5:        krb5-rpmlintrc
 Patch1:         krb5-1.12-pam.patch
 Patch2:         krb5-1.9-manpaths.dif
@@ -97,7 +98,7 @@ Include Files for Development
 
 %prep
 %setup -q -n %{srcRoot}
-%setup -a 1 -T -D -n %{srcRoot}
+%setup -a 3 -T -D -n %{srcRoot}
 %patch1 -p1
 %patch2 -p1
 %patch3 -p1
@@ -128,19 +129,20 @@ DEFCCNAME=DIR:/run/user/%%{uid}/krb5cc; export DEFCCNAME
 	--libexecdir=/usr/lib/mit/sbin \
 	--libdir=%{_libdir} \
 	--includedir=%{_includedir} \
-        --localstatedir=%{_localstatedir}/lib/kerberos \
-        --localedir=%{_datadir}/locale \
+    --localstatedir=%{_localstatedir}/lib/kerberos \
+    --localedir=%{_datadir}/locale \
 	--enable-shared \
 	--disable-static \
-        --enable-dns-for-realm \
-        --disable-rpath \
-        --disable-pkinit \
-        --without-pam \
-        --with-selinux \
-        --with-system-et \
-        --with-system-ss \
-        --with-system-verto
-%{__make} %{?_smp_mflags}
+    --enable-dns-for-realm \
+    --disable-rpath \
+    --disable-pkinit \
+    --without-pam \
+    --with-selinux \
+    --with-system-et \
+    --with-system-ss \
+    --with-system-verto
+
+make %{?_smp_mflags}
 
 # Copy kadmin manual page into kadmin.local's due to the split between client and server package
 cp man/kadmin.man man/kadmin.local.8
diff --git a/krb5.spec b/krb5.spec
index d25290d..79af43b 100644
--- a/krb5.spec
+++ b/krb5.spec
@@ -47,10 +47,11 @@ Obsoletes:      krb5-64bit
 %endif
 Conflicts:      krb5-mini
 # both tar.gz and .tar.gz.asc extracted from the http://web.mit.edu/kerberos/dist/krb5/1.13/krb5-1.13.2-signed.tar
-Source:         krb5-%{version}.tar.gz
-Source43:       krb5.keyring
-Source1:        vendor-files.tar.bz2
-Source2:        baselibs.conf
+Source0:        krb5-%{version}.tar.gz
+Source1:        krb5-%{version}.tar.gz.asc
+Source2:        krb5.keyring
+Source3:        vendor-files.tar.bz2
+Source4:        baselibs.conf
 Source5:        krb5-rpmlintrc
 Patch1:         krb5-1.12-pam.patch
 Patch2:         krb5-1.9-manpaths.dif
@@ -167,7 +168,7 @@ Include Files for Development
 
 %prep
 %setup -q -n %{srcRoot}
-%setup -a 1 -T -D -n %{srcRoot}
+%setup -a 3 -T -D -n %{srcRoot}
 %patch1 -p1
 %patch2 -p1
 %patch3 -p1
@@ -198,23 +199,25 @@ DEFCCNAME=DIR:/run/user/%%{uid}/krb5cc; export DEFCCNAME
 	--libexecdir=/usr/lib/mit/sbin \
 	--libdir=%{_libdir} \
 	--includedir=%{_includedir} \
-        --localstatedir=%{_localstatedir}/lib/kerberos \
-        --localedir=%{_datadir}/locale \
+    --localstatedir=%{_localstatedir}/lib/kerberos \
+    --localedir=%{_datadir}/locale \
 	--enable-shared \
 	--disable-static \
-        --enable-dns-for-realm \
-        --disable-rpath \
-        --with-ldap \
-        --with-pam \
-        --enable-pkinit \
-        --with-pkinit-crypto-impl=openssl \
-        --with-selinux \
-        --with-system-et \
-        --with-system-ss \
-        --with-system-verto
-%{__make} %{?_smp_mflags}
+    --enable-dns-for-realm \
+    --disable-rpath \
+    --with-ldap \
+    --with-pam \
+    --enable-pkinit \
+    --with-pkinit-crypto-impl=openssl \
+    --with-selinux \
+    --with-system-et \
+    --with-system-ss \
+    --with-system-verto
+
+make %{?_smp_mflags}
+
 cd doc
-make %{?jobs:-j%jobs} substhtml
+make %{?_smp_mflags} substhtml
 cp -a html_subst ../../html
 cd ..