Merge remote-tracking branch 'qubesos/pr/63'
* qubesos/pr/63: spec.in: add changelog placeholder doc: handle release definition when not being in a git repository Remove _builddir and useless condition on qubes_builder Create .spec.in and Source0
This commit is contained in:
commit
63d294ce92
@ -74,7 +74,10 @@ author = 'Invisible Things Lab'
|
||||
# The short X.Y version.
|
||||
version = open('../version').read().strip()
|
||||
# The full version, including alpha/beta/rc tags.
|
||||
try:
|
||||
release = subprocess.check_output(['git', 'describe', '--long', '--dirty']).strip().decode()
|
||||
except:
|
||||
release = "1"
|
||||
|
||||
# The language for content autogenerated by Sphinx. Refer to documentation
|
||||
# for a list of supported languages.
|
||||
|
@ -1,5 +1,5 @@
|
||||
Name: qubes-core-admin-client
|
||||
Version: %(cat version)
|
||||
Version: @VERSION@
|
||||
Release: 0.1%{?dist}
|
||||
Summary: Qubes OS admin client tools
|
||||
|
||||
@ -23,10 +23,7 @@ BuildRequires: python3-dbus
|
||||
Requires: python3-qubesadmin
|
||||
%endif
|
||||
BuildArch: noarch
|
||||
|
||||
%if 0%{?qubes_builder}
|
||||
%define _builddir %(pwd)
|
||||
%endif
|
||||
Source0: %{name}-%{version}.tar.gz
|
||||
|
||||
%description
|
||||
This package include managemt tools, like qvm-*.
|
||||
@ -65,14 +62,13 @@ Python3 module qubesadmin.
|
||||
%endif
|
||||
|
||||
%prep
|
||||
%if !0%{?qubes_builder}
|
||||
%setup -q
|
||||
%endif
|
||||
|
||||
|
||||
%build
|
||||
make -C doc PYTHON=%{__python3} SPHINXBUILD=sphinx-build-%{python3_version} man
|
||||
|
||||
|
||||
%install
|
||||
rm -rf build
|
||||
%make_install PYTHON=%{__python2}
|
||||
@ -107,4 +103,4 @@ make -C doc DESTDIR=$RPM_BUILD_ROOT \
|
||||
|
||||
|
||||
%changelog
|
||||
|
||||
@CHANGELOG@
|
Loading…
Reference in New Issue
Block a user