From 228d743281f853be1f7505251005c62cc9cf0412a63bcc5f01e94e0ec91dc337 Mon Sep 17 00:00:00 2001 From: Matej Cepl Date: Thu, 20 Dec 2018 00:22:31 +0000 Subject: [PATCH] Accepting request 660118 from home:TheBlackCat:branches:devel:languages:python:Factory - Use upstream-recommended %{_rpmconfigdir}/macros.d directory for the rpm macros. OBS-URL: https://build.opensuse.org/request/show/660118 OBS-URL: https://build.opensuse.org/package/show/devel:languages:python:Factory/python?expand=0&rev=237 --- python-base.changes | 6 ++++++ python-base.spec | 6 +++--- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/python-base.changes b/python-base.changes index f5642d8..f9cbe9b 100644 --- a/python-base.changes +++ b/python-base.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Wed Dec 19 19:29:44 UTC 2018 - Todd R + +- Use upstream-recommended %{_rpmconfigdir}/macros.d directory + for the rpm macros. + ------------------------------------------------------------------- Fri Oct 26 10:48:44 UTC 2018 - Tomáš Chvátal diff --git a/python-base.spec b/python-base.spec index 0b6e11f..d647f25 100644 --- a/python-base.spec +++ b/python-base.spec @@ -275,8 +275,8 @@ find . -name '*.py' -type f | grep -vE "^./Parser/|^./Python/" \ ######################################## %make_install OPT="%{optflags} -fPIC" install -m 644 %{SOURCE5} %{buildroot}%{_libdir}/python%{python_version}/site-packages/_local.pth -install -d -m 755 %{buildroot}%{_sysconfdir}/rpm -install -m 644 %{SOURCE1} %{buildroot}%{_sysconfdir}/rpm +install -d -m 755 %{buildroot}%{_rpmconfigdir}/macros.d/ +install -m 644 %{SOURCE1} %{buildroot}%{_rpmconfigdir}/macros.d/ # make sure /usr/lib/python/site-packages exists even on lib64 machines mkdir -p %{buildroot}%{_prefix}/lib/python%{python_version}/site-packages ######################################## @@ -348,7 +348,7 @@ cp Makefile Makefile.pre.in Makefile.pre %{buildroot}%{_libdir}/python%{python_v %files %defattr(644, root, root, 755) -%config %{_sysconfdir}/rpm/macros.python2 +%{_rpmconfigdir}/macros.d/macros.python2 %dir %{_docdir}/%{name} %doc %{_docdir}/%{name}/README %doc %{_docdir}/%{name}/LICENSE