[arch-commits] Commit in puzzles/trunk (PKGBUILD)

[Antonio Rojas]

    Date: Monday, January 3, 2022 @ 22:10:06
  Author: arojas
Revision: 1092635

Use NAME_PREFIX (FS#72800)

Modified:
  puzzles/trunk/PKGBUILD

----------+
 PKGBUILD |   13 +++----------
 1 file changed, 3 insertions(+), 10 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2022-01-03 22:07:52 UTC (rev 1092634)
+++ PKGBUILD	2022-01-03 22:10:06 UTC (rev 1092635)
@@ -5,7 +5,7 @@
 
 pkgname=puzzles
 pkgver=20211212
-pkgrel=1
+pkgrel=2
 _commit=b56c994
 pkgdesc="Simon Tatham's Portable Puzzle Collection"
 arch=('x86_64')
@@ -18,7 +18,8 @@
 
 build() {
   cmake -B build -S puzzles-$pkgver.$_commit \
-   -DCMAKE_INSTALL_PREFIX=/usr
+   -DCMAKE_INSTALL_PREFIX=/usr \
+   -DNAME_PREFIX=puzzles-
   cmake --build build
 }
 
@@ -26,12 +27,4 @@
   DESTDIR="$pkgdir" cmake --install build
 
   install -Dm644 puzzles-$pkgver.$_commit/LICENCE "$pkgdir"/usr/share/licenses/$pkgname/LICENSE
-
-# Fix FS#14600 (name conflicts with other packages).
-  cd "$pkgdir"/usr/bin
-  for oldname in *; do
-    newname=puzzles-$oldname
-    mv "$pkgdir"/usr/bin/{$oldname,$newname}
-    sed -e "s|Exec=$oldname|Exec=$newname|" -i "$pkgdir"/usr/share/applications/$oldname.desktop
-  done
 }