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

[Antonio Rojas]

    Date: Saturday, September 24, 2016 @ 14:10:56
  Author: arojas
Revision: 190311

Update to 1.16.0

Modified:
  mate-polkit/trunk/PKGBUILD

----------+
 PKGBUILD |   57 +++++++++++----------------------------------------------
 1 file changed, 11 insertions(+), 46 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2016-09-24 14:07:07 UTC (rev 190310)
+++ PKGBUILD	2016-09-24 14:10:56 UTC (rev 190311)
@@ -1,8 +1,7 @@
 # Contributor: Martin Wimpress <code at flexion.org>
 
-_ver=1.14
-pkgbase=mate-polkit
-pkgname=(${pkgbase} ${pkgbase}-gtk3)
+_ver=1.16
+pkgname=mate-polkit
 pkgver=${_ver}.0
 pkgrel=1
 pkgdesc="PolicyKit integration for the MATE desktop"
@@ -9,26 +8,21 @@
 url="http://mate-desktop.org"
 arch=('i686' 'x86_64')
 license=('LGPL')
-depends=('gtk2' 'gtk3')
+groups=('mate' 'mate-gtk3')
+depends=('gtk3')
 makedepends=('accountsservice' 'gobject-introspection' 'intltool')
-#makedepends=( 'mate-common')
+conflicts=('mate-polkit-gtk3')
+replaces=('mate-polkit-gtk3')
 source=("http://pub.mate-desktop.org/releases/${_ver}/${pkgname}-${pkgver}.tar.xz")
-sha1sums=('da2b4cf7b905a24fa22dd14e8991a71814ad7777')
+sha1sums=('d4add9b8ad5ffd249f961dbc7f69fd372013bd46')
 
-prepare() {
-    cd "${srcdir}"
-    mv "${pkgname}-${pkgver}" "${pkgbase}-gtk2"
-    cp -a "${pkgbase}-gtk2" "${pkgbase}-gtk3"
-}
-
 build() {
-    cd "${srcdir}/${pkgbase}-gtk2"
+    cd "${pkgname}-${pkgver}"
     ./configure \
         --prefix=/usr \
-        --libexecdir=/usr/lib/${pkgbase} \
+        --libexecdir=/usr/lib/${pkgname} \
         --sysconfdir=/etc \
         --localstatedir=/var \
-        --with-gtk=2.0 \
         --enable-introspection
 
     #https://bugzilla.gnome.org/show_bug.cgi?id=656231
@@ -35,38 +29,9 @@
     sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool
 
     make
-
-    cd "${srcdir}/${pkgbase}-gtk3"
-    ./configure \
-        --prefix=/usr \
-        --libexecdir=/usr/lib/${pkgbase} \
-        --sysconfdir=/etc \
-        --localstatedir=/var \
-        --with-gtk=3.0 \
-        --enable-introspection
-
-    #https://bugzilla.gnome.org/show_bug.cgi?id=656231
-    sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool
-
-    make
 }
 
-package_mate-polkit() {
-    pkgdesc+=' (GTK2 version)'
-    groups=('mate')
-    conflicts=("${pkgbase}-gtk3")
-    depends=('gtk2' 'polkit')
-
-    cd "${srcdir}/${pkgbase}-gtk2"
+package() {
+    cd "${pkgname}-${pkgver}"
     make DESTDIR="${pkgdir}" install
 }
-
-package_mate-polkit-gtk3() {
-    pkgdesc+=' (GTK3 version)'
-    groups=('mate-gtk3')
-    conflicts=("${pkgbase}")
-    depends=('gtk3')
-
-    cd "${srcdir}/${pkgbase}-gtk3"
-    make DESTDIR="${pkgdir}" install
-}