git » lrzsz.git » commit 0202c9d

diff --git a/PKGBUILD b/PKGBUILD
index b369075..095c481 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -4,39 +4,36 @@
 
 pkgname=lrzsz
 pkgver=0.12.20
-pkgrel=12
+pkgrel=13
 pkgdesc="xmodem, ymodem and zmodem file transfer protocols"
 url="https://www.ohse.de/uwe/software/lrzsz.html"
 license=('GPL2')
 arch=('x86_64')
 source=(https://www.ohse.de/uwe/releases/$pkgname-$pkgver.tar.gz
 	https://src.fedoraproject.org/rpms/lrzsz/raw/rawhide/f/lrzsz-0.12.20.patch
-	lrzsz.patch)
+	lrzsz.patch
+        program-name.patch)
 sha512sums=('9bce64036f1f1c65f5910f19802aecaf3dc5ffeab0feeca10fa8d2fe1b83e212391cce23056d22fd0eda52df89e12ede68eb5d22ffcf22f935910d2af7399f12'
             '71c527712b0909b77e7d68dedb816b3229d53ef39e76f617661640d05e20ade8129347ee2801f636705abca4cf1b591963e7067d26e7e822e01e6cfa8cea8d8e'
-            '4912ec15bb1bd63b2af0c74970daf3023bdc441ad3f5f3c95b3bf46b5f11e21022dcfe5c80151ffc99ae1fd3df9b7fe01f44d00a1d8f1a35e04f68e7f3f38430')
+            '4912ec15bb1bd63b2af0c74970daf3023bdc441ad3f5f3c95b3bf46b5f11e21022dcfe5c80151ffc99ae1fd3df9b7fe01f44d00a1d8f1a35e04f68e7f3f38430'
+            '628b5ed820ae04508958fdf970c5bb2ebb916a4f075688fb21e85f8492228431843116617f63f5fd29e77356a1a913f722211b7b661cafc0107f03761f68abbe')
 
 prepare() {
   cd "$srcdir"/$pkgname-$pkgver
   patch -Np1 -i ../lrzsz.patch
   patch -Np1 -i ../lrzsz-0.12.20.patch
+  patch -Np1 -i ../program-name.patch # Make it work with modified binary names
   sed -i 's|${CC-cc} -E|${CC-cc} -O2 -E|g' configure
 }
 
 build() {
   cd "$srcdir"/$pkgname-$pkgver
-  ./configure --prefix=/usr --mandir=/usr/share/man
+  ./configure --prefix=/usr --mandir=/usr/share/man \
+    --program-transform-name=s/l/lrzsz-/
   make -j1
 }
 
 package() {
   cd "$srcdir"/$pkgname-$pkgver
   make -j1 DESTDIR="$pkgdir" install
-  install -dm0755 "$pkgdir"/usr/bin/lrzsz
-  # does not work with custom name so move them to separate dir to avoid conflict with lrzip
-  # https://gitlab.archlinux.org/archlinux/packaging/packages/lrzsz/-/issues/1
-  mv "$pkgdir"/usr/bin/??? "$pkgdir"/usr/bin/lrzsz/
-  cd "$pkgdir"/usr/share/man/man1/
-  mv lrz.1 lrzsz-rz.1
-  mv lsz.1 lrzsz-sz.1
 }
diff --git a/program-name.patch b/program-name.patch
new file mode 100644
index 0000000..ad57db3
--- /dev/null
+++ b/program-name.patch
@@ -0,0 +1,12 @@
+diff -ru lrzsz-0.12.20.orig/src/lrz.c lrzsz-0.12.20/src/lrz.c
+--- lrzsz-0.12.20.orig/src/lrz.c	2024-02-03 19:27:08.473442472 +0100
++++ lrzsz-0.12.20/src/lrz.c	2024-02-03 20:26:47.852610801 +0100
+@@ -1575,6 +1575,8 @@
+ 		Verbose=1; ++s;
+ 	}
+ 	program_name = s;
++	if (strstr(s, "lrzsz-") == s)
++		s+=6;
+ 	if (*s == 'l') 
+ 		s++; /* lrz -> rz */
+ 	protocol=ZM_ZMODEM;