packages: puppet/puppet.spec - fix install, package files

[glen]

Author: glen                         Date: Sat Nov 26 23:17:37 2011 GMT
Module: packages                      Tag: HEAD
---- Log message:
- fix install, package files

---- Files affected:
packages/puppet:
   puppet.spec (1.2 -> 1.3) 

---- Diffs:

================================================================
Index: packages/puppet/puppet.spec
diff -u packages/puppet/puppet.spec:1.2 packages/puppet/puppet.spec:1.3
--- packages/puppet/puppet.spec:1.2	Fri Aug 19 16:42:36 2011
+++ packages/puppet/puppet.spec	Sun Nov 27 00:17:32 2011
@@ -8,7 +8,10 @@
 License:	GPL v2+
 Group:		Networking/Admin
 Source0:	http://puppetlabs.com/downloads/puppet/%{name}-%{version}.tar.gz
-# Source0-md5:	-
+# Source0-md5:	58315e94ff00aedc4a19177877c3e865
+# ftools fix
+Patch0:		https://github.com/housejester/puppet/commit/6409be5b2fde49c21593f557b9174c7e465a422b.patch
+# Patch0-md5:	58315e94ff00aedc4a19177877c3e865
 URL:		http://www.puppetlabs.com/
 BuildRequires:	docutils
 BuildRequires:	rpmbuild(macros) >= 1.277
@@ -42,13 +45,14 @@
 
 %prep
 %setup -q
+%patch0 -p1
 
 %build
 
 %install
 rm -rf $RPM_BUILD_ROOT
-#install -d $RPM_BUILD_ROOT%{ruby_sitelibdir}
 %{__ruby} install.rb \
+	--quick \
 	--no-rdoc \
 	--destdir=$RPM_BUILD_ROOT
 
@@ -58,17 +62,33 @@
 %files
 %defattr(644,root,root,755)
 %doc README CHANGELOG examples
+%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/puppet/auth.conf
 %attr(755,root,root) %{_bindir}/filebucket
+%attr(755,root,root) %{_bindir}/pi
 %attr(755,root,root) %{_bindir}/puppet
-%attr(755,root,root) %{_bindir}/puppetca
-%attr(755,root,root) %{_bindir}/puppetd
 %attr(755,root,root) %{_bindir}/puppetdoc
-%attr(755,root,root) %{_bindir}/puppetmasterd
-%attr(755,root,root) %{_bindir}/puppetrun
 %attr(755,root,root) %{_bindir}/ralsh
+%attr(755,root,root) %{_sbindir}/puppetca
+%attr(755,root,root) %{_sbindir}/puppetd
 %{ruby_sitelibdir}/puppet
 %{ruby_sitelibdir}/puppet.rb
-%{_mandir}/man8/*.8.*
+%{_mandir}/man5/puppet.conf.5*
+%{_mandir}/man8/filebucket.8*
+%{_mandir}/man8/pi.8*
+%{_mandir}/man8/puppet.8*
+%{_mandir}/man8/puppetca.8*
+%{_mandir}/man8/puppetd.8*
+%{_mandir}/man8/puppetdoc.8*
+%{_mandir}/man8/ralsh.8*
+
+%files server
+%defattr(644,root,root,755)
+%attr(755,root,root) %{_sbindir}/puppetmasterd
+%attr(755,root,root) %{_sbindir}/puppetrun
+%attr(755,root,root) %{_sbindir}/puppetqd
+%{_mandir}/man8/puppetmasterd.8*
+%{_mandir}/man8/puppetrun.8*
+%{_mandir}/man8/puppetqd.8*
 
 %define	date	%(echo `LC_ALL="C" date +"%a %b %d %Y"`)
 %changelog
@@ -76,6 +96,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.3  2011/11/26 23:17:32  glen
+- fix install, package files
+
 Revision 1.2  2011/08/19 14:42:36  glen
 - sync descs from fc
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/puppet/puppet.spec?r1=1.2&r2=1.3&f=u