improve PKGBUILD

2 files changed, 30 insertions, 21 deletions

diff --git a/.SRCINFO b/.SRCINFO
index d08a6490e80b..ce3d1f59f2b4 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,16 +1,17 @@
 pkgbase = ruby-database_cleaner-core
 	pkgdesc = Strategies for cleaning databases. Can be used to ensure a clean slate for testing.
 	pkgver = 2.0.1
-	pkgrel = 1
+	pkgrel = 2
 	url = https://github.com/DatabaseCleaner/database_cleaner
 	arch = any
 	license = MIT
-	makedepends = git
+	makedepends = ruby-bundler
 	makedepends = ruby-rake
+	makedepends = ruby-rspec
 	depends = ruby
 	options = !emptydirs
-	source = ruby-database_cleaner-core-2.0.1::git+https://github.com/DatabaseCleaner/database_cleaner.git#tag=v2.0.1
-	sha512sums = SKIP
+	source = ruby-database_cleaner-core-2.0.1.tar.gz::https://github.com/DatabaseCleaner/database_cleaner/archive/v2.0.1.tar.gz
+	sha512sums = b41d5388c74ccaf9e72f9e6ab6b7cc6ead2706409236b38419d7ef3935b90766e04ad2bfef0ee58a07c0b9051452cab314545cd023853985aac46efaf0922eaa
 
 pkgname = ruby-database_cleaner-core
 
diff --git a/PKGBUILD b/PKGBUILD
index 18974a538902..4d17d1ad93a7 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,39 +1,47 @@
 # Maintainer: Andreas 'Segaja' Schleifer <archlinux at segaja dot de>
 
-_gemname=database_cleaner-core
-pkgname=ruby-$_gemname
+_gemname='database_cleaner-core'
+pkgname="ruby-${_gemname}"
 pkgver=2.0.1
-pkgrel=1
+pkgrel=2
 pkgdesc='Strategies for cleaning databases. Can be used to ensure a clean slate for testing.'
-arch=(any)
-url="https://github.com/DatabaseCleaner/database_cleaner"
-license=(MIT)
+arch=('any')
+url='https://github.com/DatabaseCleaner/database_cleaner'
+license=('MIT')
 options=(!emptydirs)
-depends=(ruby)
-makedepends=(git ruby-rake)
-source=("${pkgname}-${pkgver}::git+${url}.git#tag=v${pkgver}")
-sha512sums=('SKIP')
+depends=('ruby')
+makedepends=('ruby-bundler' 'ruby-rake' 'ruby-rspec')
+source=("${pkgname}-${pkgver}.tar.gz::${url}/archive/v${pkgver}.tar.gz")
+sha512sums=('b41d5388c74ccaf9e72f9e6ab6b7cc6ead2706409236b38419d7ef3935b90766e04ad2bfef0ee58a07c0b9051452cab314545cd023853985aac46efaf0922eaa')
 
 prepare() {
-  cd "${pkgname}-${pkgver}"
+  cd "database_cleaner-${pkgver}"
 
-  sed -r 's|~>|>=|g' -i "${_gemname}.gemspec"
+  # we built based on a tar archive, not a git repo
+  sed --in-place 's/git ls-files -z/find . -print0/' "${_gemname}.gemspec"
+
+  # update gemspec/Gemfile to allow newer version of the dependencies
+  sed --in-place --regexp-extended 's|~>|>=|g' "${_gemname}.gemspec" Gemfile
+
+  # ignore tests for now
+  sed --in-place '/cucumber/Id' Rakefile
 }
 
 build() {
-  cd "${pkgname}-${pkgver}"
+  cd "database_cleaner-${pkgver}"
 
-  gem build "${_gemname}.gemspec"
+  rake build
 }
 
 package() {
-  cd "${pkgname}-${pkgver}"
+  cd "database_cleaner-${pkgver}"
 
   local _gemdir="$(gem env gemdir)"
 
-  gem install --ignore-dependencies --no-user-install -i "${pkgdir}/${_gemdir}" -n "${pkgdir}/usr/bin" ${_gemname}-${pkgver}.gem
+  gem install --ignore-dependencies --no-user-install -i "${pkgdir}/${_gemdir}" -n "${pkgdir}/usr/bin" "pkg/${_gemname}-${pkgver}.gem"
 
   rm "${pkgdir}/${_gemdir}/cache/${_gemname}-${pkgver}.gem"
 
-  install -D -m644 LICENSE "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
+  install -Dm 644 LICENSE "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
+  install -Dm 644 ADAPTERS.md CONTRIBUTE.markdown History.rdoc README.markdown --target-directory "${pkgdir}/usr/share/doc/${pkgname}"
 }