upgpkg: 0.1.2-7

1 files changed, 27 insertions, 21 deletions

diff --git a/PKGBUILD b/PKGBUILD
index cbc3e1486f9a..f8c4bd91e2d8 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,9 +2,9 @@
 # Contributor: Anatoly Bashmakov <anatoly at posteo dot net>
 
 pkgname=ruby-prawn-templates
-_name=${pkgname#ruby-}
+_pkgname=${pkgname#ruby-}
 pkgver=0.1.2
-pkgrel=6
+pkgrel=7
 pkgdesc="Experimental extraction of template features from Prawn"
 arch=(any)
 url="https://github.com/prawnpdf/prawn-templates"
@@ -24,42 +24,49 @@ checkdepends=(
   ruby-rspec
 )
 options=(!emptydirs)
+source=(
+  "$pkgname-$pkgver.tar.gz::$url/archive/$pkgver.tar.gz"
+  "remove-failing-tests.patch"
+)
+sha256sums=(
+  '116c18d2977db506cadc1e168cbb2ee7fb5d9f9abc9fd25d4a2265f9404c554a'
+  '9c095ca8b0aa4c033e1eda6a2c750386ee2d2b3ed018e97464d2994a003d6395'
+)
 
-source=("$pkgname-$pkgver.tar.gz::$url/archive/$pkgver.tar.gz")
-sha256sums=('116c18d2977db506cadc1e168cbb2ee7fb5d9f9abc9fd25d4a2265f9404c554a')
-
-_archive="$_name-$pkgver"
+_archive="$_pkgname-$pkgver"
 
 prepare() {
   cd "$_archive"
 
   # Update gemspec/Gemfile to allow newer version of the dependencies
-  sed --in-place --regexp-extended 's|~>|>=|g' "$_name.gemspec"
+  sed -i -E 's|~>|>=|g' "$_pkgname.gemspec"
+
+  patch --forward --strip=1 --input="$srcdir/remove-failing-tests.patch"
 }
 
 build() {
   cd "$_archive"
 
-  _gemdir="$(gem env gemdir)"
+  local gemdir="$(gem env gemdir)"
 
-  gem build "$_name.gemspec"
+  gem build "$_pkgname.gemspec"
 
   gem install \
     --local \
     --verbose \
     --ignore-dependencies \
     --no-user-install \
-    --install-dir "tmp_install/$_gemdir" \
+    --install-dir "tmp_install/$gemdir" \
     --bindir "tmp_install/usr/bin" \
-    "$_name-$pkgver.gem"
+    "$_pkgname-$pkgver.gem"
 
   # Remove unrepreducible files
   rm --force --recursive --verbose \
-    "tmp_install/$_gemdir/cache/" \
-    "tmp_install/$_gemdir/gems/$_name-$pkgver/vendor/" \
-    "tmp_install/$_gemdir/doc/$_name-$pkgver/ri/ext/"
+    "tmp_install/$gemdir/cache/" \
+    "tmp_install/$gemdir/gems/$_pkgname-$pkgver/vendor/" \
+    "tmp_install/$gemdir/doc/$_pkgname-$pkgver/ri/ext/"
 
-  find "tmp_install/$_gemdir/gems/" \
+  find "tmp_install/$gemdir/gems/" \
     -type f \
     \( \
     -iname "*.o" -o \
@@ -71,7 +78,7 @@ build() {
     \) \
     -delete
 
-  find "tmp_install/$_gemdir/extensions/" \
+  find "tmp_install/$gemdir/extensions/" \
     -type f \
     \( \
     -iname "mkmf.log" -o \
@@ -84,18 +91,17 @@ check() {
   cd "$_archive"
 
   # Avoid depending on rubocop
-  sed --in-place '/rubocop/d' Rakefile "$_name.gemspec"
+  sed -i '/rubocop/d' Rakefile "$_pkgname.gemspec"
 
-  _gemdir="$(gem env gemdir)"
-  GEM_HOME="tmp_install/$_gemdir" rspec
+  GEM_HOME="tmp_install/$(gem env gemdir)" rspec
 }
 
 package() {
   cd "$_archive"
 
-  cp --archive tmp_install/* "$pkgdir"
+  cp -a -t "$pkgdir" tmp_install/*
 
+  install -Dm644 -t "$pkgdir/usr/share/doc/$pkgname" ./*.md
   install -Dm644 -t "$pkgdir/usr/share/licenses/$pkgname" \
     COPYING LICENSE
-  install -Dm644 -t "$pkgdir/usr/share/doc/$pkgname" ./*.md
 }