Merge remote-tracking branch 'qubesos/pr/210'
* qubesos/pr/210: spec.in: remove useless condition on Fedora 17 which induces problem with Travis spec.in: add changelog placeholder Define backend_vmm macro doc: handle release definition when not being in a git repository Remove _builddir Create .spec.in and Source0
This commit is contained in:
commit
2706562a6f
@ -66,7 +66,10 @@ copyright = u'2010-{}, Invisible Things Lab'.format(time.strftime('%Y'))
|
||||
# The short X.Y version.
|
||||
version = open('../version').read().strip()
|
||||
# The full version, including alpha/beta/rc tags.
|
||||
release = subprocess.check_output(['git', 'describe', '--long', '--dirty']).strip().decode()
|
||||
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.
|
||||
|
@ -22,18 +22,11 @@
|
||||
#
|
||||
#
|
||||
|
||||
%{!?version: %define version %(cat version)}
|
||||
|
||||
# debug_package hack should be removed when BuildArch:noarch is enabled below
|
||||
%define debug_package %{nil}
|
||||
|
||||
%define _dracutmoddir /usr/lib/dracut/modules.d
|
||||
%if %{fedora} < 17
|
||||
%define _dracutmoddir /usr/share/dracut/modules.d
|
||||
%endif
|
||||
%define backend_vmm @BACKEND_VMM@
|
||||
|
||||
Name: qubes-core-dom0
|
||||
Version: %{version}
|
||||
Version: @VERSION@
|
||||
Release: 1%{dist}
|
||||
Summary: The Qubes core files (Dom0-side)
|
||||
|
||||
@ -111,17 +104,14 @@ Provides: qubes-core-dom0-doc
|
||||
# Prevent preupgrade from installation (it pretend to provide distribution upgrade)
|
||||
Obsoletes: preupgrade < 2.0
|
||||
Provides: preupgrade = 2.0
|
||||
%define _builddir %(pwd)
|
||||
|
||||
Source0: %{name}-%{version}.tar.gz
|
||||
|
||||
%description
|
||||
The Qubes core files for installation on Dom0.
|
||||
|
||||
%prep
|
||||
# we operate on the current directory, so no need to unpack anything
|
||||
# symlink is to generate useful debuginfo packages
|
||||
rm -f %{name}-%{version}
|
||||
ln -sf . %{name}-%{version}
|
||||
%setup -T -D
|
||||
%setup -q
|
||||
|
||||
%build
|
||||
|
||||
@ -448,3 +438,6 @@ fi
|
||||
/etc/xdg/autostart/qrexec-policy-agent.desktop
|
||||
|
||||
/usr/share/doc/qubes/relaxng/*.rng
|
||||
|
||||
%changelog
|
||||
@CHANGELOG@
|
Loading…
Reference in New Issue
Block a user