[arch-commits] Commit in mate-system-monitor/trunk (2 files)

[Balló György]

    Date: Saturday, August 6, 2016 @ 22:19:34
  Author: bgyorgy
Revision: 185722

upgpkg: mate-system-monitor 1.14.0-1

Update to new version

Modified:
  mate-system-monitor/trunk/PKGBUILD
Deleted:
  mate-system-monitor/trunk/mate-system-monitor.install

-----------------------------+
 PKGBUILD                    |   67 ++++++++++--------------------------------
 mate-system-monitor.install |   11 ------
 2 files changed, 17 insertions(+), 61 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2016-08-06 21:49:38 UTC (rev 185721)
+++ PKGBUILD	2016-08-06 22:19:34 UTC (rev 185722)
@@ -1,64 +1,31 @@
-# Maintainer : Martin Wimpress <code at flexion.org>
+# Contributor: Martin Wimpress <code at flexion.org>
 
-_ver=1.12
-pkgbase=mate-system-monitor
-pkgname=(${pkgbase} ${pkgbase}-gtk3)
-pkgver=${_ver}.1
-pkgrel=2
+_ver=1.14
+pkgname=mate-system-monitor
+pkgver=${_ver}.0
+pkgrel=1
 pkgdesc="A system monitor for MATE"
 url="http://mate-desktop.org"
 arch=('i686' 'x86_64')
 license=('GPL')
-depends=('dconf' 'dbus-glib' 'glibmm' 'gtkmm' 'gtkmm3' 'libgtop' 'libwnck'
-         'libwnck3' 'librsvg')
-makedepends=('docbook2x' 'mate-common' 'yelp-tools')
-optdepends=('yelp: for reading MATE help documents')
-source=("http://pub.mate-desktop.org/releases/${_ver}/${pkgbase}-${pkgver}.tar.xz")
-sha1sums=('58fd0ab16ff76a1d0871053698c13cb28f407bf1')
-install=${pkgbase}.install
+depends=('gtkmm3' 'libgtop' 'libwnck3')
+makedepends=('intltool' 'itstool')
+conflicts=("${pkgname}-gtk3")
+replaces=("${pkgname}-gtk3")
+groups=('mate-extra')
+source=("http://pub.mate-desktop.org/releases/${_ver}/${pkgname}-${pkgver}.tar.xz")
+sha1sums=('a9045ce34fe9c116b6afae08b04030ab9c2287ae')
 
-prepare() {
-    cd "${srcdir}"
-    mv "${pkgname}-${pkgver}" "${pkgbase}-gtk2"
-    cp -a "${pkgbase}-gtk2" "${pkgbase}-gtk3"
-}
-
 build() {
-    cd "${srcdir}/${pkgbase}-gtk2"
+    cd "${srcdir}/${pkgname}-${pkgver}"
     ./configure \
         --prefix=/usr \
-        --libexecdir=/usr/lib/${pkgbase} \
-        --localstatedir=/var \
-        --with-gtk=2.0 \
-        --disable-static
+        --libexecdir=/usr/lib/${pkgname} \
+        --localstatedir=/var
     make
-
-    cd "${srcdir}/${pkgbase}-gtk3"
-    ./configure \
-        --prefix=/usr \
-        --libexecdir=/usr/lib/${pkgbase} \
-        --localstatedir=/var \
-        --with-gtk=3.0 \
-        --disable-static
-    make
 }
 
-package_mate-system-monitor() {
-    pkgdesc+=' (GTK2 version)'
-    groups=('mate-extra')
-    conflicts=("${pkgbase}-gtk3")
-    depends=('dconf' 'dbus-glib' 'glibmm' 'gtkmm' 'libgtop' 'libwnck' 'librsvg')
-
-    cd "${srcdir}/${pkgbase}-gtk2"
+package() {
+    cd "${srcdir}/${pkgname}-${pkgver}"
     make DESTDIR="${pkgdir}" install
 }
-
-package_mate-system-monitor-gtk3() {
-    pkgdesc+=' (GTK3 version [EXPERIMENTAL])'
-    groups=('mate-extra-gtk3')
-    conflicts=("${pkgbase}")
-    depends=('dconf' 'dbus-glib' 'glibmm' 'gtkmm3' 'libgtop' 'libwnck3' 'librsvg')
-
-    cd "${srcdir}/${pkgbase}-gtk3"
-    make DESTDIR="${pkgdir}" install
-}

Deleted: mate-system-monitor.install
===================================================================
--- mate-system-monitor.install	2016-08-06 21:49:38 UTC (rev 185721)
+++ mate-system-monitor.install	2016-08-06 22:19:34 UTC (rev 185722)
@@ -1,11 +0,0 @@
-post_install() {
-    glib-compile-schemas /usr/share/glib-2.0/schemas/
-}
-
-post_upgrade() {
-    post_install
-}
-
-post_remove() {
-    post_install
-}