summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTodd Zullinger <tmz@pobox.com>2008-10-01 19:28:58 -0400
committerTodd Zullinger <tmz@pobox.com>2008-10-01 19:28:58 -0400
commitfe8eaa0f13a2984621c3b10cc71bbf1a82d1c20b (patch)
tree3b8d5e93ce4141dddd8a2869167267b57a6b6810
parentef8b99a2299d3f2fe68d27e734c356fad5063d25 (diff)
downloadpuppet-package.git~-fe8eaa0f13a2984621c3b10cc71bbf1a82d1c20b.zip
puppet-package.git~-fe8eaa0f13a2984621c3b10cc71bbf1a82d1c20b.tar.gz
puppet-package.git~-fe8eaa0f13a2984621c3b10cc71bbf1a82d1c20b.tar.xz
Remove useless %%pbuild macro
-rw-r--r--puppet.spec12
1 files changed, 7 insertions, 5 deletions
diff --git a/puppet.spec b/puppet.spec
index fc32b0f..e61b332 100644
--- a/puppet.spec
+++ b/puppet.spec
@@ -1,5 +1,4 @@
%{!?ruby_sitelibdir: %define ruby_sitelibdir %(ruby -rrbconfig -e 'puts Config::CONFIG["sitelibdir"]')}
-%define pbuild %{_builddir}/%{name}-%{version}
%define confdir conf/redhat
%define has_ruby_abi 0%{?fedora:%fedora} >= 5 || 0%{?rhel:%rhel} >= 5
@@ -8,7 +7,7 @@
Summary: A network tool for managing many disparate systems
Name: puppet
Version: 0.24.5
-Release: 1%{?dist}
+Release: 2%{?dist}
License: GPLv2+
Group: System Environment/Base
@@ -69,14 +68,14 @@ install -d -m0755 %{buildroot}%{_mandir}/man8
install -d -m0755 %{buildroot}%{_localstatedir}/lib/puppet
install -d -m0755 %{buildroot}%{_localstatedir}/run/puppet
install -d -m0755 %{buildroot}%{_localstatedir}/log/puppet
-install -Dp -m0755 %{pbuild}/bin/* %{buildroot}%{_sbindir}
+install -Dp -m0755 bin/* %{buildroot}%{_sbindir}
mv %{buildroot}%{_sbindir}/puppet %{buildroot}%{_bindir}/puppet
mv %{buildroot}%{_sbindir}/ralsh %{buildroot}%{_bindir}/ralsh
mv %{buildroot}%{_sbindir}/filebucket %{buildroot}%{_bindir}/filebucket
mv %{buildroot}%{_sbindir}/puppetrun %{buildroot}%{_bindir}/puppetrun
mv %{buildroot}%{_sbindir}/puppetdoc %{buildroot}%{_bindir}/puppetdoc
-install -Dp -m0644 %{pbuild}/lib/puppet.rb %{buildroot}%{ruby_sitelibdir}/puppet.rb
-cp -a %{pbuild}/lib/puppet %{buildroot}%{ruby_sitelibdir}
+install -Dp -m0644 lib/puppet.rb %{buildroot}%{ruby_sitelibdir}/puppet.rb
+cp -a lib/puppet %{buildroot}%{ruby_sitelibdir}
find %{buildroot}%{ruby_sitelibdir} -type f -perm +ugo+x -print0 | xargs -0 -r chmod a-x
install -Dp -m0644 %{confdir}/client.sysconfig %{buildroot}%{_sysconfdir}/sysconfig/puppet
install -Dp -m0755 %{confdir}/client.init %{buildroot}%{_initrddir}/puppet
@@ -170,6 +169,9 @@ fi
rm -rf %{buildroot}
%changelog
+* Wed Oct 01 2008 Todd Zullinger <tmz@pobox.com> - 0.24.5-2
+- Remove useless %%pbuild macro
+
* Mon Jul 28 2008 David Lutterkort <dlutter@redhat.com> - 0.24.5-1
- Add /usr/bin/puppetdoc