From: Paul Bredbury <brebs@sent.com>
To: alpine-aports@lists.alpinelinux.org
Cc: Paul Bredbury <brebs@sent.com>
Subject: [alpine-aports] [PATCH 15/16] community/caja: upgrade to 1.22.1
Date: Sun, 16 Jun 2019 10:34:31 +0100
Message-Id: <20190616093432.20377-15-brebs@sent.com>
In-Reply-To: <20190616093432.20377-1-brebs@sent.com>
References: <20190616093432.20377-1-brebs@sent.com>
Precedence: list
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit

Add check().

Remove patch, is applied upstream.

Remove unnecessary "cd" commands.
---
 community/caja/APKBUILD         | 15 +++++++--------
 community/caja/install-sh.patch | 10 ----------
 2 files changed, 7 insertions(+), 18 deletions(-)
 delete mode 100644 community/caja/install-sh.patch

diff --git a/community/caja/APKBUILD b/community/caja/APKBUILD
index f57663a7cd..9156bb1bc2 100644
--- a/community/caja/APKBUILD
+++ b/community/caja/APKBUILD
@@ -1,24 +1,21 @@
 # Contributor: Alan Lacerda <alacerda@alpinelinux.org>
 # Maintainer: Alan Lacerda <alacerda@alpinelinux.org>
 pkgname=caja
-pkgver=1.22.0
+pkgver=1.22.1
 pkgrel=0
 pkgdesc="The file manager for the MATE desktop"
 url="https://github.com/mate-desktop/caja"
 arch="all"
 license="GPL-2.0-or-later LGPL-2.0-or-later"
 depends="mate-common mate-desktop"
-options="!check"
 makedepends="$depends_dev intltool libtool dconf-dev gtk+3.0-dev libunique3-dev
 	libsm-dev libnotify-dev mate-desktop-dev libxml2-dev gobject-introspection-dev
 	gtk-doc"
 subpackages="$pkgname-dev $pkgname-doc $pkgname-lang"
-source="https://pub.mate-desktop.org/releases/${pkgver%.*}/$pkgname-$pkgver.tar.xz
-	install-sh.patch"
+source="https://pub.mate-desktop.org/releases/${pkgver%.*}/$pkgname-$pkgver.tar.xz"
 builddir="$srcdir/$pkgname-$pkgver"
 
 build() {
-	cd "$builddir"
 	./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
@@ -29,10 +26,12 @@ build() {
 	make
 }
 
+check() {
+	make check
+}
+
 package() {
-	cd "$builddir"
 	make DESTDIR="${pkgdir}" install
 }
 
-sha512sums="ca97a1e81cc7b061bb331d7a4574c76831dbff50bdc9ba0a162675def7278cf5dadb37aacb0e1e37a0ac2cf60df73f98353aaa36fa0e69a0097017eed5d325b6  caja-1.22.0.tar.xz
-2220612dcda2f992ce6e7d8225c3d012497ff297921c24d40853553783c6b0f95c8e25ab0ad3454931e6e104a9951892972c045e4b9e2672cbbe34cd5a0936f3  install-sh.patch"
+sha512sums="dea2e9cac7802df5335a716a1a7df149b637014525202600f4bf3eab293eff29bf2df66df22203aa036898149cb26ba1d05491234dc75203480925cce0333a17  caja-1.22.1.tar.xz"
diff --git a/community/caja/install-sh.patch b/community/caja/install-sh.patch
deleted file mode 100644
index d32f681c0e..0000000000
--- a/community/caja/install-sh.patch
+++ /dev/null
@@ -1,10 +0,0 @@
-diff --git a/install-sh b/install-sh
-index defb86a..8175c64 100755
---- a/install-sh
-+++ b/install-sh
-@@ -1,4 +1,4 @@
--#!/usr/bin/sh
-+#!/bin/sh
- # install - install a program, script, or datafile
- 
- scriptversion=2018-03-11.20; # UTC
-- 
2.22.0



---
Unsubscribe:  alpine-aports+unsubscribe@lists.alpinelinux.org
Help:         alpine-aports+help@lists.alpinelinux.org
---