[SSSD] [PATCHES] SPEC: Few cosmetic changes

Lukas Slebodnik lslebodn at redhat.com
Fri Mar 27 11:03:04 UTC 2015


ehlo,

simple patches attached

LS
-------------- next part --------------
>From 827344c0c3d979898426a5f3683a270d16e2c95f Mon Sep 17 00:00:00 2001
From: Lukas Slebodnik <lslebodn at redhat.com>
Date: Fri, 27 Mar 2015 10:22:01 +0100
Subject: [PATCH 1/4] SPEC: Drop workaround for old libtool

This workaround was for libtool in rhel 5
and we dropped support for it few months ago due to missing dependencies.
---
 contrib/sssd.spec.in | 9 ---------
 1 file changed, 9 deletions(-)

diff --git a/contrib/sssd.spec.in b/contrib/sssd.spec.in
index 4102b728131d82c4cf5217e9210af6c91b0da259..dfcf809f71e7982d63f52d315b9ed0274a2ac3f3 100644
--- a/contrib/sssd.spec.in
+++ b/contrib/sssd.spec.in
@@ -542,15 +542,6 @@ Development libraries for the SSSD libwbclient implementation.
 %setup -q -n %{name}-%{version}
 
 %build
-
-# RHEL 5 uses an old libtool, so we need to force it to reconfigure
-# This is safe to do on newer packages too, as it will just
-# gather the appropriate m4 files from the libtool package
-for i in libtool.m4  lt~obsolete.m4  ltoptions.m4  ltsugar.m4  ltversion.m4
-do
-    find . -name $i -exec rm -f {} \;
-done
-
 autoreconf -ivf
 
 %configure \
-- 
2.3.3

-------------- next part --------------
>From 534278fea472ade5b844d2e28e82dc7a16101ece Mon Sep 17 00:00:00 2001
From: Lukas Slebodnik <lslebodn at redhat.com>
Date: Fri, 27 Mar 2015 10:43:12 +0100
Subject: [PATCH 2/4] SPEC: Drop workarounds for old rpmbuild

Old versions of rpmbuild require ghost files to be present in the buildroot.
It was mainly problem of rpmbuild on rhel5 which is not supported anymore.
---
 contrib/sssd.spec.in | 9 ---------
 1 file changed, 9 deletions(-)

diff --git a/contrib/sssd.spec.in b/contrib/sssd.spec.in
index dfcf809f71e7982d63f52d315b9ed0274a2ac3f3..c7bdd9d868c72c86493e175817a93bda3aafb827 100644
--- a/contrib/sssd.spec.in
+++ b/contrib/sssd.spec.in
@@ -586,10 +586,6 @@ make install DESTDIR=$RPM_BUILD_ROOT
 # Prepare language files
 /usr/lib/rpm/find-lang.sh $RPM_BUILD_ROOT sssd
 
-# Prepare empty config file (needed for RHEL 5)
-mkdir -p $RPM_BUILD_ROOT/%{_sysconfdir}/sssd
-touch $RPM_BUILD_ROOT/%{_sysconfdir}/sssd/sssd.conf
-
 # Copy default logrotate file
 mkdir -p $RPM_BUILD_ROOT/%{_sysconfdir}/logrotate.d
 install -m644 src/examples/logrotate $RPM_BUILD_ROOT%{_sysconfdir}/logrotate.d/sssd
@@ -663,11 +659,6 @@ do
     esac
 done
 
-# Old versions of rpmbuild require ghost files to be present in the buildroot
-mkdir -p $RPM_BUILD_ROOT/%{mcpath}
-touch $RPM_BUILD_ROOT/%{mcpath}/passwd
-touch $RPM_BUILD_ROOT/%{mcpath}/group
-
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-- 
2.3.3

-------------- next part --------------
>From 30cb68fc46b7c92dc7f711d237a575ae4bb9013b Mon Sep 17 00:00:00 2001
From: Lukas Slebodnik <lslebodn at redhat.com>
Date: Fri, 27 Mar 2015 10:29:41 +0100
Subject: [PATCH 3/4] SPEC: Remove unused option

The optional definition of rpm macro with_ccache was removed in patch
"BUILD: Remove unnecessary patch and configure opts"
as a part of ticket https://fedorahosted.org/sssd/ticket/2036.

