Please review pull request #56: Split RPM to hiera and hiera-puppet opened by (traylenator)

Description:

This updates the spec file to produce two rpms instead of one

hiera - the standalone application.
hiera-puppet - the puppet functions.

The motivation here is the second package should I believe depend on puppet always
where as the first should clearly not.

hiera-puppet of course pulls in hiera.

  • Opened: Wed May 16 15:54:03 UTC 2012
  • Based on: puppetlabs:master (361dfc60892aa534c536c9feffb1be06caa8e8ca)
  • Requested merge: traylenator:split_rpms (8b6da9e33b55e7e86210094c40c7a436de0e71ee)

Diff follows:

diff --git a/ext/redhat/hiera.spec b/ext/redhat/hiera.spec
index 2e73d2a..e4f40a8 100644
--- a/ext/redhat/hiera.spec
+++ b/ext/redhat/hiera.spec
@@ -22,6 +22,14 @@ Requires:	ruby >= 1.8.5
 %description
 A simple pluggable Hierarchical Database.
 
+%package puppet
+Summary:        A simple pluggable Hierarchical Database.
+Group:          System Environment/Base
+Requires:       hiera-puppet = %{version}-%{release}
+Requires:       puppet
+%description puppet
+Functions to call hiera from within puppet.
+
 %prep
 #%setup -q  -n %{name}-%{version}
 %setup -q  -n %{name}-%{version}rc2
@@ -48,10 +56,12 @@ rm -rf $RPM_BUILD_ROOT
 %{_bindir}/hiera
 %{ruby_sitelibdir}/hiera.rb
 %{ruby_sitelibdir}/hiera
-# Puppet hiera functions
-%{ruby_sitelibdir}/puppet
 %doc CHANGELOG COPYING README.md
 
+%files puppet
+# Puppet hiera functions
+%{ruby_sitelibdir}/puppet/parser/functions/*.rb
+
 
 %changelog
 * Mon May 14 2012 Matthaus Litteken <[email protected]> - 1.0.0-0.1rc2

    

--
You received this message because you are subscribed to the Google Groups "Puppet Developers" group.
To post to this group, send email to [email protected].
To unsubscribe from this group, send email to [email protected].
For more options, visit this group at http://groups.google.com/group/puppet-dev?hl=en.

Reply via email to