X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=chef.spec;h=c7ba8345d0f40f7c049437e9454da02372255724;hb=cce1595ac726078ef85b2486a4681f79f3473957;hp=9979b68d232e81e607d7472c708cdc6c6930ef3c;hpb=a58665addb6358c9392e5ac0147e98284166250a;p=packages%2Fchef.git

diff --git a/chef.spec b/chef.spec
index 9979b68..c7ba834 100644
--- a/chef.spec
+++ b/chef.spec
@@ -4,17 +4,18 @@
 
 Summary:	A systems integration framework, built to bring the benefits of configuration management to your entire infrastructure
 Name:		chef
-Version:	11.6.0
-Release:	1
+Version:	11.8.2
+Release:	0.13
 License:	Apache v2.0
 Group:		Development/Languages
 Source0:	http://rubygems.org/downloads/%{name}-%{version}.gem
-# Source0-md5:	3e8f67a5d11144573cf2c8d520ca39a6
+# Source0-md5:	7d3c2e8b98ec8df050d92686f1429d8f
 Source1:	%{name}.rb
+Source2:	%{name}.tmpfiles
 Patch0:		platform-pld.patch
 Patch1:		FHS.patch
 Patch2:		https://github.com/glensc/chef/compare/poldek.patch
-# Patch2-md5:	de55627051f1e0486d29814eb305c7f4
+# Patch2-md5:	5a0fc35de33910b41cba4e87dcb4bf9a
 Patch3:		https://github.com/glensc/chef/compare/pld-knife-boostrap.patch
 # Patch3-md5:	bfc884469fad7b5aa46341402be5fccd
 URL:		http://wiki.opscode.com/display/chef
@@ -23,46 +24,71 @@ BuildRequires:	rpmbuild(macros) >= 1.656
 BuildRequires:	sed >= 4.0
 %if %{with tests}
 BuildRequires:	ruby-abstract
-BuildRequires:	ruby-chef-zero < 2
-BuildRequires:	ruby-chef-zero >= 1.4
 BuildRequires:	ruby-mixlib-authentication >= 1.3.0
 BuildRequires:	ruby-net-ssh-multi >= 1.1.0
-BuildRequires:	ruby-puma < 2
-BuildRequires:	ruby-puma >= 1.6
 BuildRequires:	ruby-rack
 BuildRequires:	ruby-rake
 #BuildRequires:	ruby-rdoc
 BuildRequires:	ruby-rest-client >= 1.0.4
-BuildRequires:	ruby-rspec-core >= 2.12.0
-BuildRequires:	ruby-rspec-expectations >= 2.12.0
-BuildRequires:	ruby-rspec-mocks >= 2.12.0
+BuildRequires:	ruby-rspec-core < 2.14
+BuildRequires:	ruby-rspec-core >= 2.13.0
+BuildRequires:	ruby-rspec-expectations < 2.14
+BuildRequires:	ruby-rspec-expectations >= 2.13.0
+BuildRequires:	ruby-rspec-mocks < 2.14
+BuildRequires:	ruby-rspec-mocks >= 2.13.0
 #BuildRequires:	ruby-rspec_junit_formatter
 #BuildRequires:	ruby-sdoc
 %endif
 Requires:	lsb-release
 Requires:	poldek >= 0.30
 Requires:	ruby >= 1:1.9.3.429-4
+Requires:	ruby-diff-lcs < 2
+Requires:	ruby-diff-lcs >= 1.2
+Requires:	ruby-diff-lcs >= 1.2.4
 Requires:	ruby-erubis
 Requires:	ruby-highline >= 1.6.9
 Requires:	ruby-json >= 1.4.4
+Requires:	ruby-mime-types < 2
+Requires:	ruby-mime-types >= 1.16
 Requires:	ruby-mixlib-authentication >= 1.3.0
 Requires:	ruby-mixlib-cli >= 1.3.0
-Requires:	ruby-mixlib-config >= 1.1.2
+Requires:	ruby-mixlib-config < 3
+Requires:	ruby-mixlib-config >= 2.0
 Requires:	ruby-mixlib-log >= 1.3.0
-Requires:	ruby-mixlib-shellout
+Requires:	ruby-mixlib-shellout >= 1.2
 Requires:	ruby-net-ssh >= 2.6
 Requires:	ruby-net-ssh-multi >= 1.1.0
-Requires:	ruby-ohai >= 0.6.0
+Requires:	ruby-ohai < 7
+Requires:	ruby-ohai >= 6.0
+Requires:	ruby-pry < 1
+Requires:	ruby-pry >= 0.9
+Requires:	ruby-puma < 2
+Requires:	ruby-puma >= 1.6
 Requires:	ruby-rest-client >= 1.0.4
 Requires:	ruby-rubygems
 Requires:	ruby-yajl >= 1.1
