diff options
| author | Thomas Hebb | 2013-06-05 00:34:59 -0400 |
|---|---|---|
| committer | Thomas Hebb | 2015-07-01 13:14:03 -0400 |
| commit | 8aeca054be40be855c01bdfea9e6a07be2a00f1f (patch) | |
| tree | 4fd776e228fba30eaad6bf929695e14fb78ca965 | |
| parent | e9836bb819750b679f397594c10869a55d33502c (diff) | |
| download | aur-8aeca054be40be855c01bdfea9e6a07be2a00f1f.tar.gz | |
Move /usr/sbin files into /usr/bin
| -rw-r--r-- | .SRCINFO | 2 | ||||
| -rw-r--r-- | PKGBUILD | 7 | ||||
| -rw-r--r-- | usr_sbin.patch | 13 |
3 files changed, 20 insertions, 2 deletions
@@ -25,8 +25,10 @@ pkgbase = gutenprint-cvs options = !emptydirs source = http://downloads.sourceforge.net/gimp-print/gutenprint-5.2.9.tar.bz2 source = configure_ac.patch + source = usr_sbin.patch sha256sums = 4b27e4f06f32d30271df89ecb6089bb11bcf2caec5f60b0909e083095354bca0 sha256sums = 041690da1d414e82297fc9bb8a1395cf133e198123c73572c69d932173343768 + sha256sums = a232a39e30986426dc34c39092a4c15ede5bac653765801ccf76b2532136171a pkgname = gutenprint-cvs @@ -17,7 +17,7 @@ optdepends=('cups: to use cups printer spooler(recommended)' 'ghostscript: adds postscript support for ijsgutenprint' 'gimp: adds gutenprint plugin to gimp') source=("http://downloads.sourceforge.net/gimp-print/${_docname}-${_docver}.tar.bz2" - 'configure_ac.patch'); + 'configure_ac.patch' 'usr_sbin.patch'); url='http://gimp-print.sourceforge.net/' provides=('gutenprint') conflicts=('gutenprint') @@ -25,7 +25,8 @@ replaces=('gimp-print') options=('!libtool' '!emptydirs') noextract=("${_docname}-${_docver}.tar.bz2") sha256sums=('4b27e4f06f32d30271df89ecb6089bb11bcf2caec5f60b0909e083095354bca0' - '041690da1d414e82297fc9bb8a1395cf133e198123c73572c69d932173343768') + '041690da1d414e82297fc9bb8a1395cf133e198123c73572c69d932173343768' + 'a232a39e30986426dc34c39092a4c15ede5bac653765801ccf76b2532136171a') _cvsroot=':pserver:anonymous:@gimp-print.cvs.sourceforge.net:/cvsroot/gimp-print' _cvsmod='gimp-print' @@ -50,6 +51,7 @@ prepare() { cd "$srcdir/$_cvsmod-build" patch -Np1 -i "${srcdir}/configure_ac.patch" + patch -Np1 -i "${srcdir}/usr_sbin.patch" # We extract the precompiled documentation from the latest release because there is currently no easy way to run db2html on Arch. tar -xjf "${srcdir}/${_docname}-${_docver}.tar.bz2" --strip-components 1 "${_docname}-${_docver}/doc/developer" } @@ -59,6 +61,7 @@ build() { NOCONFIGURE=1 ./autogen.sh ./configure --prefix=/usr \ + --sbindir=/usr/bin \ --enable-samples \ --enable-cups-ppds \ --enable-cups-ppds-at-top-level \ diff --git a/usr_sbin.patch b/usr_sbin.patch new file mode 100644 index 000000000000..b46cd3ba50b2 --- /dev/null +++ b/usr_sbin.patch @@ -0,0 +1,13 @@ +diff -ru gimp-print/m4/stp_cups.m4 gimp-print.new/m4/stp_cups.m4 +--- gimp-print/m4/stp_cups.m4 2008-08-13 03:35:51.000000000 -0400 ++++ gimp-print.new/m4/stp_cups.m4 2013-06-05 00:22:09.029774489 -0400 +@@ -146,7 +146,7 @@ + if test "${sbindir}" = "\${prefix}/sbin" -a "${cups_prefix}" = "/" ; then + cups_sbindir="/usr/sbin" + else +- cups_sbindir="${cups_prefix}/sbin" ++ cups_sbindir="/usr/bin" + fi + + # Get explicit CUPS directories if possible +Only in gimp-print.new/m4: stp_cups.m4~ |