[packages/chef: 9/9] up to 11.8.2
glen
glen at pld-linux.org
Wed Jan 29 16:14:01 CET 2014
commit 4613dfe7303d7fe5beb3a0b2e0edcfe481fe0a16
Merge: 5c13348 2e351ff
Author: Elan Ruusamäe <glen at delfi.ee>
Date: Tue Jan 7 05:55:49 2014 +0000
up to 11.8.2
Merged branch 'dev-11.8'
Conflicts:
chef.spec
FHS.patch | 128 +++++++++++++++++++++-----------------------------------------
chef.spec | 103 ++++++++++++++++++++++++++++++++++++--------------
2 files changed, 119 insertions(+), 112 deletions(-)
---
diff --cc chef.spec
index 5e4b018,493ff5a..92e8dcd
--- a/chef.spec
+++ b/chef.spec
@@@ -1,28 -1,26 +1,31 @@@
#
++# NOTE:
++# - check releases here: https://github.com/opscode/chef/releases
++
# Conditional build:
%bcond_with tests # build without tests
Summary: A systems integration framework, built to bring the benefits of configuration management to your entire infrastructure
Name: chef
- Version: 11.6.2
- Release: 7
+ Version: 11.8.2
-Release: 0.14
++Release: 0.15
License: Apache v2.0
Group: Development/Languages
Source0: http://rubygems.org/downloads/%{name}-%{version}.gem
- # Source0-md5: 8db9eb4b3c75be30e8125ea4eedd3f01
+ # Source0-md5: 7d3c2e8b98ec8df050d92686f1429d8f
Source1: %{name}.rb
Source2: %{name}.tmpfiles
+Source3: https://raw.github.com/stevendanna/knife-hacks/master/shell/knife_completion.sh
+# Source3-md5: a4c1e41370be8088a59ddb3b2e7ea397
Patch0: platform-pld.patch
Patch1: FHS.patch
Patch2: https://github.com/glensc/chef/compare/poldek.patch
# Patch2-md5: 5a0fc35de33910b41cba4e87dcb4bf9a
Patch3: https://github.com/glensc/chef/compare/pld-knife-boostrap.patch
- # Patch3-md5: 8ff0fdfde6dc90018698775bf8f13062
- URL: http://wiki.opscode.com/display/chef
+ # Patch3-md5: bfc884469fad7b5aa46341402be5fccd
-URL: http://wiki.opscode.com/display/chef
++URL: https://wiki.opscode.com/display/chef/
BuildRequires: rpm-rubyprov
-BuildRequires: rpmbuild(macros) >= 1.656
+BuildRequires: rpmbuild(macros) >= 1.673
BuildRequires: sed >= 4.0
%if %{with tests}
BuildRequires: ruby-abstract
@@@ -42,8 -39,6 +44,7 @@@ BuildRequires: ruby-rspec-mocks >= 2.13
#BuildRequires: ruby-rspec_junit_formatter
#BuildRequires: ruby-sdoc
%endif
- Requires: diffutils
+Requires: iproute2
Requires: lsb-release
Requires: poldek >= 0.30
Requires: ruby >= 1:1.9.3.429-4
@@@ -71,19 -74,17 +80,30 @@@ BuildRoot: %{tmpdir}/%{name}-%{version}
A systems integration framework, built to bring the benefits of
configuration management to your entire infrastructure.
+%package -n bash-completion-knife
+Summary: bash-completion for knife
+Summary(pl.UTF-8): bashowe uzupełnianie nazw dla knifea
+Group: Applications/Shells
+Requires: %{name} >= 0.10
+Requires: bash-completion >= 2.0
+
+%description -n bash-completion-knife
+This package provides bash-completion for knife.
+
+%description -n bash-completion-knife -l pl.UTF-8
+Pakiet ten dostarcza bashowe uzupełnianie nazw dla knifea.
+
+ %package -n knife
+ Summary: knife - Chef Server API client utility
+ Group: Development/Languages
+ Requires: %{name} = %{version}-%{release}
+
+ %description -n knife
+ Knife is a command-line utility used to manage data on a Chef server
+ through the HTTP(S) API. Knife is organized into groups of subcommands
+ centered around the various object types in Chef. Each category of
+ subcommand is documented in its own manual page.
+
%prep
%setup -q
%patch0 -p1
@@@ -146,27 -178,7 +200,20 @@@ rm -rf $RPM_BUILD_ROO
%{_mandir}/man1/knife-ssh.1*
%{_mandir}/man1/knife-status.1*
%{_mandir}/man1/knife-tag.1*
+ %{_mandir}/man1/knife-upload.1*
+ %{_mandir}/man1/knife-user.1*
+ %{_mandir}/man1/knife-xargs.1*
%{_mandir}/man1/knife.1*
- %{_mandir}/man8/chef-client.8*
- %{_mandir}/man8/chef-expander.8*
- %{_mandir}/man8/chef-expanderctl.8*
- %{_mandir}/man8/chef-server-webui.8*
- %{_mandir}/man8/chef-server.8*
- %{_mandir}/man8/chef-solo.8*
- %{_mandir}/man8/chef-solr.8*
- %{ruby_vendorlibdir}/chef.rb
- %{ruby_vendorlibdir}/chef
- %{systemdtmpfilesdir}/chef.conf
+
+%dir /var/lib/%{name}
+%dir /var/lib/%{name}/roles
+%dir /var/lib/%{name}/data_bags
+%dir /var/lib/%{name}/environments
+%dir %attr(750,root,root) /var/lib/%{name}/backup
+
+%dir /var/cache/%{name}
+%dir /var/run/%{name}
+
+%files -n bash-completion-knife
+%defattr(644,root,root,755)
+%{bash_compdir}/knife
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/chef.git/commitdiff/4613dfe7303d7fe5beb3a0b2e0edcfe481fe0a16
More information about the pld-cvs-commit
mailing list