[arch-commits] Commit in dhcp/repos (extra-i686 extra-i686/PKGBUILD)

[Daniel Isenmann]

    Date: Saturday, January 30, 2010 @ 05:26:13
  Author: daniel
Revision: 65481

Merged revisions 65479 via svnmerge from 
svn+ssh://daniel@gerolde.archlinux.org/srv/svn-packages/dhcp/trunk

........
  r65479 | daniel | 2010-01-30 11:18:12 +0100 (Sat, 30 Jan 2010) | 2 lines
  
  upgpkg: dhcp 4.1.0.p1-3
      fix FS#17885 and FS#17904
........

Modified:
  dhcp/repos/extra-i686/	(properties)
  dhcp/repos/extra-i686/PKGBUILD

----------+
 PKGBUILD |    8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)


Property changes on: dhcp/repos/extra-i686
___________________________________________________________________
Modified: svnmerge-integrated
   - /dhcp/trunk:1-63454
   + /dhcp/trunk:1-65480

Modified: extra-i686/PKGBUILD
===================================================================
--- extra-i686/PKGBUILD	2010-01-30 10:18:55 UTC (rev 65480)
+++ extra-i686/PKGBUILD	2010-01-30 10:26:13 UTC (rev 65481)
@@ -6,7 +6,7 @@
 # separate patch levels with a period to maintain proper versioning.
 pkgver=4.1.0.p1
 _pkgver=4.1.0p1
-pkgrel=2
+pkgrel=3
 arch=('i686' 'x86_64')
 license=('custom:isc-dhcp')
 url="https://www.isc.org/software/dhcp"
@@ -64,9 +64,13 @@
   #not needed after fresh install
   rm -f ${pkgdir}/var/lib/dhclient/dhcpd.leases
 
+  #move dhclient.conf to dhclient.conf.example
+  mv ${pkgdir}/etc/dhclient.conf ${pkgdir}/etc/dhclient.conf.example
+
   # install dhclient linux script
+  mkdir ${pkgdir}/sbin
   install -m755 -D ${srcdir}/${pkgname}-${_pkgver}/client/scripts/linux \
-                   ${pkgdir}/etc/dhclient-script
+                   ${pkgdir}/sbin/dhclient-script
   # install licenses
   install -m644 -D ${srcdir}/${pkgname}-${_pkgver}/LICENSE \
                    ${pkgdir}/usr/share/licenses/dhclient/LICENSE