Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package 000package-groups for openSUSE:Factory checked in at 2022-11-30 14:58:57 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/000package-groups (Old) and /work/SRC/openSUSE:Factory/.000package-groups.new.1597 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "000package-groups" Wed Nov 30 14:58:57 2022 rev:213 rq:1038879 version:unknown Changes: -------- New Changes file: NO CHANGES FILE!!! ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ MicroOS-release.spec.in ++++++ --- /var/tmp/diff_new_pack.pAlw2f/_old 2022-11-30 14:59:00.345059305 +0100 +++ /var/tmp/diff_new_pack.pAlw2f/_new 2022-11-30 14:59:00.345059305 +0100 @@ -183,24 +183,22 @@ ___FLAVOR_PACKAGES___ %prep +%setup -qcT +mkdir license +if [ -f /CD1/license.tar.gz ]; then + tar -C license -xzf /CD1/license.tar.gz +elif [ -f %{_prefix}/lib/skelcd/CD1/license.tar.gz ]; then + tar -C license -xzf %{_prefix}/lib/skelcd/CD1/license.tar.gz +fi %build %install -mkdir -p %{buildroot}%{_sysconfdir} -mkdir -p %{buildroot}%{_prefix}/lib/issue.d +mkdir -p %{buildroot}%{_sysconfdir} %{buildroot}%{_prefix}/lib/issue.d %{buildroot}/run + echo -e "\nWelcome to ___SUMMARY___ (%{_target_cpu}) - Kernel \\\r (\\\l).\n" > %{buildroot}%{_prefix}/lib/issue.d/10-OS echo -e "\n" > %{buildroot}%{_prefix}/lib/issue.d/90-OS -# Put EULA into correct place -mkdir -p %{buildroot}/%{_sysconfdir}/YaST2/licenses/base -cd %{buildroot}/%{_sysconfdir}/YaST2/licenses/base -if [ -f /CD1/license.tar.gz ]; then - tar -xzf /CD1/license.tar.gz -elif [ -f %{_prefix}/lib/skelcd/CD1/license.tar.gz ]; then - tar -xzf %{_prefix}/lib/skelcd/CD1/license.tar.gz -fi - VERSION_ID=`echo %{version}|tr '[:upper:]' '[:lower:]'|sed -e 's/ //g;'` # note: VERSION is an optional field and has no meaning other than informative on a rolling distro # We do thus not add it to the os-release file @@ -220,6 +218,15 @@ EOF ln -s ..%{_prefix}/lib/os-release %{buildroot}%{_sysconfdir}/os-release +# Put EULA into correct place +install -D -d -m 755 "%{buildroot}%_defaultlicensedir/product/base" +install -D -d -m 755 "%{buildroot}%_defaultlicensedir" +cp -a license "%{buildroot}%_defaultlicensedir/%name" +pushd license +for i in *; do + ln -s "%_defaultlicensedir/%name/$i" %{buildroot}%_defaultlicensedir/product/base/$i +done + ___CREATE_PRODUCT_FILES___ %post @@ -237,16 +244,13 @@ %files %defattr(644,root,root,755) +%dir %_defaultlicensedir/product +%_defaultlicensedir/product/base +%license license/* %{_sysconfdir}/os-release %{_prefix}/lib/os-release %dir %{_sysconfdir}/products.d %{_sysconfdir}/products.d/* -%dir %{_sysconfdir}/YaST2/ -%dir %{_sysconfdir}/YaST2/licenses/ -%dir %{_sysconfdir}/YaST2/licenses/base/ -# no %doc here, or we will not install them -%{_sysconfdir}/YaST2/licenses/base/license*txt -%{_sysconfdir}/YaST2/licenses/base/no-acceptance-needed %dir %{_prefix}/lib/issue.d %{_prefix}/lib/issue.d/*-OS ++++++ openSUSE-release.spec.in ++++++ --- /var/tmp/diff_new_pack.pAlw2f/_old 2022-11-30 14:59:00.509060208 +0100 +++ /var/tmp/diff_new_pack.pAlw2f/_new 2022-11-30 14:59:00.513060230 +0100 @@ -235,9 +235,7 @@ mkdir -p %{buildroot}%{_sysconfdir}/zypp/vendors.d echo -e "[main]\nvendors=openSUSE,SUSE,SUSE LLC <https://www.suse.com/>\n" > %{buildroot}%{_sysconfdir}/zypp/vendors.d/00-openSUSE.conf - -# fate#319341, make openSUSE-release own YaST license files. TODO: -# get rid of /etc/YaST2/licenses +# fate#319341, make openSUSE-release own YaST license files. install -D -d -m 755 "%{buildroot}%_defaultlicensedir/product/base" install -D -d -m 755 "%{buildroot}%_defaultlicensedir" cp -a license "%{buildroot}%_defaultlicensedir/%name" @@ -271,11 +269,12 @@ %config %{_sysconfdir}/YaST2/control.xml %config %{_sysconfdir}/zypp/vendors.d/00-openSUSE.conf %{_prefix}/lib/motd.d/welcome -%dir %{_prefix}/lib/issue.d/ +%config(noreplace) %{_sysconfdir}/issue.net +%dir %{_sysconfdir}/products.d +%{_sysconfdir}/products.d/* +%dir %{_prefix}/lib/issue.d %{_prefix}/lib/issue.d/10-openSUSE.conf %{_prefix}/lib/issue.d/90-openSUSE.conf -%config(noreplace) %{_sysconfdir}/issue.net -%{_sysconfdir}/products.d %changelog