Added patches to workaround rmagick 3.0 update

4 files changed, 50 insertions, 4 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 5cf9d37d6f91..981ae4fefedb 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = pdfbeads
 	pkgdesc = A small utility written in Ruby which takes scanned page images and converts them into a single PDF file
 	pkgver = 1.1.2.pre.beta
-	pkgrel = 2
+	pkgrel = 3
 	url = https://github.com/boredland/pdfbeads
 	arch = any
 	license = GPL
@@ -15,7 +15,11 @@ pkgbase = pdfbeads
 	optdepends = ruby-hpricot>=0.8.3: to read data from hOCR files
 	noextract = pdfbeads-1.1.2.pre.beta.gem
 	source = https://github.com/boredland/pdfbeads/releases/download/1.1.2.pre.beta/pdfbeads-1.1.2.pre.beta.gem
+	source = req-rmagick.patch
+	source = spec-rmagick.patch
 	sha256sums = e25dba6e172136f38fa4947a7c017d5f3a2ba5bb548d9e46632e568e7ebf51e9
+	sha256sums = b5fc59a954df14551dfd421f919dcdfea975cdf00605c3619bf6f815550168d3
+	sha256sums = 8d3e81b6781c4d080710cbb2397cec992b0e4ed73e22ee5ce8c18dc3ecd2bc0d
 
 pkgname = pdfbeads
 
diff --git a/PKGBUILD b/PKGBUILD
index a90dd62e44ee..63396ff0349a 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -5,7 +5,7 @@
 
 pkgname=pdfbeads
 pkgver=1.1.2.pre.beta
-pkgrel=2
+pkgrel=3
 pkgdesc="A small utility written in Ruby which takes scanned page images and converts them into a single PDF file"
 arch=('any')
 url='https://github.com/boredland/pdfbeads'
@@ -25,9 +25,13 @@ optdepends=(
 'ruby-hpricot>=0.8.3: to read data from hOCR files'
 )
 
-source=("https://github.com/boredland/pdfbeads/releases/download/$pkgver/$pkgname-$pkgver.gem")
+source=("https://github.com/boredland/pdfbeads/releases/download/$pkgver/$pkgname-$pkgver.gem"
+        "req-rmagick.patch"
+        "spec-rmagick.patch")
 noextract=($pkgname-$pkgver.gem)
-sha256sums=('e25dba6e172136f38fa4947a7c017d5f3a2ba5bb548d9e46632e568e7ebf51e9')
+sha256sums=('e25dba6e172136f38fa4947a7c017d5f3a2ba5bb548d9e46632e568e7ebf51e9'
+            'b5fc59a954df14551dfd421f919dcdfea975cdf00605c3619bf6f815550168d3'
+            '8d3e81b6781c4d080710cbb2397cec992b0e4ed73e22ee5ce8c18dc3ecd2bc0d')
 
 package() {
   local _gemdir="$(ruby -e'puts Gem.default_dir')"
@@ -35,6 +39,12 @@ package() {
     gem install --ignore-dependencies --no-user-install --no-document -i "$pkgdir/$_gemdir" -n "$pkgdir/usr/bin" $pkgname-$pkgver.gem
   rm "$pkgdir/$_gemdir/cache/$pkgname-$pkgver.gem"
   install -D -m644 "$pkgdir/$_gemdir/gems/$pkgname-$pkgver/COPYING" "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
+  
+  cd $pkgdir/$_gemdir/gems/$pkgname-$pkgver
+  patch -p0 -i "${srcdir}/req-rmagick.patch"
+
+  cd $pkgdir/$_gemdir/specifications
+  patch -p0 -i "${srcdir}/spec-rmagick.patch"  
 }
 
 # vim:set ts=2 sw=2 et:
diff --git a/req-rmagick.patch b/req-rmagick.patch
new file mode 100644
index 000000000000..f34333d60fdb
--- /dev/null
+++ b/req-rmagick.patch
@@ -0,0 +1,11 @@
+--- pdfbeads.gemspec
++++ pdfbeads.gemspec
+@@ -27,7 +27,7 @@
+ 
+   s.add_runtime_dependency('nokogiri','~> 1.7')
+   s.add_runtime_dependency('iconv','~> 1.0')
+-  s.add_runtime_dependency('rmagick','~> 2.0')
++  s.add_runtime_dependency('rmagick','>= 2.0')
+ 
+   s.extra_rdoc_files = %w( README COPYING ChangeLog )
+ 
diff --git a/spec-rmagick.patch b/spec-rmagick.patch
new file mode 100644
index 000000000000..d1a96ead5012
--- /dev/null
+++ b/spec-rmagick.patch
@@ -0,0 +1,21 @@
+--- pdfbeads-1.1.2.pre.beta.gemspec
++++ pdfbeads-1.1.2.pre.beta.gemspec
+@@ -26,15 +26,15 @@
+     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
+       s.add_runtime_dependency(%q<nokogiri>.freeze, ["~> 1.7"])
+       s.add_runtime_dependency(%q<iconv>.freeze, ["~> 1.0"])
+-      s.add_runtime_dependency(%q<rmagick>.freeze, ["~> 2.0"])
++      s.add_runtime_dependency(%q<rmagick>.freeze, [">= 2.0"])
+     else
+       s.add_dependency(%q<nokogiri>.freeze, ["~> 1.7"])
+       s.add_dependency(%q<iconv>.freeze, ["~> 1.0"])
+-      s.add_dependency(%q<rmagick>.freeze, ["~> 2.0"])
++      s.add_dependency(%q<rmagick>.freeze, [">= 2.0"])
+     end
+   else
+     s.add_dependency(%q<nokogiri>.freeze, ["~> 1.7"])
+     s.add_dependency(%q<iconv>.freeze, ["~> 1.0"])
+-    s.add_dependency(%q<rmagick>.freeze, ["~> 2.0"])
++    s.add_dependency(%q<rmagick>.freeze, [">= 2.0"])
+   end
+ end