David Runge pushed to branch main at Arch Linux / Packaging / Packages / sane


Commits:
f56d9fe0 by David Runge at 2024-02-27T10:58:09+01:00
upgpkg: 1.3.0-1

Switch url to upstream source repository, as "website" has 
continuously
broken TLS and this way we can reuse url in source array.
Switch to correct SPDX license identifiers for upstream project.

- - - - -


2 changed files:

- .SRCINFO
- PKGBUILD


Changes:

=====================================
.SRCINFO
=====================================
@@ -1,10 +1,11 @@
 pkgbase = sane
        pkgdesc = Scanner Access Now Easy
-       pkgver = 1.2.1
-       pkgrel = 6
-       url = http://www.sane-project.org/
+       pkgver = 1.3.0
+       pkgrel = 1
+       url = https://gitlab.com/sane-project/backends
        arch = x86_64
-       license = GPL2
+       license = GPL-2.0-or-later
+       license = LicenseRef-GPL-2.0-or-later-with-linking-exception
        makedepends = autoconf-archive
        makedepends = avahi
        makedepends = curl
@@ -28,17 +29,17 @@ pkgbase = sane
        depends = v4l-utils
        optdepends = sane-airscan: for scanners working in driverless mode
        provides = libsane.so
-       source = 
https://gitlab.com/sane-project/backends/-/archive/1.2.1/backends-1.2.1.tar.gz
+       source = 
https://gitlab.com/sane-project/backends/-/archive/1.3.0/backends-1.3.0.tar.gz
        source = 66-saned.rules
        source = sane.sysusers
        source = saned.service
        source = saned.socket
-       sha512sums = 
b3b803162066b563d9bafaedb7a6c8c1e9be736bb787f2e412f3f71402a42721123bc32882ae9dc39cbf12bc2c423f8841ed06f525f325857f4273186b7f3a16
+       sha512sums = 
e1b139d2588dee2d4478b4b3001c1d164ef293bf268720c73b001fdfd5b18b0a2052c692b9af55a09c06ec4242de6a0006c7956a7da4253fc5fd1e560d3b528b
        sha512sums = 
d0d1b6bd6fbb04d610e7186e26d04c2233a620cc7c731ca3acd7fb860dd033fbe99d8974ffa1dd59c8affcc4aa2664d76ab3dfd6f7b2a734b31d7e3832359c41
        sha512sums = 
d8cd194b57eff2249df2b8d540a892e518aa3e3bba6387211ed21230dc235e98c49b71f262f0b1007e8c859c59776410840376244e0aec1f06363881b2c81fd8
        sha512sums = 
baf2cf2fdff689f776973ac4f69ea02b131f2a1a754a8d52a8e8ad33b0e559ba286649a891723a7ad94b2bcb01ec88155d43c36eaeb35e47fbc8ea80c49c5d47
        sha512sums = 
a23ceeeb02bd9e214702003a3165886858ecbdd93df89cd37ad5f00581745454548ccda0ab656f2dc0acbf2896a8781568c786797e64a07014be003d6140a093
-       b2sums = 
b12a629bab6e79d9027d9e90cfa5851ee172a7a1eb6303666c294e2a3d881e2afbef9a3cf3d3156063885a28ec64294216d0dec83c25d212af257f83bbc33721
+       b2sums = 
f6413f374f2d05bec08c3490c03ff6d69e0b902b5907acd6d96aa6ae255865adb9d3dd68b774795d33a8a19c27b5fe337af29e239e4178e1f3882f302d6bcdd2
        b2sums = 
c9c6ba224b9b27f4ecc6b1ded6621a8abb52b1ded2d9078e4cad31177290b788e286fad74545a5cb09e1f6726515adc22003988eb646dc986e87f1a8061a0e27
        b2sums = 
2a4ddc9849562e3a0adcaec1859391e3f37a63f25c27dbc140cabd697bd65b89a0fc812c4516cbdfb36d1f30844df34934b3c1c59650101f54fc1ac0acb3f5d9
        b2sums = 
272b4860dbd3f2b69eedfed4532cf8a388629c003c9a0e0ee98defbc2023e07edc26275a17f56ea9fd4d90e9b3b6532c5b10d1e2b91e6ab4df242ac44101d802


=====================================
PKGBUILD
=====================================
@@ -6,12 +6,15 @@
 
 _name=backends
 pkgname=sane
-pkgver=1.2.1
-pkgrel=6
+pkgver=1.3.0
+pkgrel=1
 pkgdesc="Scanner Access Now Easy"
 arch=(x86_64)
