From 5a67dd577f14fa03700aa7b9fd9cf1aa523e1144 Mon Sep 17 00:00:00 2001 From: CentOS Buildsys Date: Jan 27 2014 09:16:16 +0000 Subject: import redhat-lsb-4.1-24.el7.src.rpm --- diff --git a/SPECS/redhat-lsb.spec b/SPECS/redhat-lsb.spec index fabad11..eef9130 100644 --- a/SPECS/redhat-lsb.spec +++ b/SPECS/redhat-lsb.spec @@ -53,7 +53,7 @@ Summary: Implementation of Linux Standard Base specification Name: redhat-lsb Version: 4.1 -Release: 21%{?dist} +Release: 24%{?dist} URL: http://www.linuxfoundation.org/collaborate/workgroups/lsb Source0: https://fedorahosted.org/releases/r/e/redhat-lsb/%{name}-%{version}-%{srcrelease}.tar.bz2 Patch0: lsb-release-3.1-update-init-functions.patch @@ -628,15 +628,6 @@ fi done fi %endif -if ! grep -s -q '^hosts: \+files \+dns *$' /etc/nsswitch.conf;then - cat /etc/nsswitch.conf >%{_datadir}/lsb/nsswitch.conf.orig - ed -s /etc/nsswitch.conf < %{_datadir}/lsb/nsswitch.conf -fi %post %ifarch %{ix86} @@ -647,27 +638,6 @@ fi done fi %endif -if ! grep -s -q '^hosts: \+files \+dns *$' /etc/nsswitch.conf;then - cat /etc/nsswitch.conf >%{_datadir}/lsb/nsswitch.conf.orig - ed -s /etc/nsswitch.conf <%{_datadir}/lsb/nsswitch.conf -fi - -%preun -if [ $1 -eq 0 ];then - if [ -e %{_datadir}/lsb/nsswitch.conf -a -e %{_datadir}/lsb/nsswitch.conf.orig ];then - if cmp -s %{_datadir}/lsb/nsswitch.conf /etc/nsswitch.conf;then - cp /etc/nsswitch.conf /etc/nsswitch.conf.rpmsave - echo "warning: /etc/nsswitch.conf saved as /etc/nsswitch.conf.rpmsave" >&2 - cat %{_datadir}/lsb/nsswitch.conf.orig >/etc/nsswitch.conf - fi - rm -f %{_datadir}/lsb/{nsswitch.conf,nsswitch.conf.orig} - fi -fi %postun submod-security -p os.remove("%{_datadir}/lsb/%{lsbrelver}/submodules") @@ -787,6 +757,15 @@ os.remove("%{_datadir}/lsb") %changelog +* Fri Jan 24 2014 Daniel Mach - 4.1-24 +- Mass rebuild 2014-01-24 + +* Fri Dec 27 2013 Daniel Mach - 4.1-23 +- Mass rebuild 2013-12-27 + +* Mon Nov 25 2013 Ondrej Vasik - 4.1-22 +- don't play nasty games with nsswitch.conf (#867124) + * Fri Nov 08 2013 Ondrej Vasik - 4.1-21 - fix build for aarch64 (#1028105)