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

Conflicts:
	Readme.md

Readme.md

@@ -2,6 +2,8 @@
 
 Welcome to our [vagrant](http://www.vagrantup.com) based build system for RPMs. 
 
+If you need assistence you can (almost) always reach us on [IRC](https://irc.eox.at), channel *#eox*
+
 ## (Currently) Supported Projects
 
 Currently we _automagically_ install the build dependencies for the following projects:
@@ -9,6 +11,7 @@ Currently we _automagically_ install the build dependencies for the following pr
 * eox-release (which doesn't have any, so it's easy)
 * mapserver
 * rasdaman
+* eoxserver
 
 ## To start building
 
@@ -46,4 +49,4 @@ Currently we _automagically_ install the build dependencies for the following pr
 * Create a new puppet module inside the _puppet/modules_ directory. (See the [rasdaman module](/vagrant/builder_rpm/tree/master/puppet/modules/rasdaman) for an example)
 * Create a merge request
 
-If you are not sure, you can also email the build dependencies to marko.locher@eox.at and I'll do it for you!
\ No newline at end of file
+If you are not sure, you can also email the build dependencies to marko.locher@eox.at and I'll do it for you!

puppet/modules/buildtools/manifests/init.pp

@@ -13,6 +13,8 @@ class buildtools {
 	}
 
 	package { 'rpm-build': ensure => 'latest' }
+	package { 'yum-utils': ensure => 'latest' }
+	package { 'mock': ensure => 'latest' }
 	package { 'redhat-rpm-config': ensure => 'latest' }
 	package { 'make': ensure => 'latest' }
 	package { 'gcc': ensure => 'latest' }
@@ -21,7 +23,7 @@ class buildtools {
 	file { $home: ensure => directory }
 	file { "${home}/.rpmmacros":
 		ensure	=> file,
-		content	=> "%_topdir ${home}/rpmbuild\n",
+		content	=> "%_topdir ${home}/rpmbuild\n%__os_install_post %{nil}\n",
 	}
 	file { "${home}/rpmbuild":
 		ensure	=> directory,

puppet/modules/eoxserver/manifests/init.pp

+class eoxserver {
+    # enable EOX-testing repository
+    augeas { 'enable_eox-testing':
+        context => '/files/etc/yum.repos.d/eox-testing.repo',
+        changes => [
+            'set eox-testing/enabled 0',
+            'set eox-testing-source/enabled 0',
+            'set eox-testing-noarch/enabled 0',
+        ]
+    }
+
+    package { 'gdal-devel': ensure => 'latest' }
+    package { 'python-setuptools': ensure => 'latest' }
+    package { 'python-devel': ensure => 'latest' }
+}

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
+}