Hello community, here is the log from the commit of package yomi-formula for openSUSE:Leap:15.2 checked in at 2020-03-01 20:32:00 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Leap:15.2/yomi-formula (Old) and /work/SRC/openSUSE:Leap:15.2/.yomi-formula.new.26092 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "yomi-formula" Sun Mar 1 20:32:00 2020 rev:2 rq:780638 version:0.0.1+git.1582036279.1c70638 Changes: -------- --- /work/SRC/openSUSE:Leap:15.2/yomi-formula/yomi-formula.changes 2020-02-26 13:31:56.102199405 +0100 +++ /work/SRC/openSUSE:Leap:15.2/.yomi-formula.new.26092/yomi-formula.changes 2020-03-01 20:32:01.305654822 +0100 @@ -1,0 +2,14 @@ +Tue Feb 18 14:34:00 UTC 2020 - Alberto Planas Dominguez <[email protected]> + +- Update to version 0.0.1+git.1582036279.1c70638: + * Revert "init: drop namespace for the check" + +------------------------------------------------------------------- +Tue Feb 18 10:22:10 UTC 2020 - Alberto Planas Dominguez <[email protected]> + +- Update to version 0.0.1+git.1581958876.d324e18: + * metadata: support "after" ordering +- Adjust the ordering of the forms +- Move out the user modules from the susemanager domain + +------------------------------------------------------------------- Old: ---- yomi-0.0.1+git.1579090265.ecae64c.obscpio New: ---- yomi-0.0.1+git.1582036279.1c70638.obscpio ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yomi-formula.spec ++++++ --- /var/tmp/diff_new_pack.5zeFwM/_old 2020-03-01 20:32:02.949658259 +0100 +++ /var/tmp/diff_new_pack.5zeFwM/_new 2020-03-01 20:32:02.997658360 +0100 @@ -20,7 +20,7 @@ %define fdir %{_datadir}/salt-formulas Name: yomi-formula -Version: 0.0.1+git.1579090265.ecae64c +Version: 0.0.1+git.1582036279.1c70638 Release: 0 Summary: Yomi - Yet one more installer License: Apache-2.0 @@ -30,7 +30,8 @@ URL: https://github.com/openSUSE/yomi Source0: %{fname}-%{version}.tar.xz -# On SLE/Leap 15-SP1 and TW requires the new salt-formula configuration location. +# On SLE/Leap 15-SP1 and TW requires the new salt-formula +# configuration location. %if ! (0%{?sle_version:1} && 0%{?sle_version} < 150100) Requires(pre): salt-formulas-configuration %else @@ -61,6 +62,10 @@ # Remove the top.sls, as can overwrite the one from the user rm %{buildroot}%{fdir}/states/top.sls +# Reallocate the user defined modules +mkdir -p %{buildroot}%{_prefix}/lib/%{fname}/ +mv %{buildroot}%{fdir}/states/_* %{buildroot}%{_prefix}/lib/%{fname}/ + # Example of pillars mkdir -p %{buildroot}%{_datadir}/%{fname}/ cp -R pillar %{buildroot}%{_datadir}/%{fname}/ @@ -113,14 +118,15 @@ file_roots: base: - /usr/share/yomi/kubic + - %{_prefix}/lib/%{fname} - /usr/share/salt-formulas/states - /srv/salt EOF -# Metadata, forms and subform (and fake states) -for form in metadata/form*.yml; do - form_name=${form#metadata/form-} - form_name=${form_name%.yml} +# Metadata, forms, subforms, and 'after' order +after='' +for form in metadata/*form*.yml; do + form_name=$(echo $form | sed -n 's/.*-form-\(.*\)\.yml/\1/p') mkdir -p %{buildroot}%{fdir}/metadata/$form_name/ cp -a $form %{buildroot}%{fdir}/metadata/$form_name/form.yml cp metadata/metadata.yml %{buildroot}%{fdir}/metadata/$form_name/ @@ -128,8 +134,22 @@ mkdir -p %{buildroot}%{fdir}/states/$form_name/ touch %{buildroot}%{fdir}/states/$form_name/init.sls fi + # Add the 'after' section to ordering the forms + sed -i "s/#AFTER/$after/g" %{buildroot}%{fdir}/metadata/$form_name/metadata.yml + if [ -z "$after" ]; then + after='after:\n' + fi + after+=" - ${form_name}\n" done +# Configuration file for the master +mkdir -p %{buildroot}%{_sysconfdir}/salt/master.d/ +cat <<EOF > %{buildroot}%{_sysconfdir}/salt/master.d/%{name}.conf +file_roots: + base: + - %{_prefix}/lib/%{fname} +EOF + %files %defattr(-,root,root,-) %license LICENSE @@ -137,10 +157,13 @@ %dir %attr(0755, root, salt) %{fdir}/ %dir %attr(0755, root, salt) %{fdir}/states/ %dir %attr(0755, root, salt) %{fdir}/metadata/ -%dir %attr(0755, root, root) %{_datadir}/%{fname} +%dir %attr(0755, root, root) %{_prefix}/lib/%{fname}/ +%dir %attr(0755, root, root) %{_datadir}/%{fname}/ %{fdir}/states/ %{fdir}/metadata/ +%{_prefix}/lib/%{fname}/ %{_datadir}/%{fname} %{_bindir}/monitor +%config %{_sysconfdir}/salt/master.d/%{name}.conf %changelog ++++++ _servicedata ++++++ --- /var/tmp/diff_new_pack.5zeFwM/_old 2020-03-01 20:32:03.457659322 +0100 +++ /var/tmp/diff_new_pack.5zeFwM/_new 2020-03-01 20:32:03.465659338 +0100 @@ -1,4 +1,4 @@ <servicedata> <service name="tar_scm"> <param name="url">https://github.com/openSUSE/yomi.git</param> - <param name="changesrevision">ecae64c237deabb76182c551fad36ee69955fe57</param></service></servicedata> \ No newline at end of file + <param name="changesrevision">1c70638e55bad3efe243c1466b48514a43d76034</param></service></servicedata> \ No newline at end of file ++++++ yomi-0.0.1+git.1579090265.ecae64c.obscpio -> yomi-0.0.1+git.1582036279.1c70638.obscpio ++++++ ++++ 3970 lines of diff (skipped) ++++++ yomi.obsinfo ++++++ --- /var/tmp/diff_new_pack.5zeFwM/_old 2020-03-01 20:32:04.713661948 +0100 +++ /var/tmp/diff_new_pack.5zeFwM/_new 2020-03-01 20:32:04.737661997 +0100 @@ -1,5 +1,5 @@ name: yomi -version: 0.0.1+git.1579090265.ecae64c -mtime: 1579090265 -commit: ecae64c237deabb76182c551fad36ee69955fe57 +version: 0.0.1+git.1582036279.1c70638 +mtime: 1582036279 +commit: 1c70638e55bad3efe243c1466b48514a43d76034
