From 3859616dee3b8fd4bf55668843e7b68ca257b325ae5259706c8e0521c5887207 Mon Sep 17 00:00:00 2001 From: Christophe Giboudeaux Date: Fri, 21 Dec 2018 09:40:44 +0000 Subject: [PATCH] Accepting request 660113 from home:TheBlackCat:branches:KDE:Qt5 - Use upstream-recommended %{_rpmconfigdir}/macros.d directory for the rpm macros. OBS-URL: https://build.opensuse.org/request/show/660113 OBS-URL: https://build.opensuse.org/package/show/KDE:Qt5/python-sip?expand=0&rev=21 --- python-sip.changes | 6 ++++++ python-sip.spec | 14 +++++++------- 2 files changed, 13 insertions(+), 7 deletions(-) diff --git a/python-sip.changes b/python-sip.changes index 3f16216..97c5788 100644 --- a/python-sip.changes +++ b/python-sip.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Wed Dec 19 19:54:05 UTC 2018 - Todd R + +- Use upstream-recommended %{_rpmconfigdir}/macros.d directory + for the rpm macros. + ------------------------------------------------------------------- Sun Oct 21 09:31:18 UTC 2018 - Christophe Giboudeaux diff --git a/python-sip.spec b/python-sip.spec index 24124e2..2843b86 100644 --- a/python-sip.spec +++ b/python-sip.spec @@ -167,19 +167,19 @@ popd %fdupes %{buildroot}%{python_sitearch} } -mkdir -p %{buildroot}/%{_sysconfdir}/rpm/ +mkdir -p %{buildroot}%{_rpmconfigdir}/macros.d -echo "%%python_sip_api_ver %{python_sip_api}" > %{buildroot}/%{_sysconfdir}/rpm/macros.python_all-sip +echo "%%python_sip_api_ver %{python_sip_api}" > %{buildroot}%{_rpmconfigdir}/macros.d/macros.python_all-sip %if 0%{?have_python2} -echo "%%requires_python2_sip_api Requires: %{python2_prefix}-sip(api) = %%python_sip_api_ver" > %{buildroot}/%{_sysconfdir}/rpm/macros.%{python2_prefix}-sip -echo "%%requires_python_sip_api Requires: %{python2_prefix}-sip(api) = %%python_sip_api_ver" >> %{buildroot}/%{_sysconfdir}/rpm/macros.%{python2_prefix}-sip +echo "%%requires_python2_sip_api Requires: %{python2_prefix}-sip(api) = %%python_sip_api_ver" > %{buildroot}%{_rpmconfigdir}/macros.d/macros.%{python2_prefix}-sip +echo "%%requires_python_sip_api Requires: %{python2_prefix}-sip(api) = %%python_sip_api_ver" >> %{buildroot}%{_rpmconfigdir}/macros.d/macros.%{python2_prefix}-sip %py_compile %{buildroot}%{python2_sitearch} %endif %if 0%{?have_python3} -echo "%%requires_python3_sip_api Requires: %{python3_prefix}-sip(api) = %%python_sip_api_ver" > %{buildroot}/%{_sysconfdir}/rpm/macros.%{python3_prefix}-sip +echo "%%requires_python3_sip_api Requires: %{python3_prefix}-sip(api) = %%python_sip_api_ver" > %{buildroot}%{_rpmconfigdir}/macros.d/macros.%{python3_prefix}-sip %py3_compile %{buildroot}%{python3_sitearch} %endif @@ -203,7 +203,7 @@ mkdir -p %{buildroot}%{_datadir}/sip %files %{python_files devel} %license LICENSE* -%config %{_sysconfdir}/rpm/macros.%{python_prefix}-sip +%{_rpmconfigdir}/macros.d/macros.%{python_prefix}-sip %python_alternative %{_bindir}/sip %dir %{python_sitearch}/PyQt5 %{python_sitearch}/PyQt5/sip.pyi @@ -220,7 +220,7 @@ mkdir -p %{buildroot}%{_datadir}/sip %files -n python-sip-common %license LICENSE* -%config %{_sysconfdir}/rpm/macros.python_all-sip +%{_rpmconfigdir}/macros.d/macros.python_all-sip %{_datadir}/sip/ %changelog