From f0fa46fab1a74fe93d31b86bd31ff4b88d9643bd Mon Sep 17 00:00:00 2001 From: Marco Lopes Date: Thu, 25 Apr 2013 16:49:16 +0100 Subject: [PATCH 1/4] Make predis recipe compatible with redhat family --- recipes/predis.rb | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/recipes/predis.rb b/recipes/predis.rb index f6ffcba..a929de7 100644 --- a/recipes/predis.rb +++ b/recipes/predis.rb @@ -25,8 +25,15 @@ end # phpize command -package "php5-dev" do - action :install +case node['platform'] +when "redhat", "centos", "fedora", "amazon", "scientific" + package "php53u-devel" do + action :install + end +when "ubuntu", "debian" + package "php5-dev" do + action :install + end end directory "/tmp/phpredis" do From 5318bf7bbfc672b1fda265768be57b08cd4db84b Mon Sep 17 00:00:00 2001 From: Marco Lopes Date: Thu, 25 Apr 2013 17:03:37 +0100 Subject: [PATCH 2/4] Fix php-memcache package names on module_memcache recipe --- recipes/module_memcache.rb | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/recipes/module_memcache.rb b/recipes/module_memcache.rb index 814aaed..6c19cc7 100644 --- a/recipes/module_memcache.rb +++ b/recipes/module_memcache.rb @@ -20,11 +20,11 @@ include_recipe "chef-php-extra" if node['php']['ius'] == "5.4" - packages = %w{ php54-memcache } + packages = %w{ php54-pecl-memcache } elsif node['php']['ius'] == "5.3" - packages = %w{ php53u-memcache } + packages = %w{ php53u-pecl-memcache } else - packages = %w{ php-memcache } + packages = %w{ php-pecl-memcache } end pkgs = value_for_platform( From 944745c637d51460143be87ccad8e3f44df154dd Mon Sep 17 00:00:00 2001 From: Andy Thompson Date: Tue, 8 Apr 2014 12:43:50 +0100 Subject: [PATCH 3/4] Remove cyclic dependency on itself. --- metadata.rb | 1 - 1 file changed, 1 deletion(-) diff --git a/metadata.rb b/metadata.rb index 352db1d..b8752ed 100644 --- a/metadata.rb +++ b/metadata.rb @@ -10,7 +10,6 @@ depends "yum", ">= 0.8.0" depends "apt", ">= 1.8.4" depends "php", "= 1.1.8" -depends "chef-php-extra" %w{ ubuntu debian centos redhat fedora }.each do |os| supports os From a428a6101ac35bfd0c3b78ae688fe63e124ed11f Mon Sep 17 00:00:00 2001 From: Andy Thompson Date: Fri, 25 Apr 2014 12:47:59 +0100 Subject: [PATCH 4/4] Bump up version to reflect bug fix release. --- metadata.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/metadata.rb b/metadata.rb index b8752ed..3fd7587 100644 --- a/metadata.rb +++ b/metadata.rb @@ -4,7 +4,7 @@ license "Apache 2.0" description "Installs/Configures additional PHP modules, PEAR and PECL packages" long_description IO.read(File.join(File.dirname(__FILE__), 'README.md')) -version "0.4.0" +version "0.4.1" depends "git", ">= 1.0.0" depends "yum", ">= 0.8.0"