diff options
| author | Markus M. May <triplem@javafreedom.org> | 2015-11-05 22:59:15 +0100 |
|---|---|---|
| committer | Natanael Copa <ncopa@alpinelinux.org> | 2015-11-10 07:28:14 +0000 |
| commit | 829029d141b6a679da5351df62d035e891dc1715 (patch) | |
| tree | 27f7bac595d334127b0d1a11e69e06bf5bec3c46 | |
| parent | 32ee0cac6f4533794de8b6a9dc12d8962f806ba8 (diff) | |
| download | aports-829029d141b6a679da5351df62d035e891dc1715.tar.bz2 aports-829029d141b6a679da5351df62d035e891dc1715.tar.xz | |
version bump redmine
| -rw-r--r-- | main/redmine/APKBUILD | 21 | ||||
| -rw-r--r-- | main/redmine/gemfile.patch | 17 |
2 files changed, 15 insertions, 23 deletions
diff --git a/main/redmine/APKBUILD b/main/redmine/APKBUILD index d156ad6284..7cc4f15348 100644 --- a/main/redmine/APKBUILD +++ b/main/redmine/APKBUILD @@ -1,9 +1,10 @@ +# Contributor: Markus M. May <triplem@javafreedom.org> # Contributor: Carlo Landmeter <clandmeter@gmail.com> # Maintainer: Natanael Copa <ncopa@alpinelinux.org> _railsver=4.2 pkgname=redmine -pkgver=3.0.1 -pkgrel=5 +pkgver=3.0.5 +pkgrel=0 pkgdesc="Project management web application written in Ruby" url="http://redmine.org" arch="noarch" @@ -25,12 +26,12 @@ depends="ruby ruby-rails${_railsver} ruby-rbpdf ruby-rdoc - ruby-redcarpet<3.2 + ruby-redcarpet ruby-request_store ruby-rmagick ruby-protected_attributes${_railsver} " -depends_dev= +depends_dev=ruby-io-console makedepends="$depends_dev" install="$pkgname.pre-install $pkgname.post-install" subpackages="" @@ -98,12 +99,12 @@ package() { mv * "$pkgdir/$_webapps/$pkgname" || return 1 } -md5sums="bf63ceef4fde0d38d17d94969478d422 redmine-3.0.1.tar.gz -2e8ee0e7dff0a8e558660a585e456c17 gemfile.patch +md5sums="c3ef69ee258239a53cd69ddc6a99754a redmine-3.0.5.tar.gz +a80146b41b912f248140e616154073f6 gemfile.patch d834bef9b5f01484f1e0ee82676f4109 database.yml.patch" -sha256sums="9b701ff471bf1d9c9fd671e6a3d3c426850df5411a73f891f49c2cd79d489d5a redmine-3.0.1.tar.gz -cdf1dc2357d161b3109ce99dea7964085b4fae9ba88cb8fce1f592f3508ee0f3 gemfile.patch +sha256sums="32b80317b366439be7125a0e3359349fbbe7c7e906c90f3fa08228f03091d74c redmine-3.0.5.tar.gz +d9d94fcb696aed05b308114c0b053f878918e3d2dbd12e5ee0b46c041bd18bcd gemfile.patch 28b1ec099ae87c43d00d7e997edabaece01d6fc2e67b46c50735e9a1bb72f130 database.yml.patch" -sha512sums="689e8625197b4668bc06c68b0502a23e50675ad13d17a67a25cb51d68b1ac15ff4395783003ce696994bd15191139adde6bc21add0b81b4a40e9979e95753e18 redmine-3.0.1.tar.gz -6a32297e96dc3a986d51d1b9267cb2b401c2eda0f5a45381c2c424c625604de37b6c0060fc70a92c4ca87e533f9dade4c4e4fbd19f9390e5170fc4f0ecb81cbf gemfile.patch +sha512sums="9119029b4949bf821d1d5e8aa2177eecf1caee6a7493af77f8cb100b54b81a29b1561ae5ce509a1bdf3c219a8935600a462765c149cff121fc26a91a842d44b1 redmine-3.0.5.tar.gz +9f3be9039f9c576b56d77e3e3f477fe16fdd5d0f8b8b1bb3722cad1aff669f2ee65c308d27ec8c25300b4a3991b65fcf9d4d127abd0542477f1dd8f5af82d7ee gemfile.patch 1b5880979f050a71d726c844369cc5340a8d4aa0b59b2301e1d32dea28f70ca2a85e619c8b845c37de08772154eef13fa63716c1beaaa50d97b80fd65c297bf9 database.yml.patch" diff --git a/main/redmine/gemfile.patch b/main/redmine/gemfile.patch index 9b4fb9a91f..ed86389c1c 100644 --- a/main/redmine/gemfile.patch +++ b/main/redmine/gemfile.patch @@ -1,22 +1,16 @@ -bundler cannot exclude the test and development groups so we patch those out --- ./Gemfile.orig +++ ./Gemfile -@@ -4,11 +4,11 @@ - abort "Redmine requires Bundler 1.5.0 or higher (you're using #{Bundler::VERSION}).\nPlease update with 'gem update bundler'." - end - --gem "rails", "4.2.0" -+gem "rails", "~> 4.2.0" - gem "jquery-rails", "~> 3.1.1" +@@ -8,7 +8,7 @@ + gem "jquery-rails", "~> 3.1.3" gem "coderay", "~> 1.1.0" gem "builder", ">= 3.0.4" -gem "request_store", "1.0.5" -+gem "request_store", "~> 1.0.5" ++gem "request_store", "~>1.0.5" gem "mime-types" gem "protected_attributes" gem "actionpack-action_caching" -@@ -85,19 +85,19 @@ +@@ -86,17 +86,17 @@ group :development do gem "rdoc", ">= 2.4.2" @@ -38,9 +32,6 @@ bundler cannot exclude the test and development groups so we patch those out - gem "selenium-webdriver" +# gem "capybara" +# gem "selenium-webdriver" - # building ffi 1.9.7 fails in Ubuntu: https://github.com/ffi/ffi/issues/414 -- gem "ffi", "1.9.6" -+# gem "ffi", "1.9.6" end local_gemfile = File.join(File.dirname(__FILE__), "Gemfile.local") |