Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package osc for openSUSE:Factory checked in at 2021-05-11 23:04:16 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/osc (Old) and /work/SRC/openSUSE:Factory/.osc.new.2988 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "osc" Tue May 11 23:04:16 2021 rev:154 rq:892208 version:0.172.0 Changes: -------- --- /work/SRC/openSUSE:Factory/osc/osc.changes 2021-01-27 19:02:47.844856963 +0100 +++ /work/SRC/openSUSE:Factory/.osc.new.2988/osc.changes 2021-05-11 23:04:25.780883979 +0200 @@ -1,0 +2,5 @@ +Wed May 5 13:55:44 UTC 2021 - Dominique Leuenberger <[email protected]> + +- Install macros.osc to %{_rpmmacrodir}, not to /etc/rpm. + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ osc.spec ++++++ --- /var/tmp/diff_new_pack.DYnvjm/_old 2021-05-11 23:04:26.296881625 +0200 +++ /var/tmp/diff_new_pack.DYnvjm/_new 2021-05-11 23:04:26.300881607 +0200 @@ -30,6 +30,9 @@ %define version_unconverted 0.172.0 %define osc_plugin_dir %{_prefix}/lib/osc-plugins %define macros_file macros.osc +%if ! %{defined _rpmmacrodir} + %define _rpmmacrodir %{_sysconfdir}/rpm +%endif Name: osc Version: 0.172.0 @@ -71,20 +74,20 @@ Requires: python-elementtree %endif %if 0%{?suse_version} > 1000 -Recommends: diffstat Recommends: build -Recommends: sudo -Recommends: powerpc32 Recommends: ca-certificates +Recommends: diffstat +Recommends: powerpc32 +Recommends: sudo # These packages are needed for "osc add $URL" Recommends: obs-service-recompress -Recommends: obs-service-set_version -Recommends: obs-service-tar_scm -Recommends: obs-service-obs_scm -Recommends: obs-service-verify_file Recommends: obs-service-download_files Recommends: obs-service-format_spec_file +Recommends: obs-service-obs_scm +Recommends: obs-service-set_version Recommends: obs-service-source_validator +Recommends: obs-service-tar_scm +Recommends: obs-service-verify_file Recommends: xdg-utils # for osc >= 0.167.0 the newest build version is needed. # Otherwise osc chroot might not work correctly. @@ -134,6 +137,7 @@ %else %{!?python_sitelib: %define python_sitelib %(python -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")} %endif + %description Commandline client for the Open Build Service. @@ -176,7 +180,7 @@ install -Dm644 osc.fish %{buildroot}%{_datadir}/fish/vendor_completions.d/osc.fish -install -m644 %{macros_file} -D %{buildroot}%{_sysconfdir}/rpm/%{macros_file} +install -m644 %{macros_file} -D %{buildroot}%{_rpmmacrodir}/%{macros_file} %if 0%{?suse_version} >= 1500 %check @@ -203,7 +207,7 @@ %else %config %{_sysconfdir}/profile.d/osc.sh %endif -%config %{_sysconfdir}/rpm/%{macros_file} +%{_rpmmacrodir}/%{macros_file} %dir %{_localstatedir}/lib/osc-plugins %{_mandir}/man1/osc.* %if 0%{?suse_version} > 1110
