Updated PKGBUILD to include patch fixing compatibility issues with the latest version of its dependencies.

4 files changed, 106 insertions, 20 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 8ed3906320fd..742e1a8be877 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,17 +1,19 @@
 pkgbase = ruby-skinny
-	pkgdesc = Simple, upgradable WebSockets for Thin.
+	pkgdesc = Simple, upgradable Thin WebSockets.
 	pkgver = 0.2.3
-	pkgrel = 1
+	pkgrel = 2
 	url = http://github.com/sj26/skinny
 	arch = any
 	license = MIT
 	makedepends = rubygems
 	depends = ruby
-	provides = skinny
-	conflicts = skinny
+	provides = $_gemname=$pkgver
+	conflicts = $_gemname
 	noextract = skinny-0.2.3.gem
 	source = http://gems.rubyforge.org/gems/skinny-0.2.3.gem
+	source = dependency.patch
 	md5sums = bf45ec49e628b05c88eac37fb9e8e8f1
+	md5sums = 0aac231bc310037862c31d422da3c651
 
 pkgname = ruby-skinny
 
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 000000000000..43316bc3c124
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,27 @@
+# From: https://github.com/github/gitignore/blob/master/ArchLinuxPackages.gitignore
+
+*.tar
+*.tar.*
+*.zip
+*.tgz
+*.log
+*.log.*
+*.sig
+
+# makepkg working folders
+pkg
+src
+
+#
+# Additional ignore patterns:
+#
+
+# Source files
+*.deb
+*.gem
+*.out
+*.rpm
+*.html
+
+# Ignore package source folders
+*/*
diff --git a/PKGBUILD b/PKGBUILD
index 25db49a78744..45cfd1845dfc 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,27 +1,38 @@
-# Maintainer: fzerorubigd <fzerorubigd {AT} gmail>
+# Maintainer: James An <james@jamesan.ca>
+# Contributor: fzerorubigd <fzerorubigd {AT} gmail>
+
 _gemname=skinny
 pkgname=ruby-$_gemname
 pkgver=0.2.3
-pkgrel=1
-pkgdesc="Simple, upgradable WebSockets for Thin."
-arch=(any)
-url="http://github.com/sj26/skinny"
+pkgrel=2
+pkgdesc='Simple, upgradable Thin WebSockets.'
+arch=('any')
+url="http://github.com/sj26/$_gemname"
 license=('MIT')
 depends=('ruby')
 makedepends=('rubygems')
-source=(http://gems.rubyforge.org/gems/$_gemname-$pkgver.gem)
-conflicts=('skinny')
-provides=('skinny')
-noextract=($_gemname-$pkgver.gem)
+provides=('$_gemname=$pkgver')
+conflicts=('$_gemname')
+source=(
+  "http://gems.rubyforge.org/gems/$_gemname-$pkgver.gem"
+  dependency.patch
+)
+noextract=("$_gemname-$pkgver.gem")
+md5sums=('bf45ec49e628b05c88eac37fb9e8e8f1'
+         '0aac231bc310037862c31d422da3c651')
 
-package() {
-  cd "$srcdir"
-  # _gemdir is defined inside package() because if ruby[gems] is not installed on
-  # the system, makepkg will exit with an error when sourcing the PKGBUILD.
-  local _gemdir="$(ruby -rubygems -e'puts Gem.default_dir')"
+prepare() {
+  gem unpack "$_gemname-$pkgver.gem"
+  gem spec "$_gemname-$pkgver.gem" --ruby >| "$_gemname-$pkgver/$_gemname-$pkgver.gemspec"
 
-  gem install --no-user-install --ignore-dependencies -i "$pkgdir$_gemdir" \
+  cd "$_gemname-$pkgver"
+  patch -p1 < ../dependency.patch
+  gem build "$_gemname-$pkgver.gemspec"
+}
+
+package() {
+  cd "$_gemname-$pkgver"
+  gem install --no-user-install --ignore-dependencies -i "$pkgdir$(ruby -rubygems -e'puts Gem.default_dir')" \
     -n "$pkgdir/usr/bin" "$_gemname-$pkgver.gem"
 }
 
-md5sums=('bf45ec49e628b05c88eac37fb9e8e8f1')
\ No newline at end of file
diff --git a/dependency.patch b/dependency.patch
new file mode 100644
index 000000000000..cfba799c755e
--- /dev/null
+++ b/dependency.patch
@@ -0,0 +1,46 @@
+diff --git a/skinny-0.2.3.gemspec b/skinny-0.2.3.gemspec
+index 8995fed..f4525d2 100644
+--- a/skinny-0.2.3.gemspec
++++ b/skinny-0.2.3.gemspec
+@@ -14,6 +14,7 @@ Gem::Specification.new do |s|
+   s.extra_rdoc_files = ["README.md", "LICENSE"]
+   s.files = ["LICENSE", "README.md", "lib/skinny.rb"]
+   s.homepage = "http://github.com/sj26/skinny"
++  s.license = 'MIT'
+   s.required_ruby_version = Gem::Requirement.new(">= 1.8.7")
+   s.rubygems_version = "2.4.5"
+   s.summary = "Thin WebSockets"
+@@ -22,21 +23,21 @@ Gem::Specification.new do |s|
+     s.specification_version = 3
+ 
+     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
+-      s.add_runtime_dependency(%q<eventmachine>, ["~> 1.0.0"])
+-      s.add_runtime_dependency(%q<thin>, ["~> 1.5.0"])
+-      s.add_development_dependency(%q<rake>, [">= 0"])
+-      s.add_development_dependency(%q<rdoc>, [">= 0"])
++      s.add_runtime_dependency(%q<eventmachine>, ["~> 1.0", ">= 1.0.0"])
++      s.add_runtime_dependency(%q<thin>, ["~> 1.5"])
++      s.add_development_dependency(%q<rake>, ["~> 0"])
++      s.add_development_dependency(%q<rdoc>, ["~> 0"])
+     else
+-      s.add_dependency(%q<eventmachine>, ["~> 1.0.0"])
+-      s.add_dependency(%q<thin>, ["~> 1.5.0"])
+-      s.add_dependency(%q<rake>, [">= 0"])
+-      s.add_dependency(%q<rdoc>, [">= 0"])
++      s.add_dependency(%q<eventmachine>, ["~> 1.0", ">= 1.0.0"])
++      s.add_dependency(%q<thin>, ["~> 1.5"])
++      s.add_dependency(%q<rake>, ["~> 0"])
++      s.add_dependency(%q<rdoc>, ["~> 0"])
+     end
+   else
+-    s.add_dependency(%q<eventmachine>, ["~> 1.0.0"])
+-    s.add_dependency(%q<thin>, ["~> 1.5.0"])
+-    s.add_dependency(%q<rake>, [">= 0"])
+-    s.add_dependency(%q<rdoc>, [">= 0"])
++    s.add_dependency(%q<eventmachine>, ["~> 1.0", ">= 1.0.0"])
++    s.add_dependency(%q<thin>, ["~> 1.5"])
++    s.add_dependency(%q<rake>, ["~> 0"])
++    s.add_dependency(%q<rdoc>, ["~> 0"])
+   end
+ end
+