Hello community, here is the log from the commit of package puppet for openSUSE:Factory checked in at 2013-09-11 15:46:27 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/puppet (Old) and /work/SRC/openSUSE:Factory/.puppet.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "puppet" Changes: -------- --- /work/SRC/openSUSE:Factory/puppet/puppet.changes 2013-09-02 16:50:05.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.puppet.new/puppet.changes 2013-09-11 15:46:28.000000000 +0200 @@ -1,0 +2,13 @@ +Tue Sep 10 17:31:19 UTC 2013 - darin@darins.net + +- more specificity in packaging the extensions + +------------------------------------------------------------------- +Fri Sep 6 18:42:39 UTC 2013 - darin@darins.net + +- Install puppet extension data from ext/ + - vim syntax and emacs-mode + - openldap schema + - rack config.ru and apache2.conf examples + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ puppet.spec ++++++ --- /var/tmp/diff_new_pack.38JD8i/_old 2013-09-11 15:46:29.000000000 +0200 +++ /var/tmp/diff_new_pack.38JD8i/_new 2013-09-11 15:46:29.000000000 +0200 @@ -48,6 +48,10 @@ BuildRequires: fdupes BuildRequires: ruby >= 1.8.7 BuildRequires: rubygem-hiera >= 1.0.0 +# not really required but we do not wanna own their folders +BuildRequires: vim +BuildRequires: emacs-nox + BuildRoot: %{_tmppath}/%{name}-%{version}-build Requires(pre): %fillup_prereq Requires(pre): %insserv_prereq @@ -119,6 +123,42 @@ cp %{SOURCE4} %{buildroot}%{_localstatedir}/adm/fillup-templates/sysconfig.puppetmasterd %fdupes -s %{buildroot}/%{_mandir} +# puppet ext/ data +install -d -m0755 %{buildroot}%{_datadir}/%{name} +install -d -m0755 %{buildroot}%{_datadir}/%{name}/ext + +# be specific, we don't need/want the OS specific stuff +for ii in \ + autotest \ + cert_inspector \ + dbfix.sql \ + envpuppet \ + ldap \ + logcheck \ + nagios \ + puppetlisten \ + puppet-load.rb \ + puppet-test \ + pure_ruby_dsl \ + rack \ + regexp_nodes \ + upload_facts.rb \ + yaml_nodes.rb +do + cp -a ext/$ii %{buildroot}%{_datadir}/%{name}/ext +done + +# Install vim syntax files +vimdir=%{buildroot}%{_datadir}/vim/site +install -Dp -m0644 ext/vim/ftdetect/puppet.vim $vimdir/ftdetect/puppet.vim +install -Dp -m0644 ext/vim/syntax/puppet.vim $vimdir/syntax/puppet.vim + +# Install emacs mode files +emacsdir=%{buildroot}%{_datadir}/emacs/site-lisp +install -Dp -m0644 ext/emacs/puppet-mode.el $emacsdir/puppet-mode.el +install -Dp -m0644 ext/emacs/puppet-mode-init.el \ + $emacsdir/site-start.d/puppet-mode-init.el + %pre getent group puppet >/dev/null || /usr/sbin/groupadd -r puppet getent passwd puppet >/dev/null || /usr/sbin/useradd -r -g puppet -d /var/lib/puppet -s /bin/false -c "Puppet daemon" puppet @@ -156,6 +196,33 @@ %dir %{_sysconfdir}/puppet %dir %{_localstatedir}/lib/puppet %dir %{_localstatedir}/log/puppet +# emacs-mode files +%{_datadir}/emacs/site-lisp/puppet-mode.el +# emacs by default does not own it so we must own it... +%dir %{_datadir}/emacs/site-lisp/site-start.d +%{_datadir}/emacs/site-lisp/site-start.d/puppet-mode-init.el +# vim support files +%{_datadir}/vim/site/ftdetect/puppet.vim +%{_datadir}/vim/site/syntax/puppet.vim +# puppet extensions +%dir %{_datadir}/%{name} +%dir %{_datadir}/%{name}/ext +%{_datadir}/%{name}/ext/autotest +%{_datadir}/%{name}/ext/cert_inspector +%{_datadir}/%{name}/ext/dbfix.sql +%{_datadir}/%{name}/ext/envpuppet +%{_datadir}/%{name}/ext/ldap +%{_datadir}/%{name}/ext/logcheck +%{_datadir}/%{name}/ext/nagios +%{_datadir}/%{name}/ext/puppetlisten +%{_datadir}/%{name}/ext/puppet-load.rb +%{_datadir}/%{name}/ext/puppet-test +%{_datadir}/%{name}/ext/pure_ruby_dsl +%{_datadir}/%{name}/ext/rack +%{_datadir}/%{name}/ext/regexp_nodes +%{_datadir}/%{name}/ext/upload_facts.rb +%{_datadir}/%{name}/ext/yaml_nodes.rb +# %config %{_sysconfdir}/puppet/puppet.conf %config %{_sysconfdir}/puppet/auth.conf %{_mandir}/man?/* -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org