summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorNicolas Iooss2016-05-27 23:36:21 +0200
committerNicolas Iooss2016-05-27 23:36:21 +0200
commite6a7c4442b99b5229f8e78dfeef977c82e84a87c (patch)
tree62b68faa49f5068b7fde4d07d91e6aa17df37621
parentb1864aa62554a1ffbc0da4d7feed90f6fc8ea5c0 (diff)
downloadaur-e6a7c4442b99b5229f8e78dfeef977c82e84a87c.tar.gz
coreutils-selinux 8.25-2 update
-rw-r--r--.SRCINFO9
-rw-r--r--PKGBUILD17
-rw-r--r--coreutils.install17
3 files changed, 13 insertions, 30 deletions
diff --git a/.SRCINFO b/.SRCINFO
index c942e4a6b0cd..7c92dafe1eae 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,11 +1,8 @@
-# Generated by makepkg 5.0.0
-# Fri Feb 12 13:04:29 UTC 2016
pkgbase = coreutils-selinux
pkgdesc = The basic file, shell and text manipulation utilities of the GNU operating system with SELinux support
pkgver = 8.25
- pkgrel = 1
+ pkgrel = 2
url = http://www.gnu.org/software/coreutils
- install = coreutils.install
arch = i686
arch = x86_64
groups = selinux
@@ -17,8 +14,8 @@ pkgbase = coreutils-selinux
depends = libcap
depends = openssl
depends = libselinux
- provides = coreutils=8.25-1
- provides = selinux-coreutils=8.25-1
+ provides = coreutils=8.25-2
+ provides = selinux-coreutils=8.25-2
conflicts = coreutils
conflicts = selinux-coreutils
source = ftp://ftp.gnu.org/gnu/coreutils/coreutils-8.25.tar.xz
diff --git a/PKGBUILD b/PKGBUILD
index 81d5ca9d1faa..7e5521dd2dc7 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -9,14 +9,13 @@
pkgname=coreutils-selinux
pkgver=8.25
-pkgrel=1
+pkgrel=2
pkgdesc='The basic file, shell and text manipulation utilities of the GNU operating system with SELinux support'
arch=('i686' 'x86_64')
license=('GPL3')
url='http://www.gnu.org/software/coreutils'
groups=('selinux')
depends=('glibc' 'acl' 'attr' 'gmp' 'libcap' 'openssl' 'libselinux')
-install=${pkgname/-selinux}.install
conflicts=("${pkgname/-selinux}" "selinux-${pkgname/-selinux}")
provides=("${pkgname/-selinux}=${pkgver}-${pkgrel}"
"selinux-${pkgname/-selinux}=${pkgver}-${pkgrel}")
@@ -28,12 +27,16 @@ md5sums=('070e43ba7f618d747414ef56ab248a48'
'ab90c6ba801e06bcc11cf79a3f6168f6')
prepare() {
- local _p
- for _p in *.patch; do
- [[ -e $_p ]] || continue
- msg2 "Applying $_p"
- patch -p1 -d ${pkgname/-selinux}-$pkgver < "$_p"
+ cd ${pkgname/-selinux}-$pkgver
+ # apply patch from the source array (should be a pacman feature)
+ local filename
+ for filename in "${source[@]}"; do
+ if [[ "$filename" =~ \.patch$ ]]; then
+ msg2 "Applying patch $filename"
+ patch -p1 -N -i "$srcdir/$filename"
+ fi
done
+ :
}
build() {
diff --git a/coreutils.install b/coreutils.install
deleted file mode 100644
index 22cfcb2a113d..000000000000
--- a/coreutils.install
+++ /dev/null
@@ -1,17 +0,0 @@
-infodir=usr/share/info
-file=coreutils.info
-
-post_install() {
- [[ -x usr/bin/install-info ]] || return 0
- install-info $infodir/$file.gz $infodir/dir 2> /dev/null
-}
-
-post_upgrade() {
- post_install $1
-}
-
-pre_remove() {
- [[ -x usr/bin/install-info ]] || return 0
- install-info --delete $infodir/$file.gz $infodir/dir 2> /dev/null
-}
-