Date: Friday, November 4, 2011 @ 19:36:07
Author: allan
Revision: 142073
db-move: moved patch from [testing] to [core] (i686)
Added:
patch/repos/core-i686/PKGBUILD
(from rev 142056, patch/repos/testing-i686/PKGBUILD)
patch/repos/core-i686/patch-2.6.1-get-arg.patch
(from rev 142056, patch/repos/testing-i686/patch-2.6.1-get-arg.patch)
Deleted:
patch/repos/core-i686/PKGBUILD
patch/repos/core-i686/patch-2.6.1-get-arg.patch
patch/repos/testing-i686/
---------------------------+
PKGBUILD | 71 ++++++++++++++++++++++++--------------------
patch-2.6.1-get-arg.patch | 24 +++++++-------
2 files changed, 52 insertions(+), 43 deletions(-)
Deleted: core-i686/PKGBUILD
===================================================================
--- core-i686/PKGBUILD 2011-11-04 23:36:06 UTC (rev 142072)
+++ core-i686/PKGBUILD 2011-11-04 23:36:07 UTC (rev 142073)
@@ -1,31 +0,0 @@
-# $Id$
-# Maintainer: Allan McRae <al...@archlinux.org>
-# Contributor: judd <jvi...@zeroflux.org>
-
-pkgname=patch
-pkgver=2.6.1
-pkgrel=2
-pkgdesc="A utility to apply patch files to original sources"
-arch=('i686' 'x86_64')
-url="http://www.gnu.org/software/patch/patch.html";
-license=('GPL')
-groups=('base-devel')
-depends=('glibc')
-optdepends=('ed: Interpret the patch as an ed script; for patch -e
functionality(deprecated)')
-source=(ftp://ftp.gnu.org/gnu/${pkgname}/${pkgname}-${pkgver}.tar.gz
patch-2.6.1-get-arg.patch)
-md5sums=('d758eb96d3f75047efc004a720d33daf' '45cd5709adbbcdcb3ab95dc43559c07c')
-
-build() {
- cd "${srcdir}/${pkgname}-${pkgver}"
-
- # Fixed argument type for --get
- # see https://bugzilla.redhat.com/show_bug.cgi?id=553624
- patch -Np1 -i ../patch-2.6.1-get-arg.patch
- ./configure --prefix=/usr --mandir=/usr/share/man
- make
-}
-
-package() {
- cd "${srcdir}/${pkgname}-${pkgver}"
- make prefix=${pkgdir}/usr mandir=${pkgdir}/usr/share/man install
-}
Copied: patch/repos/core-i686/PKGBUILD (from rev 142056,
patch/repos/testing-i686/PKGBUILD)
===================================================================
--- core-i686/PKGBUILD (rev 0)
+++ core-i686/PKGBUILD 2011-11-04 23:36:07 UTC (rev 142073)
@@ -0,0 +1,40 @@
+# $Id$
+# Maintainer: Allan McRae <al...@archlinux.org>
+# Contributor: judd <jvi...@zeroflux.org>
+
+pkgname=patch
+pkgver=2.6.1
+pkgrel=3
+pkgdesc="A utility to apply patch files to original sources"
+arch=('i686' 'x86_64')
+url="http://www.gnu.org/software/patch/patch.html";
+license=('GPL')
+groups=('base-devel')
+depends=('glibc')
+makedepends=('ed')
+optdepends=('ed: Interpret the patch as an ed script; for patch -e
functionality(deprecated)')
+source=(ftp://ftp.gnu.org/gnu/${pkgname}/${pkgname}-${pkgver}.tar.gz{,.sig}
+ patch-2.6.1-get-arg.patch)
+md5sums=('d758eb96d3f75047efc004a720d33daf'
+ 'f7953f3e472fae5118815e6138372e22'
+ '45cd5709adbbcdcb3ab95dc43559c07c')
+
+build() {
+ cd ${srcdir}/${pkgname}-${pkgver}
+
+ # Fixed argument type for --get
+ # see https://bugzilla.redhat.com/show_bug.cgi?id=553624
+ patch -Np1 -i $srcdir/patch-2.6.1-get-arg.patch
+ ./configure --prefix=/usr --mandir=/usr/share/man
+ make
+}
+
+check() {
+ cd ${srcdir}/${pkgname}-${pkgver}
+ make check
+}
+
+package() {
+ cd ${srcdir}/${pkgname}-${pkgver}
+ make prefix=${pkgdir}/usr mandir=${pkgdir}/usr/share/man install
+}
Deleted: core-i686/patch-2.6.1-get-arg.patch
===================================================================
--- core-i686/patch-2.6.1-get-arg.patch 2011-11-04 23:36:06 UTC (rev 142072)
+++ core-i686/patch-2.6.1-get-arg.patch 2011-11-04 23:36:07 UTC (rev 142073)
@@ -1,12 +0,0 @@
-diff -up patch-2.6.1/src/patch.c.get-arg patch-2.6.1/src/patch.c
---- patch-2.6.1/src/patch.c.get-arg 2010-07-27 18:05:26.217150510 +0100
-+++ patch-2.6.1/src/patch.c 2010-07-27 18:05:47.464150892 +0100
-@@ -558,7 +558,7 @@ static struct option const longopts[] =
- {"remove-empty-files", no_argument, NULL, 'E'},
- {"force", no_argument, NULL, 'f'},
- {"fuzz", required_argument, NULL, 'F'},
-- {"get", no_argument, NULL, 'g'},
-+ {"get", required_argument, NULL, 'g'},
- {"input", required_argument, NULL, 'i'},
- {"ignore-whitespace", no_argument, NULL, 'l'},
- #ifdef ENABLE_MERGE
Copied: patch/repos/core-i686/patch-2.6.1-get-arg.patch (from rev 142056,
patch/repos/testing-i686/patch-2.6.1-get-arg.patch)
===================================================================
--- core-i686/patch-2.6.1-get-arg.patch (rev 0)
+++ core-i686/patch-2.6.1-get-arg.patch 2011-11-04 23:36:07 UTC (rev 142073)
@@ -0,0 +1,12 @@
+diff -up patch-2.6.1/src/patch.c.get-arg patch-2.6.1/src/patch.c
+--- patch-2.6.1/src/patch.c.get-arg 2010-07-27 18:05:26.217150510 +0100
++++ patch-2.6.1/src/patch.c 2010-07-27 18:05:47.464150892 +0100
+@@ -558,7 +558,7 @@ static struct option const longopts[] =
+ {"remove-empty-files", no_argument, NULL, 'E'},
+ {"force", no_argument, NULL, 'f'},
+ {"fuzz", required_argument, NULL, 'F'},
+- {"get", no_argument, NULL, 'g'},
++ {"get", required_argument, NULL, 'g'},
+ {"input", required_argument, NULL, 'i'},
+ {"ignore-whitespace", no_argument, NULL, 'l'},
+ #ifdef ENABLE_MERGE
