[Pkg-puppet-devel] [SCM] Puppet packaging for Debian branch, upstream, updated. 0.25.5-639-g8f94f35
test branch
puppet-dev at googlegroups.com
Wed Jul 14 10:32:37 UTC 2010
The following commit has been merged in the upstream branch:
commit 4a6474ca7456b5a42488fb53cde9d4822bf5312e
Author: Andrew Forgue <andrew.forgue at gmail.com>
Date: Mon Nov 23 17:51:36 2009 -0500
Modify SuSE spec file for 0.25.x and correct shebang lines for
puppetd/puppetmasterd
diff --git a/conf/suse/puppet.spec b/conf/suse/puppet.spec
index 1d08f3d..15a9b9e 100644
--- a/conf/suse/puppet.spec
+++ b/conf/suse/puppet.spec
@@ -5,21 +5,18 @@
Summary: A network tool for managing many disparate systems
Name: puppet
-Version: 0.24.1
-Release: 3%{?dist}
+Version: 0.25.4
+Release: 1%{?dist}
License: GPL
Group: System Environment/Base
URL: http://reductivelabs.com/projects/puppet/
-Source: http://reductivelabs.com/downloads/puppet/%{name}-%{version}.tgz
+Source: http://reductivelabs.com/downloads/puppet/%{name}-%{version}.tar.gz
Patch0: puppet.suse.patch
-Patch1: puppet.service.patch
-
-Requires: ruby >= 1.8.6
+Requires: ruby >= 1.8.2
Requires: facter >= 1.3.7
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildArchitectures: noarch
-BuildRequires: ruby >= 1.8.6
+BuildRequires: ruby >= 1.8.2
%description
Puppet lets you centrally manage every important aspect of your system using a
@@ -38,8 +35,7 @@ The server can also function as a certificate authority and file server.
%prep
%setup -q
-%patch0 -p1
-%patch1 -p1
+%patch0 -p0
%build
for f in bin/* ; do
@@ -56,9 +52,11 @@ done
%{__install} -d -m0755 %{buildroot}%{_localstatedir}/lib/puppet
%{__install} -d -m0755 %{buildroot}%{_localstatedir}/run/puppet
%{__install} -d -m0755 %{buildroot}%{_localstatedir}/log/puppet
-%{__install} -Dp -m0755 %{pbuild}/bin/* %{buildroot}%{_sbindir}
+%{__install} -Dp -m0755 %{pbuild}/bin/* %{pbuild}/sbin/* %{buildroot}%{_sbindir}
%{__mv} %{buildroot}%{_sbindir}/puppet %{buildroot}%{_bindir}/puppet
%{__mv} %{buildroot}%{_sbindir}/puppetrun %{buildroot}%{_bindir}/puppetrun
+%{__mv} %{buildroot}%{_sbindir}/pi %{buildroot}%{_bindir}/pi
+%{__mv} %{buildroot}%{_sbindir}/filebucket %{buildroot}%{_bindir}/filebucket
%{__install} -Dp -m0644 %{pbuild}/lib/puppet.rb %{buildroot}%{ruby_sitelibdir}/puppet.rb
%{__cp} -a %{pbuild}/lib/puppet %{buildroot}%{ruby_sitelibdir}
find %{buildroot}%{ruby_sitelibdir} -type f -perm +ugo+x -print0 | xargs -0 -r %{__chmod} a-x
@@ -73,12 +71,15 @@ find %{buildroot}%{ruby_sitelibdir} -type f -perm +ugo+x -print0 | xargs -0 -r %
%files
%defattr(-, root, root, 0755)
%{_bindir}/puppet
+%{_bindir}/pi
+%{_bindir}/filebucket
+%{_sbindir}/ralsh
%{_sbindir}/puppetd
%{ruby_sitelibdir}/*
%{_initrddir}/puppet
%config(noreplace) %{_sysconfdir}/sysconfig/puppet
%config(noreplace) %{_sysconfdir}/puppet/puppet.conf
-%doc CHANGELOG COPYING LICENSE README TODO examples
+%doc CHANGELOG COPYING LICENSE README examples
%exclude %{_sbindir}/puppetdoc
%config(noreplace) %{_sysconfdir}/logrotate.d/puppet
# These need to be owned by puppet so the server can
@@ -90,6 +91,7 @@ find %{buildroot}%{ruby_sitelibdir} -type f -perm +ugo+x -print0 | xargs -0 -r %
%files server
%defattr(-, root, root, 0755)
%{_sbindir}/puppetmasterd
+%{_sbindir}/puppetqd
%{_bindir}/puppetrun
%{_initrddir}/puppetmaster
%config(noreplace) %{_sysconfdir}/puppet/*
diff --git a/conf/suse/puppet.suse.patch b/conf/suse/puppet.suse.patch
new file mode 100644
index 0000000..4197467
--- /dev/null
+++ b/conf/suse/puppet.suse.patch
@@ -0,0 +1,16 @@
+--- sbin/puppetmasterd.orig 2009-11-23 10:38:16.632264990 -0500
++++ sbin/puppetmasterd 2009-11-23 10:38:28.884265155 -0500
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env ruby
++#!/usr/bin/ruby
+
+ #
+ # = Synopsis
+--- sbin/puppetd.orig 2009-11-23 10:38:23.240265893 -0500
++++ sbin/puppetd 2009-11-23 10:38:35.044265271 -0500
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env ruby
++#!/usr/bin/ruby
+ # == Synopsis
+ #
+ # Retrieve the client configuration from the central puppet server and apply
--
Puppet packaging for Debian
More information about the Pkg-puppet-devel
mailing list