Markus M. May: 4 Version bump ruby-redcarpet for version bump redmine Version bump ruby-rbpdf for version bump redmine Version bump ruby-jquery-rails4.2 for version bump redmine version bump redmine 5 files changed, 31 insertions(+), 36 deletions(-)
Copy & paste the following snippet into your terminal to import this patchset into git:
curl -s https://lists.alpinelinux.org/~alpine/aports/patches/1616/mbox | git am -3Learn more about email & git
--- main/ruby-redcarpet/APKBUILD | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/main/ruby-redcarpet/APKBUILD b/main/ruby-redcarpet/APKBUILD index 27e8805..0fa3cde 100644 --- a/main/ruby-redcarpet/APKBUILD +++ b/main/ruby-redcarpet/APKBUILD @@ -1,8 +1,9 @@ +# Contributor: Markus M. May <triplem@javafreedom.org> # Maintainer: Natanael Copa <ncopa@alpinelinux.org> _gemname=redcarpet pkgname=ruby-$_gemname -# redmine 3.0 needs ~> 3.1.2 -pkgver=3.1.2 +# redmine 3.0.5 needs ~> 3.3.2 +pkgver=3.3.2 pkgrel=0 pkgdesc="A fast, safe and extensible Markdown to (X)HTML parser" url="http://github.com/vmg/redcarpet" @@ -41,6 +42,6 @@ package() { done } -md5sums="b7423381fced7c6a9153f6ab629539a9 redcarpet-3.1.2.gem" -sha256sums="ff5397c2b0d1344f065d07e58ed157f5bc25b49d44e723348620693ba928d71c redcarpet-3.1.2.gem" -sha512sums="ab431d36326a0c4e482885dd00600a50617a57a7150437544ee845ee5225c35b546ed9484032b284d2523b2e4f6a56df448b48026f1a18b09ac9071afa816b31 redcarpet-3.1.2.gem" +md5sums="048b42d499b37c6dd02f2e438758f9b0 redcarpet-3.3.2.gem" +sha256sums="d5e66126a19f09f5334bd257d53ace49dcca251d6e59f9254cfb49c4b22dc9f5 redcarpet-3.3.2.gem" +sha512sums="625855e7d0cf92096afd013e9c4f2fac308d4885c31a5c54450a88a88ec4a887b7dfc23f24a090ee4e3b94482173fcd2d98e5046216d367b6f36a126064add90 redcarpet-3.3.2.gem" -- 2.6.2 --- Unsubscribe: alpine-aports+unsubscribe@lists.alpinelinux.org Help: alpine-aports+help@lists.alpinelinux.org ---
--- main/ruby-rbpdf/APKBUILD | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/main/ruby-rbpdf/APKBUILD b/main/ruby-rbpdf/APKBUILD index 32c2757..ec3c26b 100644 --- a/main/ruby-rbpdf/APKBUILD +++ b/main/ruby-rbpdf/APKBUILD @@ -1,7 +1,8 @@ +# Contributor: Markus M. May <triplem@javafreedom.org> # Maintainer: Natanael Copa <ncopa@alpinelinux.org> _gemname=rbpdf pkgname=ruby-$_gemname -pkgver=1.18.5 +pkgver=1.18.6 pkgrel=0 pkgdesc="A template plugin allowing the inclusion of ERB-enabled RBPDF template files" url="https://rubygems.org/gems/rbpd" @@ -40,6 +41,6 @@ package() { done } -md5sums="bc1ce0ad2b9e6dfac9aede9080fa6a50 rbpdf-1.18.5.gem" -sha256sums="ec2c8204a42081c3e22f48c4061c532ab87f28c41b601afa7d295ef8b5afbbc1 rbpdf-1.18.5.gem" -sha512sums="ab3b58703523450cc12941d19e4af770a921b90f693621100fb81f164be1dc739aa0bccdfe806fc0f3dd9c174c1b6afa7d6834972d52df165ca064e20c5cdcbd rbpdf-1.18.5.gem" +md5sums="de6a33865a47b7673bce91062f85f3fc rbpdf-1.18.6.gem" +sha256sums="d5d1e30ad1465bea5b3c1809cf2789c6795dafbfba6c2cab40c628989229b650 rbpdf-1.18.6.gem" +sha512sums="a2c30082211d4b170c7cfea72f839541364d7e6b9da29b33a489a5900f63f2cc6ccb85c099ba2f090eec96c79c50026195f9a4a03c04274eea691188271b839b rbpdf-1.18.6.gem" -- 2.6.2 --- Unsubscribe: alpine-aports+unsubscribe@lists.alpinelinux.org Help: alpine-aports+help@lists.alpinelinux.org ---
--- main/ruby-jquery-rails4.2/APKBUILD | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/main/ruby-jquery-rails4.2/APKBUILD b/main/ruby-jquery-rails4.2/APKBUILD index d92c8f4..4378272 100644 --- a/main/ruby-jquery-rails4.2/APKBUILD +++ b/main/ruby-jquery-rails4.2/APKBUILD @@ -1,7 +1,8 @@ +# Contributor: Markus M. May <triplem@javafreedom.org> # Maintainer: Natanael Copa <ncopa@alpinelinux.org> _gemname=jquery-rails pkgname=ruby-${_gemname}4.2 -pkgver=3.1.2 +pkgver=3.1.3 pkgrel=0 pkgdesc="jQuery and the jQuery-ujs driver for Rails 4.2" url="http://rubygems.org/gems/jquery-rails" @@ -32,6 +33,6 @@ package() { "$pkgdir"/$_geminstdir/.require_paths } -md5sums="ff7754d827016805bcf1c950ce6eb980 jquery-rails-3.1.2.gem" -sha256sums="7ee42bba07bb858c11d81da798c2bfa3641b5afad5d420445b55d0118b29aa40 jquery-rails-3.1.2.gem" -sha512sums="b6beb89fff8fdcb29d8a26da1ce0e82073f18a9643886e9367e7021a65ae8d80080a969b6146d4dea8ebd0a7b6af94fadda56c5a2fc52cd68cfbc2cb0edc1335 jquery-rails-3.1.2.gem" +md5sums="92916643c22ca2fc91e939247e61e62c jquery-rails-3.1.3.gem" +sha256sums="07b5b06c60464ea1d86b773eb77c146fc16ecbb6f336b99ee7c1d0d383cc07d8 jquery-rails-3.1.3.gem" +sha512sums="e888eab43036f39335098047bab4c4c4019eccbf73f9eccf952a416dafd46750caa3f7ebd6102f4cee1f8997c585783cc8f77aee4378cda2e074e5291016fe77 jquery-rails-3.1.3.gem" -- 2.6.2 --- Unsubscribe: alpine-aports+unsubscribe@lists.alpinelinux.org Help: alpine-aports+help@lists.alpinelinux.org ---
--- main/redmine/APKBUILD | 21 +++++++++++---------- main/redmine/gemfile.patch | 17 ++++------------- 2 files changed, 15 insertions(+), 23 deletions(-) diff --git a/main/redmine/APKBUILD b/main/redmine/APKBUILD index d156ad6..7cc4f15 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 9b4fb9a..ed86389 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") -- 2.6.2 --- Unsubscribe: alpine-aports+unsubscribe@lists.alpinelinux.org Help: alpine-aports+help@lists.alpinelinux.org ---