It is not used anymore so it can be removed.
---
 contrib/sssd.spec.in | 1 -
 1 file changed, 1 deletion(-)

diff --git a/contrib/sssd.spec.in b/contrib/sssd.spec.in
index c7bdd9d868c72c86493e175817a93bda3aafb827..5c4cd24dfc41646761055ae4fa0f42217e0cc7b2 100644
--- a/contrib/sssd.spec.in
+++ b/contrib/sssd.spec.in
@@ -558,7 +558,6 @@ autoreconf -ivf
     --enable-nfsidmaplibdir=%{_libdir}/libnfsidmap \
     --disable-static \
     --disable-rpath \
-    %{?with_ccache} \
     %{with_initscript} \
     %{?with_syslog} \
     %{?with_cifs_utils_plugin_option} \
-- 
2.3.3

-------------- next part --------------
>From 3a41cdb7b297b102eb5b442488368b712dd21552 Mon Sep 17 00:00:00 2001
From: Lukas Slebodnik <lslebodn at redhat.com>
Date: Fri, 27 Mar 2015 10:38:10 +0100
Subject: [PATCH 4/4] SPEC: Few cosmetic changes

- removed unnecessary blank lines (leftover after many changes)
- list manual pages according to section number
- add missing white spaces to shall scripts
---
 contrib/sssd.spec.in | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/contrib/sssd.spec.in b/contrib/sssd.spec.in
index 5c4cd24dfc41646761055ae4fa0f42217e0cc7b2..d2a4e1a188c72dc477fa5e6d5e2b351c6dd832c6 100644
--- a/contrib/sssd.spec.in
+++ b/contrib/sssd.spec.in
@@ -680,7 +680,6 @@ rm -rf $RPM_BUILD_ROOT
 %{_libexecdir}/%{servicename}/sssd_be
 %{_libexecdir}/%{servicename}/sssd_nss
 %{_libexecdir}/%{servicename}/sssd_pam
-
 %{_libexecdir}/%{servicename}/sssd_autofs
 %{_libexecdir}/%{servicename}/sssd_ssh
 %{_libexecdir}/%{servicename}/sssd_sudo
@@ -729,14 +728,14 @@ rm -rf $RPM_BUILD_ROOT
 %dir %{_datadir}/sssd
 %{_datadir}/sssd/sssd.api.conf
 %{_datadir}/sssd/sssd.api.d
+%{_mandir}/man1/sss_ssh_authorizedkeys.1*
+%{_mandir}/man1/sss_ssh_knownhostsproxy.1*
 %{_mandir}/man5/sssd.conf.5*
 %{_mandir}/man5/sssd-simple.5*
 %{_mandir}/man5/sssd-sudo.5*
 %{_mandir}/man5/sss_rpcidmapd.5*
 %{_mandir}/man8/sssd.8*
 %{_mandir}/man8/sss_cache.8*
-%{_mandir}/man1/sss_ssh_authorizedkeys.1*
-%{_mandir}/man1/sss_ssh_knownhostsproxy.1*
 
 %files ldap -f sssd_ldap.lang
 %defattr(-,root,root,-)
@@ -762,7 +761,6 @@ rm -rf $RPM_BUILD_ROOT
 %doc COPYING
 %{_libexecdir}/%{servicename}/sssd_pac
 
-
 %files ipa -f sssd_ipa.lang
 %defattr(-,root,root,-)
 %doc COPYING
@@ -990,7 +988,7 @@ fi
 /sbin/service %{servicename} condrestart 2>&1 > /dev/null
 
 %preun common
-if [ $1 = 0 ]; then
+if [ $1 = 0 ] ; then
     /sbin/service %{servicename} stop 2>&1 > /dev/null
     /sbin/chkconfig --del %{servicename}
 fi
@@ -1002,7 +1000,7 @@ fi
 /usr/sbin/alternatives --install /etc/cifs-utils/idmap-plugin cifs-idmap-plugin %{_libdir}/cifs-utils/cifs_idmap_sss.so 20
 
 %preun client
-if [ $1 -eq 0 ]; then
+if [ $1 -eq 0 ] ; then
         /usr/sbin/alternatives --remove cifs-idmap-plugin %{_libdir}/cifs-utils/cifs_idmap_sss.so
 fi
 %else
-- 
2.3.3



More information about the sssd-devel mailing list