[arch-commits] Commit in puppet/trunk (PKGBUILD puppet.install)

[Jonathan Steel]

    Date: Monday, April 20, 2015 @ 18:49:35
  Author: jsteel
Revision: 131753

upgpkg: puppet 4.0.0-2

Modified:
  puppet/trunk/PKGBUILD
  puppet/trunk/puppet.install

----------------+
 PKGBUILD       |   14 ++++++--------
 puppet.install |    2 +-
 2 files changed, 7 insertions(+), 9 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2015-04-20 15:14:13 UTC (rev 131752)
+++ PKGBUILD	2015-04-20 16:49:35 UTC (rev 131753)
@@ -10,18 +10,16 @@
 
 pkgname=puppet
 pkgver=4.0.0
-pkgrel=1
+pkgrel=2
 pkgdesc="Server automation framework and application"
 arch=('any')
 url="http://puppetlabs.com/puppet/puppet-open-source"
-license=('APACHE')
+license=('Apache')
 depends=('facter' 'hiera')
-optdepends=('ruby-shadow: user password management'
-            'logrotate')
+optdepends=('ruby-shadow: user password management')
 backup=('etc/puppetlabs/puppet/auth.conf'
         'etc/puppetlabs/puppet/fileserver.conf'
-        'etc/puppetlabs/puppet/puppet.conf'
-        'etc/logrotate.d/puppet')
+        'etc/puppetlabs/puppet/puppet.conf')
 install=$pkgname.install
 source=($pkgname-$pkgver.tar.gz::http://github.com/puppetlabs/$pkgname/archive/$pkgver.tar.gz)
 md5sums=('fe40c3d9a9845155df083c411f39d943')
@@ -32,8 +30,6 @@
   ruby install.rb --destdir="$pkgdir" --sitelibdir="$( ruby -e \
     'puts RbConfig::CONFIG["vendorlibdir"]' )" --rundir=/run
 
-  install -Dm644 "$srcdir"/$pkgname-$pkgver/ext/redhat/logrotate \
-    "$pkgdir"/etc/logrotate.d/$pkgname
   install -Dm644 "$srcdir"/$pkgname-$pkgver/conf/fileserver.conf \
     "$pkgdir"/etc/puppetlabs/$pkgname/fileserver.conf
 
@@ -42,6 +38,8 @@
   echo "d /run/puppetlabs 0755 $pkgname $pkgname -" > \
     "$pkgdir"/usr/lib/tmpfiles.d/$pkgname.conf
 
+  chmod 750 "$pkgdir"/var/log/puppetlabs/puppet
+
   # systemd
   install -Dm644 "$srcdir"/$pkgname-$pkgver/ext/systemd/$pkgname.service \
     "$pkgdir"/usr/lib/systemd/system/$pkgname.service

Modified: puppet.install
===================================================================
--- puppet.install	2015-04-20 15:14:13 UTC (rev 131752)
+++ puppet.install	2015-04-20 16:49:35 UTC (rev 131753)
@@ -8,7 +8,7 @@
   pre_install
 
   if  [ "$(vercmp 4 "$2")" -eq 1 ]; then
-    echo '==> Version 4 beaks compatibility with version 3; you will need
+    echo '==> Version 4 breaks compatibility with version 3; you will need
 ==> to follow upgrade instructions for your servers and clients:
 ==> https://docs.puppetlabs.com/puppet/4.0/reference/upgrade_server.html
 ==> https://docs.puppetlabs.com/puppet/4.0/reference/upgrade_agent.html'