From ff1df8e1aef99dbdc222c5d5d808494fd08e7f83 Mon Sep 17 00:00:00 2001 From: lutter Date: Thu, 2 Mar 2006 02:13:49 +0000 Subject: 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 --- conf/redhat/puppet.spec | 12 ++++++++---- 1 file 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 - 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 - 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 -- cgit