QubesOS/qubes-linux-utils
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

rpm: adjust for fc29

Browse Source 
Don't rely on python -> python2 symlink and default %{python_*} macros.
Add explicit BR: gcc (default build env for fc29 doesn't have it
anymore).

QubesOS/qubes-issues#4223
This commit is contained in:
Marek Marczykowski-Górecki 2018-10-02 20:53:08 +02:00
parent 6cd4a1b888
commit 3ca9f130b7
No known key found for this signature in database
GPG Key ID: 063938BA42CFA724
1 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
rpm_spec/qubes-utils.spec.in
View File

@ -29,6 +29,7 @@ BuildRequires: python2-rpm-macros
BuildRequires: python3-rpm-macros BuildRequires: python3-rpm-macros
# for meminfo-writer # for meminfo-writer
BuildRequires: xen-devel BuildRequires: xen-devel
BuildRequires: gcc
%description %description
Common Linux files for Qubes Dom0 and VM Common Linux files for Qubes Dom0 and VM
@ -89,6 +90,7 @@ Libraries for qubes-utils
%setup -q %setup -q
%build %build
export PYTHON=%{__python2}
make all BACKEND_VMM=@BACKEND_VMM@ make all BACKEND_VMM=@BACKEND_VMM@
%install %install
@ -125,11 +127,11 @@ rm -rf $RPM_BUILD_ROOT
%{_unitdir}/qubes-meminfo-writer-dom0.service %{_unitdir}/qubes-meminfo-writer-dom0.service
%files -n python2-qubesimgconverter %files -n python2-qubesimgconverter
%{python_sitelib}/qubesimgconverter/__init__.py* %{python2_sitelib}/qubesimgconverter/__init__.py*
%{python_sitelib}/qubesimgconverter/imggen.py* %{python2_sitelib}/qubesimgconverter/imggen.py*
%{python_sitelib}/qubesimgconverter/test.py* %{python2_sitelib}/qubesimgconverter/test.py*
%{python_sitelib}/qubesimgconverter/test_integ.py* %{python2_sitelib}/qubesimgconverter/test_integ.py*
%{python_sitelib}/qubesimgconverter-%{version}-py?.?.egg-info %{python2_sitelib}/qubesimgconverter-%{version}-py?.?.egg-info
%if 0%{?rhel} >= 7 %if 0%{?rhel} >= 7
%files -n python34-qubesimgconverter %files -n python34-qubesimgconverter