PKGBUILD updated for rc7 changes, systemd files from upstream instead…

… of our own.

puppet3/PKGBUILD

@@ -8,8 +8,10 @@
 # Contributor: Niels Abspoel <aboe76 (at) Gmail (dot) com>
 
 pkgname=puppet3
-pkgver=3.0.0rc5
-pkgrel=1
+_rc=7
+_pkgver=3.0.0
+pkgver=${_pkgver}_rc${_rc}
+pkgrel=2
 pkgdesc="A system for automating system administration tasks."
 arch=("any")
 url="http://puppetlabs.com/projects/puppet/"
@@ -20,31 +22,27 @@ options=(emptydirs)
 provides=("puppet")
 conflicts=("puppet")
 install="puppet.install"
-source=("http://puppetlabs.com/downloads/puppet/puppet-$pkgver.tar.gz"
-        "http://downloads.puppetlabs.com/hiera/hiera-puppet-1.0.0rc3.tar.gz"
-        "http://downloads.puppetlabs.com/hiera/hiera-1.0.0rc4.tar.gz"
-	"http://downloads.puppetlabs.com/hiera/hiera-json-0.4.0.tgz"
-        "fileserver.conf"
-        "puppet"
-        "puppet.conf"
-        "puppetagent.service"
-        "puppetmaster"
-        "puppetmaster.service"
-	"hiera.yaml")
-md5sums=('3d338150c0c232cca09afa4ea5931864'
+source=(http://puppetlabs.com/downloads/puppet/puppet-${pkgver//_/-}.tar.gz
+        http://downloads.puppetlabs.com/hiera/hiera-puppet-1.0.0rc3.tar.gz
+        http://downloads.puppetlabs.com/hiera/hiera-1.0.0rc4.tar.gz
+	http://downloads.puppetlabs.com/hiera/hiera-json-0.4.0.tgz
+        fileserver.conf
+        puppet
+        puppet.conf
+        puppetmaster
+	hiera.yaml)
+md5sums=('5949f8155060ed857eec448e07437e08'
          '6829fb5735e179b90b0491971d9b46a8'
          '175b7dfd864d003b81c8360eec5fc731'
 	 '389be2d95502d41d26da330207a33db3'
          'ffacd9bfb9c7656a3a345dbc5eb0e67a'
          '59dbf39e251bc4877e7604a5876c642d'
          '65e7af811ce18f7c764f2ab5d2876d76'
-         'bbfe0b847f08012cd534d96fe3758b3e'
          '4c507c580cb28d7a5adc9ea6b3626657'
-         '15037c609ec10a6046387c43d1641464'
 	 'c2f380cdcffab3956fe9f6e261d6ea32')
 
 package() {
-  cd $srcdir/puppet-$pkgver
+  cd $srcdir/puppet-${pkgver//_/-}
 
   # Install
   ruby ./install.rb \
@@ -79,8 +77,8 @@ package() {
   ln -snf /etc/hiera.yaml ${pkgdir}/etc/puppet/hiera.yaml
 
   # Systemd files
-  install -Dm 644 $srcdir/puppetagent.service $pkgdir/usr/lib/systemd/system/puppetagent.service
-  install -Dm 644 $srcdir/puppetmaster.service $pkgdir/usr/lib/systemd/system/puppetmaster.service
+  install -Dm 644 $srcdir/puppet-${pkgver//_/-}/ext/systemd/puppetagent.service $pkgdir/usr/lib/systemd/system/puppetagent.service
+  install -Dm 644 $srcdir/puppet-${pkgver//_/-}/ext/systemd/puppetmaster.service $pkgdir/usr/lib/systemd/system/puppetmaster.service
 
   # Create puppet homedir and hieradir
   install -d $pkgdir/var/lib/puppet