Merge branch 'master' of gitlab.eox.at:vagrant/builder_rpm

puppet/modules/rasdaman/manifests/init.pp

@@ -3,16 +3,17 @@ class rasdaman {
 	augeas { 'enable_eox-testing':
 		context	=> '/files/etc/yum.repos.d/eox-testing.repo',
 		changes	=> [
-			'set eox-testing/enabled 0',
+			'set eox-testing/enabled 1',
 			'set eox-testing-source/enabled 0',
 			'set eox-testing-noarch/enabled 0',
+            'set /files/etc/yum.repos.d/eox-testing.repo/eox-testing/includepkgs gdal*',
 		]
 	}
 
 	package { 'bison': ensure => 'latest' }
 	package { 'libtiff-devel': ensure => 'latest' }
 	package { 'hdf-devel': ensure => 'latest' }
-	package { 'libjpeg-devel': ensure => 'latest' }
+	package { 'libjpeg-turbo-devel': ensure => 'latest' }
 	package { 'readline-devel': ensure => 'latest' }
 	package { 'zlib-devel': ensure => 'latest' }
 	package { 'libpng-devel': ensure => 'latest' }
@@ -24,4 +25,4 @@ class rasdaman {
 	package { 'netcdf-devel': ensure => 'latest' }
 	package { 'gdal-devel': ensure => 'latest' }
 	package { 'java-1.6.0-openjdk-devel': ensure => 'latest' }
-}
\ No newline at end of file
+}