diff options
| -rw-r--r-- | .SRCINFO | 6 | ||||
| -rw-r--r-- | PKGBUILD | 16 | ||||
| -rw-r--r-- | gettext-version.patch | 12 |
3 files changed, 6 insertions, 28 deletions
@@ -1,6 +1,6 @@ pkgbase = cpio-git pkgdesc = Utility that copy files into or out of a cpio or tar archive - pkgver = 2.13.r19.g18ea636 + pkgver = 2.14.r0.g4a41909 pkgrel = 1 url = https://www.gnu.org/software/cpio/ arch = i686 @@ -9,11 +9,9 @@ pkgbase = cpio-git makedepends = git makedepends = rsync depends = glibc - provides = cpio=2.13.r19.g18ea636 + provides = cpio=2.14.r0.g4a41909 conflicts = cpio source = git+https://git.savannah.gnu.org/git/cpio.git - source = gettext-version.patch sha256sums = SKIP - sha256sums = 90ed0528fcc541ab83b3d9c97522bf7b8196a2da8dd60278656158806ee23599 pkgname = cpio-git @@ -1,7 +1,7 @@ # Maintainer: Chocobo1 <chocobo1 AT archlinux DOT net> pkgname=cpio-git -pkgver=2.13.r19.g18ea636 +pkgver=2.14.r0.g4a41909 pkgrel=1 pkgdesc="Utility that copy files into or out of a cpio or tar archive" arch=('i686' 'x86_64') @@ -11,22 +11,14 @@ depends=('glibc') makedepends=('git' 'rsync') provides=("cpio=$pkgver") conflicts=('cpio') -source=("git+https://git.savannah.gnu.org/git/cpio.git" - "gettext-version.patch") -sha256sums=('SKIP' - '90ed0528fcc541ab83b3d9c97522bf7b8196a2da8dd60278656158806ee23599') +source=("git+https://git.savannah.gnu.org/git/cpio.git") +sha256sums=('SKIP') -prepare() { - cd "cpio" - - patch -Np1 -i "$srcdir/gettext-version.patch" -} - pkgver() { cd "cpio" - git describe --long --tags | sed 's/^release_//;s/\([^-]*-g\)/r\1/;s/-/./g;s/_/./g' + git describe --long --tags | sed 's/^v//;s/\([^-]*-g\)/r\1/;s/-/./g;s/_/./g' } build() { diff --git a/gettext-version.patch b/gettext-version.patch deleted file mode 100644 index d161e2695735..000000000000 --- a/gettext-version.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff --git a/configure.ac b/configure.ac -index 0a35e4c..6c587a0 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -84,7 +84,7 @@ AC_CHECK_DECLS([errno, getpwnam, getgrnam, getgrgid, strdup, strerror, getenv, a - # Gettext. - AM_ICONV - AM_GNU_GETTEXT([external], [need-formatstring-macros]) --AM_GNU_GETTEXT_VERSION(0.19) -+AM_GNU_GETTEXT_VERSION(0.20) - - LIBS="$LIBS $LIB_CLOCK_GETTIME" |