From 3c5f81d7fe8d11b91ee06151e76e471fc09b040a Mon Sep 17 00:00:00 2001
From: Anders Blomdell <anders.blomdell@control.lth.se>
Date: Mon, 22 Jun 2015 12:25:41 +0200
Subject: [PATCH] Make python2 explicit since python3 is now default on Fedora
---
packaging/make_srpm | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/packaging/make_srpm b/packaging/make_srpm
index 986cfa1..1050962 100755
--- a/packaging/make_srpm
+++ b/packaging/make_srpm
@@ -15,6 +15,7 @@ BuildRequires: gcc
BuildRequires: ant
BuildRequires: java
BuildRequires: mono-core
+BuildRequires: python2-devel
%description
LabComm communication protocol
@@ -67,8 +68,8 @@ install -m u=r,g=r,o=r lib/csharp/labcomm2006.dll ${RPM_BUILD_ROOT}/usr/lib
#
# Python
#
-install -d ${RPM_BUILD_ROOT}/%{python_sitelib}/labcomm2006
-install lib/python/labcomm2006/* ${RPM_BUILD_ROOT}/%{python_sitelib}/labcomm2006
+install -d ${RPM_BUILD_ROOT}/%{python2_sitelib}/labcomm2006
+install lib/python/labcomm2006/* ${RPM_BUILD_ROOT}/%{python2_sitelib}/labcomm2006
%files
%defattr (-, root, root)
@@ -112,5 +113,5 @@ COMMIT=$(git rev-parse HEAD)
git archive --format tar HEAD
) > rpmbuild/SOURCES/labcomm.${DESCRIBE}.tar.gz
rpmbuild --define "_topdir $(pwd)/rpmbuild" \
- -bs rpmbuild/SPECS/labcomm.spec
+ -bs rpmbuild/SPECS/labcomm.spec 2>&1 | sed -e 's|rpmbuild/SRPMS/||g'
mv rpmbuild/SRPMS/* .
--
GitLab