0001: Use Python 3-compatible sitearch and sitelib
0002: Better detect installed language files. Previously we were
including the translation files for both the daemon and clients in the
server package. This will separate them so the sss_client translations
will be shipped in the sssd-client package.
0003: Clean up rpmlint errors and warnings in sssd-client package
- Run ldconfig in sssd-client post and postun
- Version libnss_sss.so as libnss_sss.so.2 (to set the correct
SONAME)
0004: Set the Default-Stop LSB option for the SSSD sysv init script
rpmlint warned that no Default-Stop option had been specified (which is
mandatory for LSB-compatibility)
--
Stephen Gallagher
RHCE 804006346421761
Looking to carve out IT costs?
www.redhat.com/carveoutcosts/
From 31ffcb737a31e40403dc4b74322b88a8858ece7a Mon Sep 17 00:00:00 2001
From: Stephen Gallagher sgall...@redhat.com
Date: Mon, 19 Oct 2009 07:32:18 -0400
Subject: [PATCH 1/4] Use Python 3-compatible sitearch and sitelib
---
contrib/sssd.spec.in |4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/contrib/sssd.spec.in b/contrib/sssd.spec.in
index 41818f9..2f33e2f 100644
--- a/contrib/sssd.spec.in
+++ b/contrib/sssd.spec.in
@@ -1,5 +1,5 @@
-%{!?python_sitearch: %global python_sitearch %(%{__python} -c from
distutils.sysconfig import get_python_lib; print get_python_lib(1))}
-%{!?python_sitelib: %global python_sitelib %(%{__python} -c from
distutils.sysconfig import get_python_lib; print get_python_lib())}
+%{!?python_sitearch: %global python_sitearch %(%{__python} -c from
distutils.sysconfig import *; import sys; sys.stdout.write(get_python_lib(1)))}
+%{!?python_sitelib: %global python_sitelib %(%{__python} -c from
distutils.sysconfig import *; import sys; sys.stdout.write(get_python_lib()))}
Name: @PACKAGE_NAME@
Version: @PACKAGE_VERSION@
--
1.6.2.5
From 19d3e4f3d59db8b6c93875e894593eb1bd50b22f Mon Sep 17 00:00:00 2001
From: Stephen Gallagher sgall...@redhat.com
Date: Mon, 19 Oct 2009 08:51:10 -0400
Subject: [PATCH 2/4] Better detect installed language files
---
contrib/sssd.spec.in | 13 +
1 files changed, 9 insertions(+), 4 deletions(-)
diff --git a/contrib/sssd.spec.in b/contrib/sssd.spec.in
index 2f33e2f..c79da9c 100644
--- a/contrib/sssd.spec.in
+++ b/contrib/sssd.spec.in
@@ -87,6 +87,10 @@ rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT
+# Prepare language files
+/usr/lib/rpm/find-lang.sh $RPM_BUILD_ROOT sss_daemon
+/usr/lib/rpm/find-lang.sh $RPM_BUILD_ROOT sss_client
+
# Copy default sssd.conf file
mkdir -p $RPM_BUILD_ROOT/%{_sysconfdir}/sssd
install -m600 server/examples/sssd.conf
$RPM_BUILD_ROOT%{_sysconfdir}/sssd/sssd.conf
@@ -113,7 +117,7 @@ fi
%clean
rm -rf $RPM_BUILD_ROOT
-%files -f locator.filelist
+%files -f locator.filelist -f sss_daemon.lang
%defattr(-,root,root,-)
%doc COPYING
%{_initrddir}/%{name}
@@ -148,14 +152,12 @@ rm -rf $RPM_BUILD_ROOT
%{_mandir}/man8/sss_userdel.8*
%{_mandir}/man8/sss_usermod.8*
%{_mandir}/man8/sssd_krb5_locator_plugin.8*
-%{_datadir}/locale/*/LC_MESSAGES/sss_client.mo
-%{_datadir}/locale/*/LC_MESSAGES/sss_daemon.mo
%{python_sitearch}/pysss.so
%{python_sitelib}/*.py*
%{?fedora:%{python_sitelib}/*.egg-info}
-%files client
+%files client -f sss_client.lang
%defattr(-,root,root,-)
/%{_lib}/libnss_sss.so.2
/%{_lib}/security/pam_sss.so
@@ -182,6 +184,9 @@ if [ $1 -ge 1 ] ; then
fi
%changelog
+* Mon Sep 28 2009 Sumit Bose sb...@redhat.com - 0.6.0-0
+- New upstream release 0.6.0
+
* Fri Sep 25 2009 Simo Sorce sso...@redhat.com - 0.5.0-1
- Split package into server and clients components
- Convert to new config file format
--
1.6.2.5
From 65ddfbcb1ec8608eca16219cc3a68adac3b3a1af Mon Sep 17 00:00:00 2001
From: Stephen Gallagher sgall...@redhat.com
Date: Mon, 19 Oct 2009 08:32:15 -0400
Subject: [PATCH 3/4] Clean up rpmlint errors and warnings in sssd-client package
- Run ldconfig in sssd-client post and postun
- Version libnss_sss.so as libnss_sss.so.2 (to set the correct
SONAME)
---
contrib/sssd.spec.in |4
sss_client/Makefile.am |6 --
2 files changed, 8 insertions(+), 2 deletions(-)
diff --git a/contrib/sssd.spec.in b/contrib/sssd.spec.in
index c79da9c..f652802 100644
--- a/contrib/sssd.spec.in
+++ b/contrib/sssd.spec.in
@@ -183,6 +183,10 @@ if [ $1 -ge 1 ] ; then
/sbin/service %{servicename} condrestart 21 /dev/null
fi
+%post client -p /sbin/ldconfig
+
+%postun client -p /sbin/ldconfig
+
%changelog
* Mon Sep 28 2009 Sumit Bose sb...@redhat.com - 0.6.0-0
- New upstream release 0.6.0
diff --git a/sss_client/Makefile.am b/sss_client/Makefile.am
index aeddab4..1332f44 100644
--- a/sss_client/Makefile.am
+++ b/sss_client/Makefile.am
@@ -35,7 +35,7 @@ libnss_sss_la_SOURCES = \
sss_cli.h
libnss_sss_la_LDFLAGS = \
-module \
--avoid-version \
+-version-info 2:0:0 \
-Wl,--version-script,$(srcdir)/sss_nss.exports
pam_sss_la_SOURCES = \
@@ -63,7 +63,9 @@
