Changes - j0ke.net Open Build Service

Changes of Revision 88

[-] [+]	Changed	_service:set_version:inventory-system.spec
@@ -1,7 +1,7 @@ %define pkgname inventory-system Name: inventory-system Release: 0 -Version: 0.0.rev4263 +Version: 0.0.rev4264 Url: http://www.linux-administrator.com/ License: GPLv2 Group: System @@ -23,7 +23,11 @@ %else Requires: pmtools %endif +%if 0%{?sles_version} == 10 +Requires: lsb +%else Requires: lsb-release +%endif Requires: awk %else Requires: dmidecode x 1 @@ -1,7 +1,7 @@ 2 %define pkgname inventory-system 3 Name: inventory-system 4 Release: 0 5 -Version: 0.0.rev4263 6 +Version: 0.0.rev4264 7 Url: http://www.linux-administrator.com/ 8 License: GPLv2 9 Group: System 10 @@ -23,7 +23,11 @@ 11 %else 12 Requires: pmtools 13 %endif 14 +%if 0%{?sles_version} == 10 15 +Requires: lsb 16 +%else 17 Requires: lsb-release 18 +%endif 19 Requires: awk 20 %else 21 Requires: dmidecode 22
[-] [+]	Changed	inventory-system.spec ^
@@ -23,7 +23,11 @@ %else Requires: pmtools %endif +%if 0%{?sles_version} == 10 +Requires: lsb +%else Requires: lsb-release +%endif Requires: awk %else Requires: dmidecode 13 1 @@ -23,7 +23,11 @@ 2 %else 3 Requires: pmtools 4 %endif 5 +%if 0%{?sles_version} == 10 6 +Requires: lsb 7 +%else 8 Requires: lsb-release 9 +%endif 10 Requires: awk 11 %else 12 Requires: dmidecode 13
[-] [+]	Changed	_service:recompress:tar_scm:inventory-system-0.0.rev4264.tar.bz2/client/inventory-system.sh ^
@@ -1,8 +1,8 @@ #!/bin/bash # Inventory System # Author: Carsten Schoene -# $LastChangedDate: 2012-11-07 17:54:40 +0100 (Wed, 07 Nov 2012) $ -# $Rev: 4263 $ +# $LastChangedDate: 2012-11-07 19:39:32 +0100 (Wed, 07 Nov 2012) $ +# $Rev: 4264 $ # # Default options (can be changed by inventory-system.conf) DEBUG="yes" @@ -456,7 +456,7 @@ # get distribution function get_system_os { [ "`is_disabled $FUNCNAME`" == "1" ] && return - OSREL=`${LSB_RELEASE} -d \| ${AWK} -F":\t" '{print $NF}'` + OSREL=`${LSB_RELEASE} -d \| ${AWK} -F":\t" '{print $NF}' \| ${SED} -r -e 's#(.)$.$#\1#g'` debug "SYSTEM-OS: ${OSREL}" echo ${OSREL} }