-url="http://www.sane-project.org/";
-license=(GPL2)
+url="https://gitlab.com/sane-project/backends";
+license=(
+  GPL-2.0-or-later
+  LicenseRef-GPL-2.0-or-later-with-linking-exception
+)
 depends=(
   bash
   cairo
@@ -42,24 +45,27 @@ optdepends=(
 )
 provides=(libsane.so)
 source=(
-  
https://gitlab.com/sane-project/$_name/-/archive/$pkgver/$_name-$pkgver.tar.gz
+  $url/-/archive/$pkgver/$_name-$pkgver.tar.gz
   66-${pkgname}d.rules
   $pkgname.sysusers
   ${pkgname}d.service
   ${pkgname}d.socket
 )
-sha512sums=('b3b803162066b563d9bafaedb7a6c8c1e9be736bb787f2e412f3f71402a42721123bc32882ae9dc39cbf12bc2c423f8841ed06f525f325857f4273186b7f3a16'
+sha512sums=('e1b139d2588dee2d4478b4b3001c1d164ef293bf268720c73b001fdfd5b18b0a2052c692b9af55a09c06ec4242de6a0006c7956a7da4253fc5fd1e560d3b528b'
             
'd0d1b6bd6fbb04d610e7186e26d04c2233a620cc7c731ca3acd7fb860dd033fbe99d8974ffa1dd59c8affcc4aa2664d76ab3dfd6f7b2a734b31d7e3832359c41'
             
'd8cd194b57eff2249df2b8d540a892e518aa3e3bba6387211ed21230dc235e98c49b71f262f0b1007e8c859c59776410840376244e0aec1f06363881b2c81fd8'
             
'baf2cf2fdff689f776973ac4f69ea02b131f2a1a754a8d52a8e8ad33b0e559ba286649a891723a7ad94b2bcb01ec88155d43c36eaeb35e47fbc8ea80c49c5d47'
             
'a23ceeeb02bd9e214702003a3165886858ecbdd93df89cd37ad5f00581745454548ccda0ab656f2dc0acbf2896a8781568c786797e64a07014be003d6140a093')
-b2sums=('b12a629bab6e79d9027d9e90cfa5851ee172a7a1eb6303666c294e2a3d881e2afbef9a3cf3d3156063885a28ec64294216d0dec83c25d212af257f83bbc33721'
+b2sums=('f6413f374f2d05bec08c3490c03ff6d69e0b902b5907acd6d96aa6ae255865adb9d3dd68b774795d33a8a19c27b5fe337af29e239e4178e1f3882f302d6bcdd2'
         
'c9c6ba224b9b27f4ecc6b1ded6621a8abb52b1ded2d9078e4cad31177290b788e286fad74545a5cb09e1f6726515adc22003988eb646dc986e87f1a8061a0e27'
         
'2a4ddc9849562e3a0adcaec1859391e3f37a63f25c27dbc140cabd697bd65b89a0fc812c4516cbdfb36d1f30844df34934b3c1c59650101f54fc1ac0acb3f5d9'
         
'272b4860dbd3f2b69eedfed4532cf8a388629c003c9a0e0ee98defbc2023e07edc26275a17f56ea9fd4d90e9b3b6532c5b10d1e2b91e6ab4df242ac44101d802'
         
'5e9f0350a1553fc75aea88ce355fb68b881e3b2194ac0e3c6f3cecdae79111fb1db1cfe3b4933eca15af5f985fc6b89e4d9af3844b6e9cfd542828b6b9e57ed9')
 
 prepare() {
+  # extract custom license exception
+  sed '1,41p' $_name-$pkgver/backend/dll.c > 
LicenseRef-GPL-2.0-or-later-with-linking-exception.txt
+
   cd $_name-$pkgver
   # copy translation files so they become reproducible: 
https://gitlab.com/sane-project/backends/-/issues/647
   cp -v po/en{_GB,@quot}.po
@@ -115,6 +121,9 @@ package() {
 
   make DESTDIR="$pkgdir" install
 
+  # install custom license
+  install -vDm 644 ../LicenseRef-GPL-2.0-or-later-with-linking-exception.txt 
-t "$pkgdir/usr/share/licenses/$pkgname/"
+
   # generate udev udev+hwdb
   install -vdm 755 "$pkgdir/usr/lib/udev/rules.d/"
   tools/sane-desc -m udev+hwdb -s doc/descriptions/ > 
"$pkgdir/usr/lib/udev/rules.d/65-$pkgname.rules"



View it on GitLab: 
https://gitlab.archlinux.org/archlinux/packaging/packages/sane/-/commit/f56d9fe01b51c96d1af3f5160995747a73d5deb4

-- 
View it on GitLab: 
https://gitlab.archlinux.org/archlinux/packaging/packages/sane/-/commit/f56d9fe01b51c96d1af3f5160995747a73d5deb4
You're receiving this email because of your account on gitlab.archlinux.org.


Reply via email to