[arch-commits] Commit in inetutils/trunk (ChangeLog PKGBUILD)

[Eric Bélanger]

    Date: Thursday, December 9, 2010 @ 17:50:13
  Author: eric
Revision: 102693

upgpkg: inetutils 1.8-2
Cleaned up PKGBUILD, Removed ChangeLog

Modified:
  inetutils/trunk/PKGBUILD
Deleted:
  inetutils/trunk/ChangeLog

-----------+
 ChangeLog |   35 -----------------------------------
 PKGBUILD  |   23 +++++++++++------------
 2 files changed, 11 insertions(+), 47 deletions(-)

Deleted: ChangeLog
===================================================================
--- ChangeLog	2010-12-09 22:18:38 UTC (rev 102692)
+++ ChangeLog	2010-12-09 22:50:13 UTC (rev 102693)
@@ -1,35 +0,0 @@
-2010-05-17  Eric Belanger  <eric at archlinux.org>
-
-	* inetutils 1.8-1
-	* Upstream update
-
-2010-01-27  Eric Belanger  <eric at archlinux.org>
-
-	* inetutils 1.7-2
-	* Fixed localstatedir (close FS#17981)
-
-2009-12-30  Eric Belanger  <eric at archlinux.org>
-
-	* inetutils 1.7-1
-	* Upstream update
-	* Replaced netkit's rexec by the new one from inetutils
-
-2009-01-20  Eric Belanger  <eric at archlinux.org>
-
-	* inetutils 1.6-3
-	* Added a provides/conflicts/replaces to netkit-ntalk (close FS#12865)
-
-2009-01-03  Eric Belanger  <eric at archlinux.org>
-
-	* inetutils 1.6-2
-	* Added patch to fix escape character in telnet
-
-2009-01-02  Eric Belanger  <eric at archlinux.org>
-
-	* inetutils 1.6-1
-	* Upstream update
-
-2008-12-31  Eric Belanger  <eric at archlinux.org>
-
-	* inetutils 1.5-1
-	* Added inetutils to repo (close FS#12281)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2010-12-09 22:18:38 UTC (rev 102692)
+++ PKGBUILD	2010-12-09 22:50:13 UTC (rev 102693)
@@ -1,10 +1,9 @@
 # $Id$
 # Maintainer: Eric Belanger <eric at archlinux.org>
-# Contributor: Eric Belanger <eric at archlinux.org>
 
 pkgname=inetutils
 pkgver=1.8
-pkgrel=1
+pkgrel=2
 pkgdesc="A collection of common network programs"
 arch=('i686' 'x86_64')
 url="http://www.gnu.org/software/inetutils/"
@@ -45,19 +44,19 @@
     --disable-logger --disable-syslogd \
     --disable-inetd --disable-whois \
     --disable-uucpd --disable-hostname \
-    --disable-ifconfig --disable-traceroute || return 1
-  make || return 1
+    --disable-ifconfig --disable-traceroute
+  make
 }
 
 package() {
   cd "${srcdir}/${pkgname}-${pkgver}"
-  make DESTDIR="${pkgdir}" install || return 1
+  make DESTDIR="${pkgdir}" install
 
-  install -D -m755 "${srcdir}/ftpd.rc" "${pkgdir}/etc/rc.d/ftpd" || return 1
-  install -D -m644 "${srcdir}/ftpd.conf" "${pkgdir}/etc/conf.d/ftpd" || return 1
-  install -D -m644 "${srcdir}/telnet.xinetd" "${pkgdir}/etc/xinetd.d/telnet" || return 1
-  install -D -m644 "${srcdir}/talk.xinetd" "${pkgdir}/etc/xinetd.d/talk" || return 1
-  install -D -m644 "${srcdir}/rexec.xinetd" "${pkgdir}/etc/xinetd.d/rexec" || return 1
-  install -D -m644 "${srcdir}/rlogin.xinetd" "${pkgdir}/etc/xinetd.d/rlogin" || return 1
-  install -D -m644 "${srcdir}/rsh.xinetd" "${pkgdir}/etc/xinetd.d/rsh" || return 1
+  install -D -m755 "${srcdir}/ftpd.rc" "${pkgdir}/etc/rc.d/ftpd"
+  install -D -m644 "${srcdir}/ftpd.conf" "${pkgdir}/etc/conf.d/ftpd"
+  install -D -m644 "${srcdir}/telnet.xinetd" "${pkgdir}/etc/xinetd.d/telnet"
+  install -D -m644 "${srcdir}/talk.xinetd" "${pkgdir}/etc/xinetd.d/talk"
+  install -D -m644 "${srcdir}/rexec.xinetd" "${pkgdir}/etc/xinetd.d/rexec"
+  install -D -m644 "${srcdir}/rlogin.xinetd" "${pkgdir}/etc/xinetd.d/rlogin"
+  install -D -m644 "${srcdir}/rsh.xinetd" "${pkgdir}/etc/xinetd.d/rsh"
 }