Permalink
Browse files

Split Package and depend on what's already in AUR

- ruby-hiera already in aur
- ruby-hiera-json already in aur

Updated provides:
- package puppet (ofcourse)
- package vim-puppet (we ship vim files)
- package ruby-hiera-puppet (no need puppet3 provides ruby-hiera-puppet)

Updated conflicts:
with corresponding packages from above.
  • Loading branch information...
1 parent a7d2ba2 commit d3057f7fefd6c54ebbb0ed2d059c37ef19c7f48f @aboe76 aboe76 committed with Nov 17, 2012
Showing with 6 additions and 52 deletions.
  1. +6 −26 puppet/PKGBUILD
  2. +0 −26 puppet/hiera.yaml
View
@@ -15,37 +15,27 @@
pkgname=puppet
pkgver=3.0.1
-pkgrel=3
-_hieraver=1.1.1
+pkgrel=4
pkgdesc="A system for automating system administration tasks."
arch=("any")
url="http://puppetlabs.com/projects/puppet/"
license=("APACHE")
-depends=("ruby" "ruby-shadow" "facter")
-optdepends=("ruby-augeas")
+depends=("ruby" "ruby-shadow" "facter" "ruby-hiera" "ruby-hiera-json")
backup=("etc/puppet/puppet.conf")
options=(emptydirs)
-provides=("puppet")
-conflicts=("puppet3")
+provides=("puppet" "vim-puppet" "ruby-hiera-puppet")
+conflicts=("puppet3" "ruby-puppet" "vim-puppet" "ruby-hiera-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-${_hieraver}.tar.gz
- http://downloads.puppetlabs.com/hiera/hiera-json-0.4.0.tgz
fileserver.conf
puppet
puppet.conf
- puppetmaster
- hiera.yaml)
+ puppetmaster)
md5sums=('2117e3a1964ac54fcd36d926eed3db94'
- '6829fb5735e179b90b0491971d9b46a8'
- '20f485d09d5ab39e6d4e4f27e0dd97af'
- '389be2d95502d41d26da330207a33db3'
'ffacd9bfb9c7656a3a345dbc5eb0e67a'
'59dbf39e251bc4877e7604a5876c642d'
'a7d61d20e46b411eb50ad5279987584a'
- '4c507c580cb28d7a5adc9ea6b3626657'
- 'c2f380cdcffab3956fe9f6e261d6ea32')
+ '4c507c580cb28d7a5adc9ea6b3626657')
package() {
cd $srcdir/puppet-${pkgver//_/-}
@@ -57,15 +47,6 @@ package() {
--sbindir=/usr/sbin \
--mandir=/usr/share/man
- # Hiera is essential for Puppet3
- install -d $pkgdir/usr/lib/ruby/site_ruby/1.9.1/lib/
- cp -r $srcdir/hiera-${_hieraver}/lib/* $pkgdir/usr/lib/ruby/site_ruby/1.9.1/
- cp -r $srcdir/hiera-json-0.4.0/lib/* $pkgdir/usr/lib/ruby/site_ruby/1.9.1/
- cp -r $srcdir/hiera-json-0.4.0/spec* $pkgdir/usr/lib/ruby/site_ruby/1.9.1/hiera/backend/
- cp -r $srcdir/hiera-puppet-1.0.0rc3/lib/* $pkgdir/usr/lib/ruby/site_ruby/1.9.1/
- install -d $pkgdir/usr/bin/
- install -Dp -m0755 $srcdir/hiera-${_hieraver}/bin/* $pkgdir/usr/bin/
- install -Dp -m0755 $srcdir/hiera-puppet-1.0.0rc3/bin/* $pkgdir/usr/bin/
# Set up vim and emacs
install -Dp -m0644 ext/vim/ftdetect/puppet.vim $pkgdir/usr/share/vim/vimfiles/ftdetect/puppet.vim
@@ -83,7 +64,6 @@ package() {
echo "D /var/run/puppet 0755 puppet puppet -" > $pkgdir/etc/tmpfiles.d/puppet.conf
# Configuration for hiera / symlink is there to use hiera within puppet.
- install -m 644 $srcdir/hiera.yaml $pkgdir/etc/
ln -snf /etc/hiera.yaml ${pkgdir}/etc/puppet/hiera.yaml
# Systemd files
View
@@ -1,26 +0,0 @@
----
-:backend:
- - yaml
- - json
- - puppet
-
-:hierarchy:
- - defaults
- - global
-
-:yaml:
-# datadir is empty here, so hiera uses its defaults:
-# - /var/lib/hiera on *nix
-# - %CommonAppData%\PuppetLabs\hiera\var on Windows
-# When specifying a datadir, make sure the directory exists.
- :datadir:
-
-:json:
-# datadir is empty here, so hiera uses its defaults:
-# - /var/lib/hiera on *nix
-# - %CommonAppData%\PuppetLabs\hiera\var on Windows
-# When specifying a datadir, make sure the directory exists.
- :datadir:
-
-:puppet:
- :datasource: data

0 comments on commit d3057f7

Please sign in to comment.