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

[Jan Steffens]

    Date: Monday, May 9, 2016 @ 22:48:36
  Author: heftig
Revision: 267287

3.20.2-1

Modified:
  aisleriot/trunk/PKGBUILD
Deleted:
  aisleriot/trunk/aisleriot.install

-------------------+
 PKGBUILD          |   22 +++++++++-------------
 aisleriot.install |   22 ----------------------
 2 files changed, 9 insertions(+), 35 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2016-05-09 20:46:59 UTC (rev 267286)
+++ PKGBUILD	2016-05-09 20:48:36 UTC (rev 267287)
@@ -2,34 +2,30 @@
 # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens at gmail.com>
 
 pkgname=aisleriot
-pkgver=3.20.1
+pkgver=3.20.2
 pkgrel=1
 pkgdesc="A collection of patience games written in guile scheme"
+url="https://wiki.gnome.org/Apps/Aisleriot"
 arch=(i686 x86_64)
 license=(GPL)
-url="http://www.gnome.org"
-groups=('gnome-extra')
-depends=(guile gtk3 librsvg libcanberra gconf hicolor-icon-theme dconf)
-makedepends=(intltool itstool docbook-xsl yelp-tools desktop-file-utils appdata-tools)
+groups=(gnome-extra)
+depends=(guile gtk3 librsvg libcanberra gconf dconf)
+makedepends=(intltool itstool docbook-xsl yelp-tools appdata-tools)
 optdepends=('libkdegames: KDE card sets'
             'pysolfc: PySol card sets'
             'pysolfc-cardsets: PySol card sets')
-options=('!emptydirs')
-install=aisleriot.install
+options=(!emptydirs)
 source=(https://download.gnome.org/sources/$pkgname/${pkgver:0:4}/$pkgname-$pkgver.tar.xz)
-sha256sums=('fe9d7727e237e421bd6d253918b3caecd1f84dba9d7354610d484a33869f37da')
+sha256sums=('62036bdc69f8ae63a4405b4dd530a3def2958d5075b4e0a7caeb91fad789176e')
 
 build() {
   cd $pkgname-$pkgver
-  # Workaround TSX bugs on pkgbuild.com
-  #export GLIBC_PTHREAD_MUTEX=none
-  #export GLIBC_PTHREAD_RWLOCK=none
+
   ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \
     --libexecdir=/usr/lib --disable-static \
     --with-kde-card-theme-path=/usr/share/carddecks \
     --with-pysol-card-theme-path=/usr/share/PySolFC
 
-
   # https://bugzilla.gnome.org/show_bug.cgi?id=655517
   sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool
 
@@ -39,7 +35,7 @@
 package() {
   cd $pkgname-$pkgver
   make DESTDIR="$pkgdir" install GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1
-  install -m755 -d "$pkgdir/usr/share/gconf/schemas"
+  install -d "$pkgdir/usr/share/gconf/schemas"
   gconf-merge-schema "$pkgdir/usr/share/gconf/schemas/$pkgname.schemas" \
     --domain aisleriot "$pkgdir"/etc/gconf/schemas/*.schemas
   rm -f "$pkgdir"/etc/gconf/schemas/*.schemas

Deleted: aisleriot.install
===================================================================
--- aisleriot.install	2016-05-09 20:46:59 UTC (rev 267286)
+++ aisleriot.install	2016-05-09 20:48:36 UTC (rev 267287)
@@ -1,22 +0,0 @@
-post_install() {
-  usr/bin/glib-compile-schemas usr/share/glib-2.0/schemas
-  gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
-  usr/sbin/gconfpkg --install aisleriot
-}
-
-pre_upgrade() {
-  pre_remove
-}
-
-post_upgrade() {
-  post_install
-}
-
-pre_remove() {
-  usr/sbin/gconfpkg --uninstall aisleriot
-}
-
-post_remove() {
-  usr/bin/glib-compile-schemas usr/share/glib-2.0/schemas
-  gtk-update-icon-cache -q -f -t usr/share/icons/hicolor
-}