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

Jonathan Steel jsteel at archlinux.org
Mon Jan 5 22:33:24 UTC 2015


    Date: Monday, January 5, 2015 @ 23:33:23
  Author: jsteel
Revision: 125460

upgpkg: puppet 3.7.3-4

Typo in sed command

Modified:
  puppet/trunk/PKGBUILD

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

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2015-01-05 21:52:14 UTC (rev 125459)
+++ PKGBUILD	2015-01-05 22:33:23 UTC (rev 125460)
@@ -10,7 +10,7 @@
 
 pkgname=puppet
 pkgver=3.7.3
-pkgrel=3
+pkgrel=4
 pkgdesc="Server automation framework and application"
 arch=('any')
 url="http://puppetlabs.com/puppet/puppet-open-source"
@@ -28,7 +28,7 @@
   cd $pkgname-$pkgver
 
   # Ruby 2.2 fixes
-  sed -i 's/: "syck"$/: (defined?(Psych) \&\& YAML == Psych ? "psych" : "skcy")/' \
+  sed -i 's/: "syck"$/: (defined?(Psych) \&\& YAML == Psych ? "psych" : "syck")/' \
     lib/puppet/vendor/safe_yaml/lib/safe_yaml.rb
   sed -i 466,469d lib/puppet/defaults.rb
 }
@@ -36,7 +36,7 @@
 package() {
   cd $pkgname-$pkgver
 
-  ruby install.rb --destdir="$pkgdir"/ --sitelibdir="$( ruby -e \
+  ruby install.rb --destdir="$pkgdir" --sitelibdir="$( ruby -e \
     'puts RbConfig::CONFIG["vendorlibdir"]' )"
 
   install -Dm644 "$srcdir"/$pkgname-$pkgver/ext/redhat/$pkgname.conf \
@@ -48,7 +48,7 @@
   install -Dm644 "$srcdir"/$pkgname-$pkgver/conf/tagmail.conf \
     "$pkgdir"/etc/$pkgname/tagmail.conf
 
-  install -d "$pkgdir"/{var/lib/$pkgname,usr/lib/tmpfiles.d}/
+  install -d "$pkgdir"/{var/lib/$pkgname,usr/lib/tmpfiles.d}
 
   echo "d /var/run/$pkgname 0755 $pkgname $pkgname -" > \
     "$pkgdir"/usr/lib/tmpfiles.d/$pkgname.conf



More information about the arch-commits mailing list