[arch-commits] Commit in lsb-release/trunk (3 files)

[Jonas Witschel]

    Date: Wednesday, February 16, 2022 @ 13:54:06
  Author: diabonas
Revision: 1133463

upgpkg: lsb-release 2.0.r48.3cf5103-1

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

-------------------------------+
 PKGBUILD                      |   54 +++++++++++++++++++---------------------
 lsb-release                   |    3 ++
 lsb_release_description.patch |   11 --------
 3 files changed, 29 insertions(+), 39 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2022-02-16 13:53:50 UTC (rev 1133462)
+++ PKGBUILD	2022-02-16 13:54:06 UTC (rev 1133463)
@@ -1,46 +1,44 @@
-# Maintainer: Sven-Hendrik Haase <sh at lutzhaase.com>
+# Maintainer: Jonas Witschel <diabonas at archlinux.org>
+# Contributor: Sven-Hendrik Haase <sh at lutzhaase.com>
 # Contributor: Malte Rabenseifner <malte at zearan.de>
 # Contributor: John Gerritse <reaphsharc at gmail.com>
 
 pkgname=lsb-release
-pkgver=1.4
-pkgrel=18
+pkgver=2.0.r48.3cf5103
+_commit=3cf51039933d03ef15388b75d30baa5d5e09a1a0
+pkgrel=1
 pkgdesc="LSB version query program"
 arch=('any')
-url="http://www.linuxbase.org/"
-license=('GPL2')
-depends=('bash')
+url="https://refspecs.linuxfoundation.org/lsb.shtml"
+license=('GPL')
+depends=('sh')
+makedepends=('git')
 install=lsb-release.install
-source=(https://downloads.sourceforge.net/lsb/$pkgname-$pkgver.tar.gz
-        lsb_release_description.patch
+source=("git+https://github.com/LinuxStandardBase/lsb-samples.git#commit=$_commit"
+        lsb-release
         lsb_release_make_man_page_reproducible.patch)
-sha512sums=('84f6f8794380463587005043f601b7a40190cd9e3409abff7f5ce7658cf029a14346eff87838296d90307192bdeff68cc00480c5c04814da7acdb3e220640fde'
-            '145ef64f90f5e6cc59075679e640cf7c1ad02617c12eff17f10b05c1cc219591fdba1b27be2b2c8480742aed24ce81d6a7badcbaca6772faea4ebc6a55695b62'
+sha512sums=('SKIP'
+            'c4fb9d1026b6cc362b95d8b6662709ec18c0c8cb642d3a811d75bbb0e2fda93e1281accce40b7e7d5cde162144486a29d4c34ccbffcdd8f18e0ff51aef83db97'
             'ab64a1d236d00a30a48e3af2c5bdfa0aad0183ebe0df4f2b0c6af58530c2a1fdac1b0a5cdd8a1800d5f8405f44562603cddf28eb318b5badaabd49a82e0b7e83')
 
+pkgver() {
+	cd lsb-samples/lsb_release/src
+	printf "%s.r%s.%s" "$(grep -Po 'SCRIPTVERSION="\K[^"]*' lsb_release)" "$(git rev-list --count HEAD)" "$(git rev-parse --short HEAD)"
+}
+
 prepare() {
-  cd "$srcdir/$pkgname-$pkgver"
-
-  patch -Np0 < "$srcdir/lsb_release_description.patch"
-  patch -Np1 < "$srcdir/lsb_release_make_man_page_reproducible.patch"
+	cd lsb-samples/lsb_release/src
+	patch -Np1 -i "$srcdir/lsb_release_make_man_page_reproducible.patch"
 }
 
-
 build() {
-  cd "$srcdir/$pkgname-$pkgver"
-
-  make
+	cd lsb-samples/lsb_release/src
+	make
 }
 
 package() {
-  cd "$srcdir/$pkgname-$pkgver"
-
-  install -dm755 "$pkgdir/etc"
-  echo "LSB_VERSION=$pkgver" >> "$pkgdir/etc/lsb-release"
-  echo "DISTRIB_ID=Arch" >> "$pkgdir/etc/lsb-release"
-  echo "DISTRIB_RELEASE=rolling" >> "$pkgdir/etc/lsb-release"
-  echo "DISTRIB_DESCRIPTION=\"Arch Linux\"" >> "$pkgdir/etc/lsb-release"
-
-  install -Dm 644 lsb_release.1.gz "$pkgdir/usr/share/man/man1/lsb_release.1.gz"
-  install -Dm 755 lsb_release "$pkgdir/usr/bin/lsb_release"
+	cd lsb-samples/lsb_release/src
+	install -Dm644 lsb_release.1.gz -t "$pkgdir/usr/share/man/man1"
+	install -Dm755 lsb_release -t "$pkgdir/usr/bin"
+	install -Dm644 "$srcdir/lsb-release" -t "$pkgdir/etc"
 }

Added: lsb-release
===================================================================
--- lsb-release	                        (rev 0)
+++ lsb-release	2022-02-16 13:54:06 UTC (rev 1133463)
@@ -0,0 +1,3 @@
+DISTRIB_ID="Arch"
+DISTRIB_RELEASE="rolling"
+DISTRIB_DESCRIPTION="Arch Linux"

Deleted: lsb_release_description.patch
===================================================================
--- lsb_release_description.patch	2022-02-16 13:53:50 UTC (rev 1133462)
+++ lsb_release_description.patch	2022-02-16 13:54:06 UTC (rev 1133463)
@@ -1,11 +0,0 @@
---- 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"