Commit 3c5f81d7 authored by Anders Blomdell's avatar Anders Blomdell
Browse files

Make python2 explicit since python3 is now default on Fedora

parent e7848681
...@@ -15,6 +15,7 @@ BuildRequires: gcc ...@@ -15,6 +15,7 @@ BuildRequires: gcc
BuildRequires: ant BuildRequires: ant
BuildRequires: java BuildRequires: java
BuildRequires: mono-core BuildRequires: mono-core
BuildRequires: python2-devel
%description %description
LabComm communication protocol LabComm communication protocol
...@@ -67,8 +68,8 @@ install -m u=r,g=r,o=r lib/csharp/labcomm2006.dll ${RPM_BUILD_ROOT}/usr/lib ...@@ -67,8 +68,8 @@ install -m u=r,g=r,o=r lib/csharp/labcomm2006.dll ${RPM_BUILD_ROOT}/usr/lib
# #
# Python # Python
# #
install -d ${RPM_BUILD_ROOT}/%{python_sitelib}/labcomm2006 install -d ${RPM_BUILD_ROOT}/%{python2_sitelib}/labcomm2006
install lib/python/labcomm2006/* ${RPM_BUILD_ROOT}/%{python_sitelib}/labcomm2006 install lib/python/labcomm2006/* ${RPM_BUILD_ROOT}/%{python2_sitelib}/labcomm2006
%files %files
%defattr (-, root, root) %defattr (-, root, root)
...@@ -112,5 +113,5 @@ COMMIT=$(git rev-parse HEAD) ...@@ -112,5 +113,5 @@ COMMIT=$(git rev-parse HEAD)
git archive --format tar HEAD git archive --format tar HEAD
) > rpmbuild/SOURCES/labcomm.${DESCRIBE}.tar.gz ) > rpmbuild/SOURCES/labcomm.${DESCRIBE}.tar.gz
rpmbuild --define "_topdir $(pwd)/rpmbuild" \ 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/* . mv rpmbuild/SRPMS/* .
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment