nominatim: switch pyosmium from pip to packaged version

diff --git a/cookbooks/nominatim/metadata.rb b/cookbooks/nominatim/metadata.rb
index 20f5012c9056d798ef8ae22d8727e35edd9e7714..37d66d7aabbb98fa227ee4898ddc8018ab8adc03 100644 (file)
--- a/cookbooks/nominatim/metadata.rb
+++ b/cookbooks/nominatim/metadata.rb
@@ -10,4 +10,3 @@ depends           "apache"
 depends           "postgresql"
 depends           "git"
 depends           "fail2ban"
-depends           "python"

diff --git a/cookbooks/nominatim/recipes/default.rb b/cookbooks/nominatim/recipes/default.rb
index 128bb34cf99b92d73e0ecd61173f7ab62a032397..66eda9587feff5707ebdc5d42eb5e15c9ff23d00 100644 (file)
--- a/cookbooks/nominatim/recipes/default.rb
+++ b/cookbooks/nominatim/recipes/default.rb
@@ -135,7 +135,6 @@ end
 ## Nominatim backend
 
 include_recipe "git"
-include_recipe "python"
 
 package "build-essential"
 package "cmake"
@@ -143,7 +142,6 @@ package "g++"
 package "libboost-dev"
 package "libboost-system-dev"
 package "libboost-filesystem-dev"
-package "libboost-python-dev"
 package "libexpat1-dev"
 package "zlib1g-dev"
 package "libxml2-dev"
@@ -151,9 +149,7 @@ package "libbz2-dev"
 package "libpq-dev"
 package "libgeos++-dev"
 package "libproj-dev"
-package "osmosis"
-
-python_package "osmium"
+package "pyosmium"
 
 source_directory = "#{basedir}/nominatim"
 build_directory = "#{basedir}/bin"