On (31/07/14 12:04), Nikolai Kondrashov wrote:
Hi everyone,
Here are three patches which make sssd.spec.in work on distros without
libini_config-devel >= 1.1.0, which basically means all currently released
distros.
This is also done to make CI mock builds work again.
Nick
From 38c12961dadf68772f06cd18d3d9a03a605e97e6 Mon Sep 17 00:00:00
2001
From: Nikolai Kondrashov <Nikolai.Kondrashov(a)redhat.com>
Date: Wed, 30 Jul 2014 21:18:35 +0300
Subject: [PATCH 1/3] build: Don't install ad and ipa man pages unnecessarily
Don't install sssd-ipa and sssd-ad man pages if corresponding providers
weren't built (i.e. --without-samba was specified to configure).
---
ACK
From 68365089be52d6fcd4f8ededef53e3c76a080888 Mon Sep 17 00:00:00
2001
From: Nikolai Kondrashov <Nikolai.Kondrashov(a)redhat.com>
Date: Wed, 30 Jul 2014 17:00:45 +0300
Subject: [PATCH 2/3] build: Use only sed for extracting rhel5_minor
Use only sed for extracting RHEL5 minor version in sssd.spec.in,
avoiding additional grep use and repeating major version number in
patterns.
---
NACK
See ticket #1974
From 7176ca7bcefd99b330b9be5c5b7bc294462065b8 Mon Sep 17 00:00:00
2001
From: Nikolai Kondrashov <Nikolai.Kondrashov(a)redhat.com>
Date: Wed, 30 Jul 2014 21:37:10 +0300
Subject: [PATCH 3/3] build: Cater to distros with older libini_config
Cater to distributions with libini_config-devel < 1.1.0 in sssd.spec.in:
don't require newer libini_config-devel, build with --without-samba,
and don't build "ipa" and "ad" provider packages.
---
The purpose of ticket #1974 was to simplify upstream spec file, which is used
for building rpms for fedora and rhel/centos. The last patch is against this
idea. The package libini_config-devel is part of ding-libs, which is developed
by SSSD developers (we have full control). This is a reason why there is not
conditional build in spec file and we decided to have strict requirement for
libini_config-devel >= 1.1
The main purpose of CI should be to test new features, primary on fedora and
rhel/centos. In last version of SSSD, we enhanced integration with AD and this
last patch will disable this provider on el6 and el7. It is step back.
I test sssd from master branch with modified version of epel-6-x86_64.cfg and
epel-7-x86_64.cfg. They contain extra repositories with ding-libs-0.4.
LS