[arch-commits] Commit in lsb-release/trunk (PKGBUILD lsb_release_description.patch)

[Jonas Witschel]

    Date: Wednesday, February 16, 2022 @ 14:22:23
  Author: diabonas
Revision: 1133467

lsb-release: restore dropped lsb_release_description.patch

Turns out "lsb_release -d" works fine without the patch, but "lsb_release -a"
shows "(none)" instead of the description...

Added:
  lsb-release/trunk/lsb_release_description.patch
Modified:
  lsb-release/trunk/PKGBUILD

-------------------------------+
 PKGBUILD                      |    7 +++++--
 lsb_release_description.patch |   11 +++++++++++
 2 files changed, 16 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2022-02-16 14:13:00 UTC (rev 1133466)
+++ PKGBUILD	2022-02-16 14:22:23 UTC (rev 1133467)
@@ -14,10 +14,12 @@
 depends=('sh')
 makedepends=('git')
 source=("git+https://github.com/LinuxStandardBase/lsb-samples.git#commit=$_commit"
-        lsb-release
-        lsb_release_make_man_page_reproducible.patch)
+        'lsb-release'
+        'lsb_release_description.patch'
+        'lsb_release_make_man_page_reproducible.patch')
 sha512sums=('SKIP'
             'c4fb9d1026b6cc362b95d8b6662709ec18c0c8cb642d3a811d75bbb0e2fda93e1281accce40b7e7d5cde162144486a29d4c34ccbffcdd8f18e0ff51aef83db97'
+            '145ef64f90f5e6cc59075679e640cf7c1ad02617c12eff17f10b05c1cc219591fdba1b27be2b2c8480742aed24ce81d6a7badcbaca6772faea4ebc6a55695b62'
             'ab64a1d236d00a30a48e3af2c5bdfa0aad0183ebe0df4f2b0c6af58530c2a1fdac1b0a5cdd8a1800d5f8405f44562603cddf28eb318b5badaabd49a82e0b7e83')
 
 pkgver() {
@@ -27,6 +29,7 @@
 
 prepare() {
 	cd lsb-samples/lsb_release/src
+	patch -Np0 -i "$srcdir/lsb_release_description.patch"
 	patch -Np1 -i "$srcdir/lsb_release_make_man_page_reproducible.patch"
 }
 

Added: lsb_release_description.patch
===================================================================
--- lsb_release_description.patch	                        (rev 0)
+++ lsb_release_description.patch	2022-02-16 14:22:23 UTC (rev 1133467)
@@ -0,0 +1,11 @@
+--- lsb_release.orig	2012-11-13 05:12:02.000000000 -0800
++++ lsb_release	2013-11-24 17:13:55.943608718 -0800
+@@ -216,7 +216,7 @@
+             TMP_DISTRIB_DESC=$DISTRIB_DESCRIPTION
+         fi
+ 
+-        if [ -z "$TMP_DISTRIB_DESC" ]  # head or lsb-release init
++        if [ -z "$DISTRIB_DESCRIPTION" ]  # head or lsb-release init
+         then                           # file contains no data
+             DISTRIB_DESCRIPTION=$MSG_NONE
+             NO="y"