[packages/puppet] license is ASL 2.0, install to vendor dirs; update files

glen glen at pld-linux.org
Wed May 1 13:43:10 CEST 2013


commit 7e8408a7320862711187afaf3ffdb68ce6392ace
Author: Elan Ruusamäe <glen at delfi.ee>
Date:   Wed May 1 14:36:33 2013 +0300

    license is ASL 2.0, install to vendor dirs; update files

 puppet.spec | 87 ++++++++++++++++++-------------------------------------------
 1 file changed, 25 insertions(+), 62 deletions(-)
---
diff --git a/puppet.spec b/puppet.spec
index e2950d5..5dc5510 100644
--- a/puppet.spec
+++ b/puppet.spec
@@ -5,8 +5,8 @@
 Summary:	A network tool for managing many disparate systems
 Name:		puppet
 Version:	3.1.1
-Release:	0.2
-License:	GPL v2+
+Release:	0.4
+License:	Apache v2.0
 Group:		Networking/Admin
 Source0:	http://puppetlabs.com/downloads/puppet/%{name}-%{version}.tar.gz
 # Source0-md5:	e942079612703a460a9fdb52e6bcae4a
@@ -14,13 +14,17 @@ Patch0:		install-p.patch
 Patch1:		ruby19.patch
 URL:		http://www.puppetlabs.com/
 BuildRequires:	docutils
-BuildRequires:	rpmbuild(macros) >= 1.484
-BuildRequires:	ruby >= 1:1.8.7
-BuildRequires:	ruby-facter >= 1.5
-Requires:	ruby >= 1:1.8.7
-Requires:	ruby-facter >= 1.5
-Requires:	ruby-shadow
-#%{?ruby_mod_ver_requires_eq}
+BuildRequires:	rpm-rubyprov
+BuildRequires:	rpmbuild(macros) >= 1.656
+BuildRequires:	ruby-facter >= 1.6
+BuildRequires:	sed >= 4.0
+BuildRequires:	which
+BuildConflicts:	ruby-ftools
+Requires:	ruby-facter < 2
+Requires:	ruby-facter >= 1.6
+Requires:	ruby-hiera < 2
+Requires:	ruby-hiera >= 1.0
+BuildArch:	noarch
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
@@ -56,14 +60,12 @@ Vim syntax for puppet .pp files
 #%patch0 -p1
 #%patch1 -p1
 
-# puppet-queue.conf is more of an example, used for stompserver
-#mv conf/puppet-queue.conf examples/etc/puppet/
-
 %install
 rm -rf $RPM_BUILD_ROOT
 %{__ruby} install.rb \
 	--quick \
 	--no-rdoc \
+	--sitelibdir=%{ruby_vendorlibdir} \
 	--destdir=$RPM_BUILD_ROOT
 
 install -d $RPM_BUILD_ROOT{%{_sysconfdir}/%{name}/modules,%{_datadir}/%{name}/modules}
@@ -85,62 +87,23 @@ rm -rf $RPM_BUILD_ROOT
 %dir %{_sysconfdir}/%{name}
 %dir %{_sysconfdir}/%{name}/modules
 %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/%{name}/auth.conf
-#%attr(755,root,root) %{_bindir}/filebucket
-#%attr(755,root,root) %{_bindir}/pi
+%attr(755,root,root) %{_bindir}/extlookup2hiera
 %attr(755,root,root) %{_bindir}/puppet
-#%attr(755,root,root) %{_bindir}/puppetdoc
-#%attr(755,root,root) %{_bindir}/ralsh
-#%attr(755,root,root) %{_sbindir}/puppetca
-#%attr(755,root,root) %{_sbindir}/puppetd
 %dir %{_datadir}/%{name}
 %{_datadir}/%{name}/modules
-%{ruby_sitelibdir}/puppet
-%{ruby_sitelibdir}/puppet.rb
-%{ruby_sitelibdir}/semver.rb
+%{ruby_vendorlibdir}/puppet
+%{ruby_vendorlibdir}/puppet.rb
+%{ruby_vendorlibdir}/semver.rb
 %{_mandir}/man5/puppet.conf.5*
-#%{_mandir}/man8/filebucket.8*
-#%{_mandir}/man8/pi.8*
-%{_mandir}/man8/puppet-agent.8*
-%{_mandir}/man8/puppet-apply.8*
-%{_mandir}/man8/puppet-ca.8*
-%{_mandir}/man8/puppet-catalog.8*
-%{_mandir}/man8/puppet-cert.8*
-%{_mandir}/man8/puppet-certificate.8*
-%{_mandir}/man8/puppet-certificate_request.8*
-%{_mandir}/man8/puppet-certificate_revocation_list.8*
-%{_mandir}/man8/puppet-config.8*
-%{_mandir}/man8/puppet-describe.8*
-%{_mandir}/man8/puppet-device.8*
-%{_mandir}/man8/puppet-doc.8*
-%{_mandir}/man8/puppet-facts.8*
-%{_mandir}/man8/puppet-file.8*
-%{_mandir}/man8/puppet-filebucket.8*
-%{_mandir}/man8/puppet-help.8*
-%{_mandir}/man8/puppet-inspect.8*
-%{_mandir}/man8/puppet-instrumentation_data.8*
-%{_mandir}/man8/puppet-instrumentation_listener.8*
-%{_mandir}/man8/puppet-instrumentation_probe.8*
-%{_mandir}/man8/puppet-key.8*
-%{_mandir}/man8/puppet-kick.8*
-%{_mandir}/man8/puppet-man.8*
-%{_mandir}/man8/puppet-master.8*
-%{_mandir}/man8/puppet-module.8*
-%{_mandir}/man8/puppet-node.8*
-%{_mandir}/man8/puppet-parser.8*
-%{_mandir}/man8/puppet-plugin.8*
-%{_mandir}/man8/puppet-queue.8*
-%{_mandir}/man8/puppet-report.8*
-%{_mandir}/man8/puppet-resource.8*
-%{_mandir}/man8/puppet-resource_type.8*
-%{_mandir}/man8/puppet-secret_agent.8*
-%{_mandir}/man8/puppet-status.8*
-%{_mandir}/man8/puppet.8*
-#%{_mandir}/man8/puppetca.8*
-#%{_mandir}/man8/puppetd.8*
-#%{_mandir}/man8/puppetdoc.8*
-#%{_mandir}/man8/ralsh.8*
+%{_mandir}/man8/extlookup2hiera.8*
+%{_mandir}/man8/puppet*.8*
 %{_examplesdir}/%{name}-%{version}
 
+# hiera addons
+%{ruby_vendorlibdir}/hiera/backend/puppet_backend.rb
+%{ruby_vendorlibdir}/hiera/scope.rb
+%{ruby_vendorlibdir}/hiera_puppet.rb
+
 %if 0
 %files server
 %defattr(644,root,root,755)
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/puppet.git/commitdiff/2bc6800e1e3b54bfe25c45f7b982bc104e18efc2



More information about the pld-cvs-commit mailing list