move to facter3

2 files changed, 11 insertions, 6 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 1e48eeef9f7e..6ec1982d03d9 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,9 @@
+# Generated by mksrcinfo v8
+# Mon Dec 28 20:12:21 UTC 2015
 pkgbase = puppetserver
 	pkgdesc = Server automation framework and application
 	pkgver = 2.2.1
-	pkgrel = 1
+	pkgrel = 2
 	url = https://docs.puppetlabs.com/puppetserver/latest/services_master_puppetserver.html
 	install = puppetserver.install
 	arch = any
@@ -11,7 +13,8 @@ pkgbase = puppetserver
 	depends = java-environment
 	depends = logrotate
 	depends = jruby
-	depends = facter2
+	depends = facter>=3.1.3-4
+	depends = net-tools
 	backup = etc/default/puppetserver
 	backup = etc/logrotate.d/puppetserver
 	backup = etc/puppetlabs/puppetserver/bootstrap.cfg
diff --git a/PKGBUILD b/PKGBUILD
index 4fa28097b45b..0f334f046bb5 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,12 +3,13 @@
 
 pkgname=puppetserver
 pkgver=2.2.1
-pkgrel=1
+pkgrel=2
 pkgdesc="Server automation framework and application"
 arch=('any')
 url="https://docs.puppetlabs.com/puppetserver/latest/services_master_puppetserver.html"
 license=("APACHE")
-depends=("ruby" "puppet>=4" "java-environment" "logrotate" "jruby" "facter2")
+depends=("ruby" "puppet>=4" "java-environment" "logrotate" "jruby"
+         "facter>=3.1.3-4" "net-tools")
 backup=('etc/default/puppetserver'
         'etc/logrotate.d/puppetserver'
         'etc/puppetlabs/puppetserver/bootstrap.cfg'
@@ -27,8 +28,9 @@ prepare() {
   cd $pkgname-$pkgver
 
   sed -i 's:sysconfig:default:' ext/redhat/puppetserver.service
-  sed -i "s:/opt/puppetlabs/puppet/lib/ruby/vendor_ruby:$( ruby -e \
-    'puts RbConfig::CONFIG["vendorlibdir"]' ):" ext/config/conf.d/$pkgname.conf
+  sed -i "s:\[/opt/puppetlabs/puppet/lib/ruby/vendor_ruby\]:\[$( ruby -e \
+    'puts RbConfig::CONFIG["vendorlibdir"]' ),$( ruby -e \
+    'puts RbConfig::CONFIG["vendordir"]' )\]:" ext/config/conf.d/$pkgname.conf
 }
 
 package() {