[arch-commits] Commit in gprename/trunk (PKGBUILD gprename-build.patch)

[Balló György]

    Date: Monday, August 3, 2020 @ 21:38:05
  Author: bgyorgy
Revision: 668570

upgpkg: gprename 20190221-3: Fix icon location

Modified:
  gprename/trunk/PKGBUILD
  gprename/trunk/gprename-build.patch

----------------------+
 PKGBUILD             |   16 +++++++---------
 gprename-build.patch |    4 ++--
 2 files changed, 9 insertions(+), 11 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2020-08-03 21:37:46 UTC (rev 668569)
+++ PKGBUILD	2020-08-03 21:38:05 UTC (rev 668570)
@@ -4,22 +4,26 @@
 
 pkgname=gprename
 pkgver=20190221
-pkgrel=2
+pkgrel=3
 pkgdesc="A GTK2 batch renamer for files and directories"
 arch=('any')
 url="http://gprename.sourceforge.net/"
 license=('GPL3')
 depends=('gtk2-perl' 'perl-libintl-perl' 'perl-locale-gettext')
-makedepends=('patch')
 source=(https://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.bz2
         $pkgname-build.patch)
 sha256sums=('7558c4e9738a549c661712d2a84a446e5a803725e66a62edc6ace42737413ac4'
-            '8ade8ded3e4185d0d465668d2d519bc6eaf668f354109c45f42eeb05ba502cc0')
+            '2b1bb4d9b285570a03f9c6cb364dedce2a51e5d934854ec5d60e31ca95a03008')
 
 prepare() {
   cd "${srcdir}"/${pkgname}-${pkgver}
 
   patch -Np1 -i "${srcdir}"/$pkgname-build.patch
+
+#29940 fix
+  sed 's#/usr/local#/usr#' -i bin/$pkgname
+#45250 fix
+  sed 's#/usr/share/icons/gprename.png#/usr/share/icons/hicolor/64x64/apps/gprename.png#' -i bin/$pkgname
 }
 
 package() {
@@ -26,10 +30,4 @@
   cd "${srcdir}"/${pkgname}-${pkgver}
 
   make PREFIX=/usr DESTDIR="${pkgdir}"/usr install
-
-#29940 fix
-  sed 's#/usr/local#/usr#' -i "${pkgdir}"/usr/bin/$pkgname
-  sed 's#/usr/local#/usr#' -i "${pkgdir}"/usr/share/applications/$pkgname*.*
-#45250 fix
-  sed 's#/usr/share/pixmaps/gprename#/usr/share/icons#' -i "${pkgdir}"/usr/bin/$pkgname
 }

Modified: gprename-build.patch
===================================================================
--- gprename-build.patch	2020-08-03 21:37:46 UTC (rev 668569)
+++ gprename-build.patch	2020-08-03 21:38:05 UTC (rev 668570)
@@ -17,7 +17,7 @@
 -	install -d "/usr/share"
 -	install -d "/usr/share/icons"
 +	install -d "$(DESTDIR)/share"
-+	install -d "$(DESTDIR)/share/icons"
++	install -d "$(DESTDIR)/share/icons/hicolor/64x64/apps"
  	install -d "$(DESTDIR)/share/applications"
  	install -d "$(DESTDIR)/share/man"
  	install -d "$(DESTDIR)/share/man/man1"
@@ -26,7 +26,7 @@
  	install -m 755 build/gprename                "$(DESTDIR)/bin/"
  	install -m 644 gprename-nautilus-actions.xml "$(DESTDIR)/share/applications/"
 -	install -m 644 icon/gprename.png             "/usr/share/icons/"
-+	install -m 644 icon/gprename.png             "$(DESTDIR)/share/icons/"
++	install -m 644 icon/gprename.png             "$(DESTDIR)/share/icons/hicolor/64x64/apps/"
  	install -m 644 man/gprename.1                "$(DESTDIR)/share/man/man1/"
  	install -m 644 build/locale/ca.mo            "$(DESTDIR)/share/locale/ca/LC_MESSAGES/gprename.mo"
  	install -m 644 build/locale/de.mo            "$(DESTDIR)/share/locale/de/LC_MESSAGES/gprename.mo"