[arch-commits] Commit in sxiv/trunk (PKGBUILD sxiv.install)

[Bartłomiej Piotrowski]

    Date: Saturday, July 26, 2014 @ 12:38:15
  Author: bpiotrowski
Revision: 116371

upgpkg: sxiv 1.2-3, fixes FS#41319

* use PREFIX and DESTDIR to remove reference to $pkgdir from the man page
* install and actually use the icon

Modified:
  sxiv/trunk/PKGBUILD
  sxiv/trunk/sxiv.install

--------------+
 PKGBUILD     |    8 +++++---
 sxiv.install |   11 ++++++++---
 2 files changed, 13 insertions(+), 6 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2014-07-26 10:31:50 UTC (rev 116370)
+++ PKGBUILD	2014-07-26 10:38:15 UTC (rev 116371)
@@ -6,13 +6,13 @@
 
 pkgname=sxiv
 pkgver=1.2
-pkgrel=2
+pkgrel=3
 pkgdesc='Simple X Image Viewer'
 arch=('i686' 'x86_64')
 license=('GPL2')
 install=sxiv.install
 url='https://github.com/muennich/sxiv'
-depends=('imlib2' 'desktop-file-utils')
+depends=('imlib2' 'desktop-file-utils' 'xdg-utils' 'hicolor-icon-theme')
 source=(https://github.com/muennich/sxiv/archive/v$pkgver.tar.gz
         giflib-5.1.0.patch)
 md5sums=('9b79d3c70693d9abbc66295cf6f281a0'
@@ -21,6 +21,7 @@
 prepare() {
   cd $pkgname-$pkgver
   patch -p1 -i ../giflib-5.1.0.patch
+  sed -i '/^NoDisplay=/s/true/false/' sxiv.desktop
 }
 
 build() {
@@ -29,6 +30,7 @@
 
 package() {
   cd $pkgname-$pkgver
-  make PREFIX="$pkgdir"/usr install
+  make PREFIX=/usr DESTDIR="$pkgdir" install
+  make -C icon PREFIX=/usr DESTDIR="$pkgdir" install
   install -Dm644 sxiv.desktop "$pkgdir"/usr/share/applications/sxiv.desktop
 }

Modified: sxiv.install
===================================================================
--- sxiv.install	2014-07-26 10:31:50 UTC (rev 116370)
+++ sxiv.install	2014-07-26 10:38:15 UTC (rev 116371)
@@ -1,7 +1,12 @@
-post_install () {
+post_install() {
+  xdg-icon-resource forceupdate --theme hicolor &> /dev/null
   update-desktop-database -q
 }
 
-post_upgrade () {
-  update-desktop-database -q
+post_upgrade() {
+  post_install
 }
+
+post_remove() {
+  post_install
+}