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

[Jonathan Steel]

    Date: Monday, January 5, 2015 @ 22:52:00
  Author: jsteel
Revision: 125458

upgpkg: puppet 3.7.3-3

Ruby 2.2 fixes

Modified:
  puppet/trunk/PKGBUILD

----------+
 PKGBUILD |   11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2015-01-05 21:29:55 UTC (rev 125457)
+++ PKGBUILD	2015-01-05 21:52:00 UTC (rev 125458)
@@ -10,7 +10,7 @@
 
 pkgname=puppet
 pkgver=3.7.3
-pkgrel=2
+pkgrel=3
 pkgdesc="Server automation framework and application"
 arch=('any')
 url="http://puppetlabs.com/puppet/puppet-open-source"
@@ -24,6 +24,15 @@
 source=($pkgname-$pkgver.tar.gz::http://github.com/puppetlabs/$pkgname/archive/$pkgver.tar.gz)
 md5sums=('30664a0277c73a0028997d5aae24d38b')
 
+prepare() {
+  cd $pkgname-$pkgver
+
+  # Ruby 2.2 fixes
+  sed -i 's/: "syck"$/: (defined?(Psych) \&\& YAML == Psych ? "psych" : "skcy")/' \
+    lib/puppet/vendor/safe_yaml/lib/safe_yaml.rb
+  sed -i 466,469d lib/puppet/defaults.rb
+}
+
 package() {
   cd $pkgname-$pkgver