Accepting request 263486 from home:Ledest:bashisms

fix bashisms in pkgheader.sh script

OBS-URL: https://build.opensuse.org/request/show/263486
OBS-URL: https://build.opensuse.org/package/show/Base:System/libsmbios?expand=0&rev=16
This commit is contained in:
Marcus Meissner 2014-12-29 09:22:07 +00:00 committed by Git OBS Bridge
parent d8a6fcabad
commit 560d445780
3 changed files with 35 additions and 11 deletions

View File

@ -0,0 +1,21 @@
diff -Ndur libsmbios-2.2.28/doc/pkgheader.sh libsmbios-2.2.28-fix-bashisms/doc/pkgheader.sh
--- libsmbios-2.2.28/doc/pkgheader.sh 2008-05-13 18:19:39.000000000 +0300
+++ libsmbios-2.2.28-fix-bashisms/doc/pkgheader.sh 2014-11-20 00:28:20.117811035 +0200
@@ -49,7 +49,7 @@
exit 1
fi
echo
- pushd $tmpdir >/dev/null 2>&1
+ cd $tmpdir
echo "Running BIOS Update:"
if ! ./$_PRG -u -f ./bios.hdr "$@"; then
echo
@@ -59,7 +59,7 @@
echo "You must now reboot your system!"
echo
fi
- popd >/dev/null 2>&1
+ cd - >/dev/null
}
checkroot()

View File

@ -1,3 +1,10 @@
-------------------------------------------------------------------
Sun Nov 30 04:12:00 UTC 2014 - Led <ledest@gmail.com>
- fix bashisms in pkgheader.sh script
- add patches:
* libsmbios-2.2.28-fix-bashisms.patch
-------------------------------------------------------------------
Tue May 8 12:56:48 UTC 2012 - cfarrell@suse.com

View File

@ -1,7 +1,7 @@
#
# spec file for package libsmbios
#
# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany.
# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@ -21,13 +21,14 @@
Name: libsmbios
Version: 2.2.28
Release: 1
Release: 0
Summary: Libraries to get information from standard BIOS tables
License: GPL-2.0+ or OSL-2.1
Url: http://linux.dell.com/libsmbios/main/
Group: System/Management
Url: http://linux.dell.com/libsmbios/main/
Source0: http://linux.dell.com/libsmbios/download/libsmbios/libsmbios-%{version}/%{name}-%{version}.tar.bz2
Patch1: %{name}-2.2.28-fix-bashisms.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
BuildRequires: doxygen
@ -35,8 +36,8 @@ BuildRequires: fdupes
BuildRequires: gcc-c++
BuildRequires: libcppunit-devel
BuildRequires: pkgconfig
BuildRequires: pkgconfig(libxml-2.0)
BuildRequires: python-base
BuildRequires: pkgconfig(libxml-2.0)
# Modules: dcdbas.ko
Supplements: modalias(dmi:*:[bs]vnD[Ee][Ll][Ll]*:*)
# Generated with: extract-modaliases dcdbas
@ -49,7 +50,6 @@ to get information from standard BIOS tables, such as the SMBIOS table.
%package devel
Summary: Development files for libsmios
License: GPL-2.0+ or OSL-2.1
Group: Development/Libraries/C and C++
Requires: libsmbios2 = %{version}
Requires: libstdc++-devel
@ -63,7 +63,6 @@ against libsmbios.
%package -n libsmbios2
Summary: Libraries to get information from standard BIOS tables
License: GPL-2.0+ or OSL-2.1
Group: System/Management
Supplements: modalias(dmi:*:[bs]vnD[Ee][Ll][Ll]*:*)
@ -73,7 +72,6 @@ to get information from standard BIOS tables, such as the SMBIOS table.
%package -n python-smbios
Summary: Python interface to Libsmbios C library
License: GPL-2.0+ or OSL-2.1
Group: Development/Libraries/Python
Requires: libsmbios2 = %{version}
Supplements: modalias(dmi:*:[bs]vnD[Ee][Ll][Ll]*:*)
@ -86,7 +84,6 @@ This package provides a Python interface to libsmbios.
%package -n smbios-utils-bin
Summary: Binary utilities that use libsmbios
License: GPL-2.0+ or OSL-2.1
Group: System/Management
Supplements: modalias(dmi:*:[bs]vnD[Ee][Ll][Ll]*:*)
# libsmbios-unsupported-bin was last used in openSUSE 11.4 (libsmbios-unsupported-bin-2.0.2)
@ -99,7 +96,6 @@ asset tag.
%package -n smbios-utils-python
Summary: Python executables that use libsmbios
License: GPL-2.0+ or OSL-2.1
Group: System/Management
Requires: python-smbios = %{version}
Supplements: modalias(dmi:*:[bs]vnD[Ee][Ll][Ll]*:*)
@ -115,7 +111,6 @@ Update BIOS on select Dell systems. Set LCD brightness on select Dell laptops.
%package -n yum-dellsysid
Summary: YUM plugin to retrieve the Dell System ID
License: GPL-2.0+ or OSL-2.1
Group: System/Packages
Requires: smbios-utils-python = %{version}
Requires: yum
@ -129,6 +124,7 @@ substitutions in yum repository configuration files on Dell systems.
%prep
%setup -q
%patch1 -p1
%build
%configure --disable-rpath