>From 3f8ab6eb6fb08ae2eff2dad80e2f961a85d0b90e Mon Sep 17 00:00:00 2001 From: Lukas Slebodnik Date: Wed, 20 Mar 2013 09:51:09 +0100 Subject: [PATCH] Incorrect *.py[co] files placement Package sssd contains python files. Python files which are not packaged in noarch package must be installed in ${python_sitearch} directory and not in ${python_sitelib} directory Autoconf detected variable $(pyexecdir) is equivalent of specfile ${python_sitearch} https://fedorahosted.org/sssd/ticket/1839 --- Makefile.am | 12 ++++++++++-- contrib/sssd.spec.in | 8 ++++---- 2 files changed, 14 insertions(+), 6 deletions(-) diff --git a/Makefile.am b/Makefile.am index 211472195b7d210bc1a1ed3f59612d7007dbc28b..8cafc28341dea9639e75bb7b8c901bbbd7ee6446 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1778,9 +1778,17 @@ endif install-exec-hook: installsssddirs if BUILD_PYTHON_BINDINGS if [ "$(DESTDIR)" = "" ]; then \ - cd $(builddir)/src/config; $(PYTHON) setup.py build --build-base $(abs_builddir)/src/config install $(DISTSETUPOPTS) --prefix=$(PYTHON_PREFIX) --record=$(abs_builddir)/src/config/.files; \ + cd $(builddir)/src/config; \ + $(PYTHON) setup.py build --build-base $(abs_builddir)/src/config install \ + $(DISTSETUPOPTS) --prefix=$(PYTHON_PREFIX) \ + --record=$(abs_builddir)/src/config/.files \ + --install-purelib=$(pyexecdir); \ else \ - cd $(builddir)/src/config; $(PYTHON) setup.py build --build-base $(abs_builddir)/src/config install $(DISTSETUPOPTS) --prefix=$(PYTHON_PREFIX) --root=$(DESTDIR) --record=$(abs_builddir)/src/config/.files; \ + cd $(builddir)/src/config; \ + $(PYTHON) setup.py build --build-base $(abs_builddir)/src/config install \ + $(DISTSETUPOPTS) --prefix=$(PYTHON_PREFIX) \ + --record=$(abs_builddir)/src/config/.files --root=$(DESTDIR) \ + --install-purelib=$(pyexecdir); \ fi endif for doc in $(SSSD_DOCS); do \ diff --git a/contrib/sssd.spec.in b/contrib/sssd.spec.in index dd8113c06a4d98456f928883b085f6ba982eb71c..e86924a428653208d5ef6fd1786c7d056b545540 100644 --- a/contrib/sssd.spec.in +++ b/contrib/sssd.spec.in @@ -317,9 +317,9 @@ rm -Rf ${RPM_BUILD_ROOT}/%{_docdir}/%{name} # Older versions of rpmbuild can only handle one -f option # So we need to append to the sssd.lang file -for file in `ls $RPM_BUILD_ROOT/%{python_sitelib}/*.egg-info 2> /dev/null` +for file in `ls $RPM_BUILD_ROOT/%{python_sitearch}/*.egg-info 2> /dev/null` do - echo %{python_sitelib}/`basename $file` >> sssd.lang + echo %{python_sitearch}/`basename $file` >> sssd.lang done touch sssd_tools.lang @@ -432,8 +432,8 @@ rm -rf $RPM_BUILD_ROOT %{_mandir}/man1/sss_ssh_knownhostsproxy.1* %{python_sitearch}/pysss.so %{python_sitearch}/pysss_murmur.so -%dir %{python_sitelib}/SSSDConfig -%{python_sitelib}/SSSDConfig/*.py* +%dir %{python_sitearch}/SSSDConfig +%{python_sitearch}/SSSDConfig/*.py* %files client -f sssd_client.lang %defattr(-,root,root,-) -- 1.8.1.4