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

[Antonio Rojas]

    Date: Friday, March 17, 2017 @ 19:58:53
  Author: arojas
Revision: 216951

Update to 1.18.0

Modified:
  libmateweather/trunk/PKGBUILD

----------+
 PKGBUILD |   56 +++++++++++---------------------------------------------
 1 file changed, 11 insertions(+), 45 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2017-03-17 19:52:42 UTC (rev 216950)
+++ PKGBUILD	2017-03-17 19:58:53 UTC (rev 216951)
@@ -1,32 +1,25 @@
 # Contributor: Martin Wimpress <code at flexion.org>
 
-_ver=1.16
-pkgbase=libmateweather
-pkgname=(${pkgbase} ${pkgbase}-gtk3)
-pkgver=${_ver}.1
+pkgname=libmateweather
+pkgver=1.18.0
 pkgrel=1
 pkgdesc="Provides access to weather information from the Internet."
 url="http://mate-desktop.org"
 arch=('i686' 'x86_64')
 license=('LGPL')
-depends=('gtk2' 'gtk3')
-makedepends=('intltool' 'libsoup')
-source=("http://pub.mate-desktop.org/releases/${_ver}/${pkgname}-${pkgver}.tar.xz")
-sha1sums=('912eb67104da9414eb47c4a9b0631735d2528794')
+depends=('gtk3' 'libsoup')
+makedepends=('intltool')
+conflicts=('libmateweather-gtk3')
+replaces=('libmateweather-gtk3')
+source=("http://pub.mate-desktop.org/releases/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz")
+sha1sums=('b0f158847c02a22ca2fc802a855a681f5970ce9a')
 
-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 \
         --sysconfdir=/etc \
         --localstatedir=/var \
-        --with-gtk=2.0 \
         --disable-python \
         --enable-locations-compression
 
@@ -34,36 +27,9 @@
     sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool
 
     make
-
-    cd "${srcdir}/${pkgbase}-gtk3"
-    ./configure \
-        --prefix=/usr \
-        --sysconfdir=/etc \
-        --localstatedir=/var \
-        --with-gtk=3.0 \
-        --disable-python \
-        --enable-locations-compression
-
-    #https://bugzilla.gnome.org/show_bug.cgi?id=656231
-    sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool
-
-    make
 }
 
-package_libmateweather() {
-    pkgdesc+=' (GTK2 version)'
-    conflicts=("${pkgbase}-gtk3")
-    depends=('dconf' 'gtk2' 'libsoup')
-    
-    cd "${srcdir}/${pkgbase}-gtk2"
+package() {
+    cd ${pkgname}-${pkgver}
     make DESTDIR="${pkgdir}" install
 }
-
-package_libmateweather-gtk3() {
-    pkgdesc+=' (GTK3 version)'
-    conflicts=("${pkgbase}")
-    depends=('gtk3' 'libsoup')
-    
-    cd "${srcdir}/${pkgbase}-gtk3"
-    make DESTDIR="${pkgdir}" install
-}