[packages/puppet] - up to 3.7.3
arekm
arekm at pld-linux.org
Fri Nov 28 10:59:22 CET 2014
commit 5c13fcb2fc9ef612e5ada276dad6a7333b5265f5
Author: Arkadiusz Miśkiewicz <arekm at maven.pl>
Date: Fri Nov 28 10:59:17 2014 +0100
- up to 3.7.3
puppet.spec | 11 ++++++-----
rundir-perms.patch | 28 ----------------------------
2 files changed, 6 insertions(+), 33 deletions(-)
---
diff --git a/puppet.spec b/puppet.spec
index faf0bf3..605dfff 100644
--- a/puppet.spec
+++ b/puppet.spec
@@ -2,17 +2,17 @@
# for man - rst2man.py needed (docutils snap?)
Summary: A network tool for managing many disparate systems
Name: puppet
-Version: 3.1.1
-Release: 0.11
+Version: 3.7.3
+Release: 0.1
License: Apache v2.0
Group: Networking/Admin
Source0: http://puppetlabs.com/downloads/puppet/%{name}-%{version}.tar.gz
-# Source0-md5: e942079612703a460a9fdb52e6bcae4a
+# Source0-md5: cc294da1d51df07bcc7f6cf78bd90ce0
Patch0: install-p.patch
Patch1: ruby19.patch
-Patch2: rundir-perms.patch
URL: http://www.puppetlabs.com/
BuildRequires: docutils
+BuildRequires: hiera
BuildRequires: rpm-rubyprov
BuildRequires: rpmbuild(macros) >= 1.656
BuildRequires: ruby-facter >= 1.6
@@ -82,7 +82,6 @@ Vim syntax for puppet .pp files
%setup -q
#%patch0 -p1
#%patch1 -p1
-%patch2 -p1
%install
rm -rf $RPM_BUILD_ROOT
@@ -196,6 +195,8 @@ fi
%{ruby_vendorlibdir}/puppet
%{ruby_vendorlibdir}/puppet.rb
%{ruby_vendorlibdir}/semver.rb
+%{ruby_vendorlibdir}/puppetx.rb
+%{ruby_vendorlibdir}/puppetx
%{_mandir}/man5/puppet.conf.5*
%{_mandir}/man8/extlookup2hiera.8*
%{_mandir}/man8/puppet*.8*
diff --git a/rundir-perms.patch b/rundir-perms.patch
deleted file mode 100644
index 25d1fcf..0000000
--- a/rundir-perms.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From c181799a30427966cbe028fde7b390cac9cf44e9 Mon Sep 17 00:00:00 2001
-From: Matthaus Litteken <matthaus at puppetlabs.com>
-Date: Fri, 4 May 2012 10:59:26 -0700
-Subject: [PATCH] Tighten rundir perms (rhbz #495096)
-
-The loose default permissions are not required for Red Hat systems
-installed via rpm packages because the packages create the required
-service user/group.
----
- lib/puppet/defaults.rb | 2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
-diff --git a/lib/puppet/defaults.rb b/lib/puppet/defaults.rb
-index dc498e7..eef36d2 100644
---- a/lib/puppet/defaults.rb
-+++ b/lib/puppet/defaults.rb
-@@ -84,7 +84,7 @@ module Puppet
- :rundir => {
- :default => nil,
- :type => :directory,
-- :mode => 01777,
-+ :mode => 0755,
- :desc => "Where Puppet PID files are kept."
- },
- :genconfig => {
---
-1.7.7.6
-
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/puppet.git/commitdiff/5c13fcb2fc9ef612e5ada276dad6a7333b5265f5
More information about the pld-cvs-commit
mailing list