diff options
| author | lutter <lutter@980ebf18-57e1-0310-9a29-db15c13687c0> | 2006-03-02 02:13:49 +0000 |
|---|---|---|
| committer | lutter <lutter@980ebf18-57e1-0310-9a29-db15c13687c0> | 2006-03-02 02:13:49 +0000 |
| commit | ff1df8e1aef99dbdc222c5d5d808494fd08e7f83 (patch) | |
| tree | 33d5777e1581cb3b1850019fe6cbc96741757cbf | |
| parent | 2db23173825311bc4a9d6f69e862ce0a9c43fd40 (diff) | |
| download | puppet-ff1df8e1aef99dbdc222c5d5d808494fd08e7f83.tar.gz puppet-ff1df8e1aef99dbdc222c5d5d808494fd08e7f83.tar.xz puppet-ff1df8e1aef99dbdc222c5d5d808494fd08e7f83.zip | |
Remove hte fedora-usermgmt stuff. As it turns out, it's not a Fedora Extras requirement to use it; so we'll just have useradd/groupadd allocate id's dynamically
git-svn-id: https://reductivelabs.com/svn/puppet/trunk@964 980ebf18-57e1-0310-9a29-db15c13687c0
| -rw-r--r-- | conf/redhat/puppet.spec | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/conf/redhat/puppet.spec b/conf/redhat/puppet.spec index 6d09ab953..b1cdeba58 100644 --- a/conf/redhat/puppet.spec +++ b/conf/redhat/puppet.spec @@ -14,7 +14,6 @@ Source: http://reductivelabs.com/downloads/puppet/%{name}-%{version}.tgz Requires: ruby >= 1.8.1 Requires: facter >= 1.1 -Requires: fedora-usermgmt BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArchitectures: noarch @@ -86,9 +85,9 @@ find %{buildroot}%{rubylibdir} -type f -perm +ugo+x -print0 | xargs -0 -r %{__ch %{_sbindir}/puppetca %pre -/usr/sbin/fedora-groupadd 24 puppet -/usr/sbin/fedora-useradd 24 -g puppet -c "Puppet" \ - -s /sbin/nologin -r -d /var/puppet puppet 2> /dev/null || : +/usr/sbin/groupadd -r puppet 2>/dev/null || : +/usr/sbin/useradd -g puppet -c "Puppet" \ + -s /sbin/nologin -r -d /var/puppet puppet 2> /dev/null || : %post touch %{_localstatedir}/log/puppet.log @@ -121,6 +120,11 @@ fi %{__rm} -rf %{buildroot} %changelog +* Wed Mar 1 2006 David Lutterkort <dlutter@redhat.com> - 0.13.5-1 +- Removed use of fedora-usermgmt. It is not required for Fedora Extras and + makes it unnecessarily hard to use this rpm outside of Fedora. Just + allocate the puppet uid/gid dynamically + * Sun Feb 19 2006 David Lutterkort <dlutter@redhat.com> - 0.13.0-4 - Use fedora-usermgmt to create puppet user/group. Use uid/gid 24. Fixed problem with listing fileserver.conf and puppetmaster.conf twice |