+Suggests:	chef-zero >= 1.6.2
 BuildArch:	noarch
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
+# do not generate python dependency, yum support is optional
+%define		_noautoreqfiles %{ruby_vendorlibdir}/chef/provider/package/yum-dump.py
+
 %description
 A systems integration framework, built to bring the benefits of
 configuration management to your entire infrastructure.
 
+%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
@@ -81,13 +107,16 @@ rspec spec
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT{%{ruby_vendorlibdir},%{_bindir},%{_mandir}/man1} \
-	$RPM_BUILD_ROOT{%{_sysconfdir},/var/{cache,lib}}/%{name}
+install -d $RPM_BUILD_ROOT{%{ruby_vendorlibdir},%{_bindir},%{_mandir}/man1,%{systemdtmpfilesdir}} \
+	$RPM_BUILD_ROOT{%{_sysconfdir}/%{name},/var/{run/%{name},cache/%{name},lib/%{name}/{roles,data_bags,environments}}}
+
 cp -a lib/* $RPM_BUILD_ROOT%{ruby_vendorlibdir}
 cp -a bin/* $RPM_BUILD_ROOT%{_bindir}
 cp -a distro/common/man/* $RPM_BUILD_ROOT%{_mandir}
+%{__rm} $RPM_BUILD_ROOT%{_mandir}/man1/README.md
 
 cp -p %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/chef.rb
+cp -p %{SOURCE2} $RPM_BUILD_ROOT%{systemdtmpfilesdir}/%{name}.conf
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -102,34 +131,58 @@ rm -rf $RPM_BUILD_ROOT
 %attr(755,root,root) %{_bindir}/chef-service-manager
 %attr(755,root,root) %{_bindir}/chef-shell
 %attr(755,root,root) %{_bindir}/chef-solo
-%attr(755,root,root) %{_bindir}/knife
 %attr(755,root,root) %{_bindir}/shef
 %{_mandir}/man1/chef-shell.1*
+%{_mandir}/man8/chef-client.8*
+%{_mandir}/man8/chef-solo.8*
+%{ruby_vendorlibdir}/chef.rb
+%{ruby_vendorlibdir}/chef
+%exclude %{ruby_vendorlibdir}/chef/knife
+%exclude %{ruby_vendorlibdir}/chef/application/knife.rb
+%exclude %{ruby_vendorlibdir}/chef/chef_fs/knife.rb
+%exclude %{ruby_vendorlibdir}/chef/knife.rb
+%{systemdtmpfilesdir}/chef.conf
+
+%dir /var/lib/%{name}
+%dir /var/lib/%{name}/roles
+%dir /var/lib/%{name}/data_bags
+%dir /var/lib/%{name}/environments
+
+%dir /var/cache/%{name}
+%dir /var/run/%{name}
+
+%files -n knife
+%defattr(644,root,root,755)
+%attr(755,root,root) %{_bindir}/knife
+%{ruby_vendorlibdir}/chef/knife.rb
+%{ruby_vendorlibdir}/chef/knife
+%{ruby_vendorlibdir}/chef/application/knife.rb
+%{ruby_vendorlibdir}/chef/chef_fs/knife.rb
 %{_mandir}/man1/knife-bootstrap.1*
 %{_mandir}/man1/knife-client.1*
 %{_mandir}/man1/knife-configure.1*
 %{_mandir}/man1/knife-cookbook-site.1*
 %{_mandir}/man1/knife-cookbook.1*
 %{_mandir}/man1/knife-data-bag.1*
+%{_mandir}/man1/knife-delete.1*
+%{_mandir}/man1/knife-deps.1*
+%{_mandir}/man1/knife-diff.1*
+%{_mandir}/man1/knife-download.1*
+%{_mandir}/man1/knife-edit.1*
 %{_mandir}/man1/knife-environment.1*
 %{_mandir}/man1/knife-exec.1*
-%{_mandir}/man1/knife-index.1*
+%{_mandir}/man1/knife-index-rebuild.1*
+%{_mandir}/man1/knife-list.1*
 %{_mandir}/man1/knife-node.1*
+%{_mandir}/man1/knife-raw.1*
+%{_mandir}/man1/knife-recipe-list.1*
 %{_mandir}/man1/knife-role.1*
 %{_mandir}/man1/knife-search.1*
+%{_mandir}/man1/knife-show.1*
 %{_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
-
-%dir /var/lib/%{name}
-%dir /var/cache/%{name}