upgpkg: ruby-rotp 6.3.0-1

upstream release

2 files changed, 57 insertions, 15 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 1ce39dd495cf..684d88605e03 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = ruby-rotp
 	pkgdesc = Ruby One Time Password library
-	pkgver = 6.2.2
+	pkgver = 6.3.0
 	pkgrel = 1
 	url = https://github.com/mdp/rotp
 	arch = any
@@ -13,7 +13,7 @@ pkgbase = ruby-rotp
 	makedepends = ruby-rdoc
 	depends = ruby
 	options = !emptydirs
-	source = https://github.com/mdp/rotp/archive/v6.2.2.tar.gz
-	sha256sums = b48fd3f8a782f042783f2fab449b59cd246a97ac02de8ed89c2b77963e23b7cd
+	source = https://github.com/mdp/rotp/archive/v6.3.0.tar.gz
+	sha256sums = 03e8a733af98d5c25c34a4043f22925bc9ab1734ffe9bc3bf44c4577ad0e2a71
 
 pkgname = ruby-rotp
diff --git a/PKGBUILD b/PKGBUILD
index 07b607ad8ab1..02164051e883 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -4,7 +4,7 @@
 
 _gemname=rotp
 pkgname=ruby-$_gemname
-pkgver=6.2.2
+pkgver=6.3.0
 pkgrel=1
 pkgdesc="Ruby One Time Password library"
 arch=(any)
@@ -15,37 +15,79 @@ depends=(ruby)
 checkdepends=(ruby-rake ruby-rspec ruby-simplecov ruby-timecop)
 makedepends=(rubygems ruby-rdoc)
 source=(${url}/archive/v${pkgver}.tar.gz)
-sha256sums=('b48fd3f8a782f042783f2fab449b59cd246a97ac02de8ed89c2b77963e23b7cd')
+sha256sums=('03e8a733af98d5c25c34a4043f22925bc9ab1734ffe9bc3bf44c4577ad0e2a71')
 
 prepare() {
   cd $_gemname-$pkgver
   sed -i 's/git ls-files --/find/' ${_gemname}.gemspec
   sed -i 's/git ls-files/find/' ${_gemname}.gemspec
+
+  # 1) ROTP::HOTP#provisioning_uri with non-standard provisioning_params includes the issuer as parameter
+  #    Failure/Error: let(:params) { CGI.parse URI.parse(uri).query }
+  #
+  #    NameError:
+  #      uninitialized constant URI
+  #    # ./spec/lib/rotp/hotp_spec.rb:112:in `block (3 levels) in <top (required)>'
+  #    # ./spec/lib/rotp/hotp_spec.rb:134:in `block (4 levels) in <top (required)>'
+  echo 'require "uri"' >> spec/spec_helper.rb
 }
 
 build() {
   cd $_gemname-$pkgver
-  gem build ${_gemname}.gemspec
+  local _gemdir="$(gem env gemdir)"
+
+  gem build "${_gemname}.gemspec"
+
+  gem install \
+    --local \
+    --verbose \
+    --ignore-dependencies \
+    --no-user-install \
+    --install-dir "tmp_install/${_gemdir}" \
+    --bindir "tmp_install/usr/bin" \
+    "${_gemname}-${pkgver}.gem"
+
+  # remove unrepreducible files
+  rm --force --recursive --verbose \
+    "tmp_install/${_gemdir}/cache/" \
+    "tmp_install/${_gemdir}/gems/${_gemname}-${pkgver}/vendor/" \
+    "tmp_install/${_gemdir}/doc/${_gemname}-${pkgver}/ri/ext/"
+
+  find "tmp_install/${_gemdir}/gems/" \
+    -type f \
+    \( \
+      -iname "*.o" -o \
+      -iname "*.c" -o \
+      -iname "*.so" -o \
+      -iname "*.time" -o \
+      -iname "gem.build_complete" -o \
+      -iname "Makefile" \
+    \) \
+    -delete
+
+  find "tmp_install/${_gemdir}/extensions/" \
+    -type f \
+    \( \
+      -iname "mkmf.log" -o \
+      -iname "gem_make.out" \
+    \) \
+    -delete
 }
 
 check() {
   cd $_gemname-$pkgver
-  rspec
+  local _gemdir="$(gem env gemdir)"
+  GEM_HOME="tmp_install/${_gemdir}" rspec
 }
 
 package() {
   cd $_gemname-$pkgver
   local _gemdir="$(gem env gemdir)"
 
-  gem install \
-    --ignore-dependencies \
-    --no-user-install \
-    -i "$pkgdir/$_gemdir" \
-    -n "$pkgdir/usr/bin" \
-    $_gemname-$pkgver.gem
-
-  rm -rf "$pkgdir/$_gemdir/cache"
+  cp --archive --verbose tmp_install/* "${pkgdir}"
 
   install -Dm0644 LICENSE "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
   install -Dm0644 README.md "$pkgdir/usr/share/doc/$pkgname/README.md"
 }
+
+# vim: set ts=2 sw=2 et: