[packages/systemd] Fix build with %{__python} pointing to python2
jajcus
jajcus at pld-linux.org
Fri Dec 25 12:43:04 CET 2015
commit 039b2721bec470d47855572db8077d57d9eb1667
Author: Jacek Konieczny <jajcus at jajcus.net>
Date: Fri Dec 25 11:23:30 2015 +0100
Fix build with %{__python} pointing to python2
Release: 11
systemd.spec | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
---
diff --git a/systemd.spec b/systemd.spec
index 32de679..c462207 100644
--- a/systemd.spec
+++ b/systemd.spec
@@ -28,7 +28,7 @@ Summary(pl.UTF-8): systemd - zarządca systemu i usług dla Linuksa
Name: systemd
# Verify ChangeLog and NEWS when updating (since there are incompatible/breaking changes very often)
Version: 221
-Release: 10
+Release: 11
Epoch: 1
License: GPL v2+ (udev), LGPL v2.1+ (the rest)
Group: Base
@@ -119,6 +119,7 @@ BuildRequires: python-modules
BuildRequires: python3-devel
BuildRequires: python3-lxml
BuildRequires: python3-modules
+BuildRequires: rpm-build >= 5.4.15-28
%endif
%{?with_qrencode:BuildRequires: qrencode-devel}
BuildRequires: rpm-pythonprov
@@ -877,7 +878,7 @@ install -d $RPM_BUILD_ROOT/var/log
# install Python2 files, binaries built and saved earlier
install -d $RPM_BUILD_ROOT%{py_sitedir}/systemd
cp -a $RPM_BUILD_ROOT%{py3_sitedir}/systemd/*.py $RPM_BUILD_ROOT%{py_sitedir}/systemd
-install -p .libs/python/*.so $RPM_BUILD_ROOT%{py_sitedir}/systemd
+install -p .libs/python2/*.so $RPM_BUILD_ROOT%{py_sitedir}/systemd
%py_comp $RPM_BUILD_ROOT%{py_sitedir}
%py_ocomp $RPM_BUILD_ROOT%{py_sitedir}
%else
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/systemd.git/commitdiff/039b2721bec470d47855572db8077d57d9eb1667
More information about the pld-cvs-commit
mailing list