diff --git a/attributes/default.rb b/attributes/default.rb index 4e7d915..14e5e52 100644 --- a/attributes/default.rb +++ b/attributes/default.rb @@ -17,6 +17,6 @@ # See the License for the specific language governing permissions and # limitations under the License. -set['couch_db']['src_checksum'] = "6ef82a7ba0f132d55af7cc78b30658d5b3a4f7be3f449308c8d7fa2ad473677c" -set['couch_db']['src_version'] = "1.0.2" -set['couch_db']['src_mirror'] = "http://archive.apache.org/dist/couchdb/#{node['couch_db']['src_version']}/apache-couchdb-#{node['couch_db']['src_version']}.tar.gz" +set['couch_db']['src_checksum'] = '0f254ddea2471dbc4d3c6cd1fa61e4782c75475fb325024e10f68bf1aa8d5c37' +set['couch_db']['src_version'] = '1.2.0' +set['couch_db']['src_mirror'] = "http://archive.apache.org/dist/couchdb/releases/#{node['couch_db']['src_version']}/apache-couchdb-#{node['couch_db']['src_version']}.tar.gz" diff --git a/metadata.rb b/metadata.rb index 88b30ce..c4dd6dd 100644 --- a/metadata.rb +++ b/metadata.rb @@ -9,7 +9,7 @@ directly from source. CouchDB is available on Red Hat-based systems through the EPEL Yum Repository. EOH -version "1.0.0" +version "1.0.1" depends "erlang" recipe "couchdb", "Installs and configures CouchDB package" recipe "couchdb::source", "Installs and configures CouchDB from source" diff --git a/recipes/source.rb b/recipes/source.rb index f0febc1..e538826 100644 --- a/recipes/source.rb +++ b/recipes/source.rb @@ -28,17 +28,19 @@ compile_flags = String.new dev_pkgs = Array.new -case node['platform'] -when "debian", "ubuntu" +if %w(debian ubuntu).include?(node['platform']) dev_pkgs << "libicu-dev" dev_pkgs << "libcurl4-openssl-dev" dev_pkgs << value_for_platform( "debian" => { "default" => "libmozjs-dev" }, "ubuntu" => { + '8.10' => 'xulrunner-dev', "9.04" => "libmozjs-dev", "9.10" => "libmozjs-dev", - "default" => "xulrunner-dev" + '10.04' => 'xulrunner-dev', + '10.10' => 'xulrunner-dev', + 'default' => 'libmozjs-dev' } ) @@ -46,11 +48,15 @@ package pkg end - if node['platform_version'].to_f >= 10.04 + if node['platform_version'].to_f >= 11.04 + execute 'apt-get -y build-dep couchdb' + elsif node['platform_version'].to_f >= 10.04 compile_flags = "--with-js-lib=/usr/lib/xulrunner-devel-1.9.2.8/lib --with-js-include=/usr/lib/xulrunner-devel-1.9.2.8/include" end + end + remote_file couchdb_tar_gz do checksum node['couch_db']['src_checksum'] source node['couch_db']['src_mirror']