diff --git a/SOURCES/redhat-lsb-centos-fix-release.patch b/SOURCES/redhat-lsb-centos-fix-release.patch new file mode 100644 index 0000000..772d207 --- /dev/null +++ b/SOURCES/redhat-lsb-centos-fix-release.patch @@ -0,0 +1,12 @@ +diff -uNr redhat-lsb-4.1__orig/lsb-release-2.0/lsb_release redhat-lsb-4.1/lsb-release-2.0/lsb_release +--- redhat-lsb-4.1__orig/lsb-release-2.0/lsb_release 2012-02-29 00:54:28.000000000 +0000 ++++ redhat-lsb-4.1/lsb-release-2.0/lsb_release 2015-03-27 12:59:00.207774300 +0000 +@@ -72,7 +72,7 @@ + INFO_DISTRIB_SUFFIX="release" # - + ALTERNATE_DISTRIB_FILE="/etc/debian_version" # for Debian [based distrib] + ALTERNATE_DISTRIB_NAME="Debian" # " +-CHECKFIRST="/etc/redhat-release" # check it before file search ++CHECKFIRST="/etc/centos-release" # check it before file search + + # Defines our exit codes + EXIT_STATUS="0" # default = Ok :) diff --git a/SPECS/redhat-lsb.spec b/SPECS/redhat-lsb.spec index 058cf31..3b2926e 100644 --- a/SPECS/redhat-lsb.spec +++ b/SPECS/redhat-lsb.spec @@ -58,7 +58,7 @@ Summary: Implementation of Linux Standard Base specification Name: redhat-lsb Version: 4.1 -Release: 27%{?dist} +Release: 27%{?dist}.1 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 @@ -66,6 +66,7 @@ Patch1: redhat-lsb-lsb_start_daemon-fix.patch Patch2: redhat-lsb-trigger.patch Patch3: redhat-lsb-arm.patch Patch4: redhat-lsb-aarch64.patch +Patch1000: redhat-lsb-centos-fix-release.patch License: GPLv2 Group: System Environment/Base BuildRequires: glibc-static @@ -485,6 +486,7 @@ to be on LSB conforming system. %patch2 -p0 -b .triggerfix %patch3 -p1 -b .arm %patch4 -p1 -b .aarch64 +%patch1000 -p1 %build cd lsb-release-%{upstreamlsbrelver} @@ -766,6 +768,9 @@ os.remove("%{_datadir}/lsb") %changelog +* Fri Mar 27 2015 Karanbir Singh - 4.1-27.el7.centos.1 +- use centos-release instead of redhat-release for lsb checks + * Wed Sep 03 2014 Ondrej Vasik - 4.1-27 - Require /usr/sbin/sendmail in core (required by LSB 4.1, #1135991)