From a47640a8b06ce83e70f84407d4fd148279c241934e0ac84dfbec513759e244b7 Mon Sep 17 00:00:00 2001
From: Howard Guo <null@suse.de>
Date: Fri, 9 Mar 2018 09:18:08 +0000
Subject: [PATCH] Accepting request 584630 from home:dimstar:Factory

- Add the conflicts from the mainpackage also to the baselibs.conf
  generated ones: the -32bit packages conflict the same way.
- Modernize spec file by calling spec-cleaner.

This will address the issue currently seen by the bot in
https://build.opensuse.org/project/show/openSUSE:Factory:Staging:adi:37

(note: the error is not new, but the bot improved)

OBS-URL: https://build.opensuse.org/request/show/584630
OBS-URL: https://build.opensuse.org/package/show/network:ldap/nss-pam-ldapd?expand=0&rev=15
---
 baselibs.conf         |  3 +++
 nss-pam-ldapd.changes |  7 +++++++
 nss-pam-ldapd.spec    | 40 ++++++++++++++++++++--------------------
 3 files changed, 30 insertions(+), 20 deletions(-)

diff --git a/baselibs.conf b/baselibs.conf
index 68de9aa..a7b7aa6 100644
--- a/baselibs.conf
+++ b/baselibs.conf
@@ -1,2 +1,5 @@
 nss-pam-ldapd
   supplements "packageand(nss-pam-ldapd:glibc-<targettype>)"
+  conflicts   "nss_ldap-<targettype>"
+  conflicts   "pam_ldap-<targettype>"
+
diff --git a/nss-pam-ldapd.changes b/nss-pam-ldapd.changes
index c773bb5..99777d8 100644
--- a/nss-pam-ldapd.changes
+++ b/nss-pam-ldapd.changes
@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Fri Mar  9 08:47:41 UTC 2018 - dimstar@opensuse.org
+
+- Add the conflicts from the mainpackage also to the baselibs.conf
+  generated ones: the -32bit packages conflict the same way.
+- Modernize spec file by calling spec-cleaner.
+
 -------------------------------------------------------------------
 Sun Feb 18 21:24:23 UTC 2018 - mvetter@suse.com
 
diff --git a/nss-pam-ldapd.spec b/nss-pam-ldapd.spec
index 75c739f..76f5981 100644
--- a/nss-pam-ldapd.spec
+++ b/nss-pam-ldapd.spec
@@ -17,32 +17,32 @@
 
 
 Name:           nss-pam-ldapd
+Version:        0.9.9
+Release:        0
+Summary:        NSS module and daemon for using LDAP as a naming service
+License:        LGPL-2.1-or-later
+Group:          Productivity/Networking/LDAP/Clients
+URL:            http://arthurdejong.org/nss-ldapd/
+Source:         https://arthurdejong.org/nss-pam-ldapd/nss-pam-ldapd-%{version}.tar.gz
+Source1:        baselibs.conf
+Source2:        nslcd.service
+Source100:      nss-pam-ldapd-rpmlintrc
 BuildRequires:  automake
 BuildRequires:  krb5-devel
 BuildRequires:  openldap2-devel
 BuildRequires:  pam-devel
 BuildRequires:  systemd-rpm-macros
-Version:        0.9.9
-Release:        0
-Summary:        NSS module and daemon for using LDAP as a naming service
-License:        LGPL-2.1+
-Group:          Productivity/Networking/LDAP/Clients
-Url:            http://arthurdejong.org/nss-ldapd/
 Requires(pre):  shadow
-Conflicts:      nss_ldap pam_ldap
+Conflicts:      nss_ldap
+Conflicts:      pam_ldap
 Obsoletes:      nss-ldapd < %{version}-%{release}
 Provides:       nss-ldapd = %{version}-%{release}
-Source:         https://arthurdejong.org/nss-pam-ldapd/nss-pam-ldapd-%{version}.tar.gz
-Source1:        baselibs.conf
-Source2:        nslcd.service
-Source100:      nss-pam-ldapd-rpmlintrc
-BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 
 %description
 This is nss-pam-ldapd which provides a Name Service Switch (NSS)
 module that allows your LDAP server to provide user account, group,
 host name, alias, netgroup, and basically any other information that
-you would normally get from /etc flat files or NIS. It also provides a
+you would normally get from %{_sysconfdir} flat files or NIS. It also provides a
 Pluggable Authentication Module (PAM) to do authentication to an LDAP
 server.
 
@@ -54,7 +54,6 @@ connections, authentication, attribute translation, etc.
 %setup -q
 
 %build
-%{?suse_update_config:%{suse_update_config -f}}
 autoreconf
 export CPPFLAGS="-I/usr/include/sasl"
 %configure --libdir=/%{_lib} \
@@ -63,10 +62,10 @@ export CPPFLAGS="-I/usr/include/sasl"
 make %{?_smp_mflags}
 
 %install
-make DESTDIR=$RPM_BUILD_ROOT install
-mkdir -p $RPM_BUILD_ROOT/%{_unitdir}/
-install -p -m644 %{S:2} $RPM_BUILD_ROOT/%{_unitdir}/
-ln -s /usr/sbin/service %{buildroot}%{_sbindir}/rcnslcd
+make DESTDIR=%{buildroot} install
+mkdir -p %{buildroot}/%{_unitdir}/
+install -p -m644 %{SOURCE2} %{buildroot}/%{_unitdir}/
+ln -s %{_sbindir}/service %{buildroot}%{_sbindir}/rcnslcd
 
 %pre
 # creating groupd and user nslcd
@@ -89,11 +88,12 @@ ln -s /usr/sbin/service %{buildroot}%{_sbindir}/rcnslcd
 
 %files
 %defattr(-,root,root)
-%doc AUTHORS COPYING ChangeLog NEWS README
+%license COPYING
+%doc AUTHORS ChangeLog NEWS README
 /%{_lib}/libnss_ldap.so.2
 /%{_lib}/security/pam_ldap.so
 %{_mandir}/man?/*
-%config(noreplace) %attr(640,root,root) /etc/nslcd.conf
+%config(noreplace) %attr(640,root,root) %{_sysconfdir}/nslcd.conf
 /%{_unitdir}/nslcd.service
 %{_sbindir}/nslcd
 %{_sbindir}/rcnslcd