From b69688ac9bfef8aaeb84bfa6038a85d1fa8839b9 Mon Sep 17 00:00:00 2001 From: kukuk <> Date: Nov 06 2023 20:31:56 +0000 Subject: Update lsb-release to version 3.3 / rev 24 via SR 1123540 https://build.opensuse.org/request/show/1123540 by user kukuk + anag+factory - Update to version 3.3, includes 797e459ecaa482bf8e7bfe02cf5f1cea367ba9e9.patch --- diff --git a/.files b/.files index 87db286..5de2ee1 100644 Binary files a/.files and b/.files differ diff --git a/.rev b/.rev index e676edc..1762740 100644 --- a/.rev +++ b/.rev @@ -173,4 +173,13 @@ Sourcing /etc/os-release instead of parsing /etc/SuSE-release and extracting the bashisms 1109021 + + 0d1d49346da2507ae189b9210310fe87 + 3.3 + + anag+factory + - Update to version 3.3, includes + 797e459ecaa482bf8e7bfe02cf5f1cea367ba9e9.patch + 1123540 + diff --git a/797e459ecaa482bf8e7bfe02cf5f1cea367ba9e9.patch b/797e459ecaa482bf8e7bfe02cf5f1cea367ba9e9.patch deleted file mode 100644 index 5cc7e3f..0000000 --- a/797e459ecaa482bf8e7bfe02cf5f1cea367ba9e9.patch +++ /dev/null @@ -1,62 +0,0 @@ -From 797e459ecaa482bf8e7bfe02cf5f1cea367ba9e9 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Dirk=20M=C3=BCller?= -Date: Fri, 4 Aug 2023 13:13:45 +0200 -Subject: [PATCH] use printf to be more dash/posix shell compatible - -The script is executed with bin/sh, if that isn't bash -then "echo -e" is not actually supported. ---- - lsb_release | 12 ++++++------ - 1 file changed, 6 insertions(+), 6 deletions(-) - -diff --git a/lsb_release b/lsb_release -index 5cb1c6c..f7fb976 100755 ---- a/lsb_release -+++ b/lsb_release -@@ -256,7 +256,7 @@ GetDistribInfo() { - DisplayVersion() { - if [ -z "$ARG_S" ] - then -- echo -e "$MSG_LSBVER$LSB_VERSION" # at least "n/a" -+ printf "$MSG_LSBVER$LSB_VERSION\n" # at least "n/a" - else - MSG_RESULT="$MSG_RESULT${MSG_RESULT:+ }$LSB_VERSION" - fi -@@ -266,7 +266,7 @@ DisplayVersion() { - DisplayID() { - if [ -z "$ARG_S" ] - then -- echo -e "$MSG_DISTID$DISTRIB_ID" -+ printf "$MSG_DISTID$DISTRIB_ID\n" - else - MSG_RESULT="$MSG_RESULT${MSG_RESULT:+ }$DISTRIB_ID" - fi -@@ -281,7 +281,7 @@ DisplayDescription() { - fi - if [ -z "$ARG_S" ] - then -- echo -e "$MSG_DISTDESC$DISTRIB_DESCRIPTION" -+ printf "$MSG_DISTDESC$DISTRIB_DESCRIPTION\n" - else - MSG_RESULT="$MSG_RESULT${MSG_RESULT:+ }\"$DISTRIB_DESCRIPTION\"" - fi -@@ -291,7 +291,7 @@ DisplayDescription() { - DisplayRelease() { - if [ -z "$ARG_S" ] - then -- echo -e "$MSG_DISTREL$DISTRIB_RELEASE" -+ printf "$MSG_DISTREL$DISTRIB_RELEASE\n" - else - MSG_RESULT="$MSG_RESULT${MSG_RESULT:+ }$DISTRIB_RELEASE" - fi -@@ -301,8 +301,8 @@ DisplayRelease() { - DisplayCodename() { - if [ -z "$ARG_S" ] - then -- echo -e "$MSG_DISTCODE$(echo "$DISTRIB_CODENAME" | \ -- tr -d "[:blank:]")" # Remove blanks -+ printf "$MSG_DISTCODE$(echo "$DISTRIB_CODENAME" | \ -+ tr -d "[:blank:]")\n" # Remove blanks - else - MSG_RESULT="$MSG_RESULT${MSG_RESULT:+ }$(echo "$DISTRIB_CODENAME" | \ - tr -d "[:blank:]")" diff --git a/lsb-release-3.2.tar.gz b/lsb-release-3.2.tar.gz deleted file mode 120000 index dccf557..0000000 --- a/lsb-release-3.2.tar.gz +++ /dev/null @@ -1 +0,0 @@ -/ipfs/bafkreifhlm2f36lnowsmebmqthpmawe6gi7s252hf2jjillfi3zlyohvpm \ No newline at end of file diff --git a/lsb-release-3.3.tar.gz b/lsb-release-3.3.tar.gz new file mode 120000 index 0000000..63c4edb --- /dev/null +++ b/lsb-release-3.3.tar.gz @@ -0,0 +1 @@ +/ipfs/bafkreifufscc5ggv7sdvwxemen4ev3mjdkhhog3lxaycw7n6o7thnriove \ No newline at end of file diff --git a/lsb-release.changes b/lsb-release.changes index 50350e2..ef06e02 100644 --- a/lsb-release.changes +++ b/lsb-release.changes @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Mon Nov 6 10:37:11 UTC 2023 - Thorsten Kukuk + +- Update to version 3.3, includes + 797e459ecaa482bf8e7bfe02cf5f1cea367ba9e9.patch + +------------------------------------------------------------------- Tue Sep 5 11:07:41 UTC 2023 - Dirk Müller - add 797e459ecaa482bf8e7bfe02cf5f1cea367ba9e9.patch to fix diff --git a/lsb-release.spec b/lsb-release.spec index ed34c32..e4d83a1 100644 --- a/lsb-release.spec +++ b/lsb-release.spec @@ -17,14 +17,13 @@ Name: lsb-release -Version: 3.2 +Version: 3.3 Release: 0 Summary: Linux Standard Base Release Tools License: GPL-2.0-or-later Group: System/Fhs URL: https://github.com/thkukuk/lsb-release_os-release Source: https://github.com/thkukuk/lsb-release_os-release/archive/refs/tags/v%{version}.tar.gz#/lsb-release-%{version}.tar.gz -Patch1: https://github.com/thkukuk/lsb-release_os-release/commit/797e459ecaa482bf8e7bfe02cf5f1cea367ba9e9.patch # for getopt(1) Requires: util-linux BuildArch: noarch @@ -33,7 +32,7 @@ BuildArch: noarch Tools from the Linux Standard Base project to determine the used distribution %prep -%autosetup -p1 -n lsb-release_os-release-%{version} +%autosetup -n lsb-release_os-release-%{version} %build %make_build