[arch-commits] Commit in quota-tools/trunk (LICENSE PKGBUILD)

[Eric Bélanger]

    Date: Thursday, September 27, 2012 @ 15:22:25
  Author: eric
Revision: 167200

upgpkg: quota-tools 1:4.01-1

Upstream update, Improve license installation

Modified:
  quota-tools/trunk/PKGBUILD
Deleted:
  quota-tools/trunk/LICENSE

----------+
 LICENSE  |   33 ---------------------------------
 PKGBUILD |   13 ++++++-------
 2 files changed, 6 insertions(+), 40 deletions(-)

Deleted: LICENSE
===================================================================
--- LICENSE	2012-09-27 17:38:29 UTC (rev 167199)
+++ LICENSE	2012-09-27 19:22:25 UTC (rev 167200)
@@ -1,33 +0,0 @@
-/*
- * Copyright (c) 1980, 1990 Regents of the University of California. All
- * rights reserved.
- *
- * This code is derived from software contributed to Berkeley by Robert Elz at
- * The University of Melbourne.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are
- * met: 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer. 2.
- * Redistributions in binary form must reproduce the above copyright notice,
- * this list of conditions and the following disclaimer in the documentation
- * and/or other materials provided with the distribution. 3. All advertising
- * materials mentioning features or use of this software must display the
- * following acknowledgement: This product includes software developed by the
- * University of California, Berkeley and its contributors. 4. Neither the
- * name of the University nor the names of its contributors may be used to
- * endorse or promote products derived from this software without specific
- * prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND ANY
- * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE FOR
- * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
- * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
- * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2012-09-27 17:38:29 UTC (rev 167199)
+++ PKGBUILD	2012-09-27 19:22:25 UTC (rev 167200)
@@ -2,7 +2,7 @@
 # Maintainer: Eric Bélanger <eric at archlinux.org>
 
 pkgname=quota-tools
-pkgver=4.00
+pkgver=4.01
 pkgrel=1
 epoch=1
 pkgdesc="Tools to manage kernel-level quotas in Linux"
@@ -12,21 +12,20 @@
 depends=('e2fsprogs')
 backup=('etc/warnquota.conf' 'etc/quotatab' 'etc/quotagrpadmins')
 options=('!emptydirs')
-source=(http://downloads.sourceforge.net/sourceforge/linuxquota/quota-${pkgver}.tar.gz \
-        LICENSE)
-sha1sums=('9ef79933bebfd80f007600fd422616ad161c5fd0'
-          '57297bdc9e638c500506169bbbe12eb89bcf7d07')
+source=(http://downloads.sourceforge.net/sourceforge/linuxquota/quota-${pkgver}.tar.gz)
+sha1sums=('64d2ab8b039cfea1aa4bd9e77e8c373488a7f0bf')
 
 build() {
   cd "${srcdir}/${pkgname}"
   ./configure --prefix=/usr --sysconfdir=/etc
-  make RPCGEN="rpcgen -Y /usr/bin"
+  make
 }
 
 package() {
   cd "${srcdir}/${pkgname}"
   make ROOTDIR="${pkgdir}" install
-  install -D -m644 "${srcdir}/LICENSE" "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
+  install -d "${pkgdir}/usr/share/licenses/${pkgname}"
+  head -33 quota.c > "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
 
 # remove conflicts with glibc
   rm "${pkgdir}"/usr/include/rpcsvc/rquota.{h,x}