Permalink
Browse files

Merge branch '1.0rc' into 1.x

  • Loading branch information...
2 parents f7b45bb + 4fe28b5 commit df1a6a45251813f92fbe2942509ba0beb01f4dd9 @haus haus committed Aug 14, 2012
Showing with 6 additions and 2 deletions.
  1. +1 −1 Rakefile
  2. +1 −0 ext/debian/rules
  3. +3 −1 ext/redhat/hiera-puppet.spec.erb
  4. +1 −0 tasks/apple.rake
View
@@ -17,7 +17,7 @@ spec = Gem::Specification.new do |s|
s.require_path = "lib"
s.test_files = FileList["spec/**/*.rb"].to_a
s.has_rdoc = true
- s.add_dependency 'hiera', '~>1.0'
+ s.add_dependency 'hiera', '>=1.0.0rc'
s.executables = "extlookup2hiera"
end
View
@@ -23,6 +23,7 @@ install/hiera-puppet::
mkdir -p $(BIN_DIR)
mkdir -p $(DOC_DIR)
cp -pr lib/hiera $(RUBYLIB)
+ cp -p lib/hiera_puppet.rb $(RUBYLIB)
cp -pr lib/puppet $(RUBYLIB)
cp -p bin/extlookup2hiera $(BIN_DIR)
cp -p CHANGELOG COPYING README.md $(DOC_DIR)
@@ -10,7 +10,7 @@ Name: hiera-puppet
Version: %{rpmversion}
Release: <%= @release -%>%{?dist}
Summary: A data backend for Hiera that can query the internal Puppet scope for data.
-
+Vendor: %{?_host_vendor}
Group: System Environment/Base
License: Apache 2.0
URL: http://projects.puppetlabs.com/projects/%{name}/
@@ -38,6 +38,7 @@ rm -rf $RPM_BUILD_ROOT
mkdir -p $RPM_BUILD_ROOT/%{ruby_sitelibdir}
mkdir -p $RPM_BUILD_ROOT/%{_bindir}
cp -pr lib/hiera $RPM_BUILD_ROOT/%{ruby_sitelibdir}
+cp -p lib/hiera_puppet.rb $RPM_BUILD_ROOT/%{ruby_sitelibdir}
cp -pr lib/puppet $RPM_BUILD_ROOT/%{ruby_sitelibdir}
install -p -m0755 bin/extlookup2hiera $RPM_BUILD_ROOT/%{_bindir}
@@ -49,6 +50,7 @@ rm -rf $RPM_BUILD_ROOT
%defattr(-,root,root,-)
%{_bindir}/extlookup2hiera
%{ruby_sitelibdir}/hiera/scope.rb
+%{ruby_sitelibdir}/hiera_puppet.rb
%{ruby_sitelibdir}/hiera/backend/puppet_backend.rb
%{ruby_sitelibdir}/puppet/parser/functions/hiera.rb
%{ruby_sitelibdir}/puppet/parser/functions/hiera_array.rb
View
@@ -125,6 +125,7 @@ def pack_source
# Make all necessary directories
directories = ["#{work}/usr/bin",
"#{work}/usr/share/doc/#{@package_name}",
+ "#{work}/usr/lib/ruby/site_ruby/1.8",
"#{work}/usr/lib/ruby/site_ruby/1.8/hiera",
"#{work}/usr/lib/ruby/site_ruby/1.8/puppet"]
FileUtils.mkdir_p(directories)

0 comments on commit df1a6a4

Please sign in to comment.