rpm: integrate -doc package into main one
It doesn't really make sense to keep man pages in separate package. Previously it was done to avoid some build dependencies (pandoc require a lot of them), but it isn't a problem anymore.
This commit is contained in:
parent
81162a699b
commit
e5596fe1ba
@ -1,5 +1,5 @@
|
||||
ifeq ($(PACKAGE_SET),dom0)
|
||||
RPM_SPEC_FILES := $(addprefix rpm_spec/,core-dom0.spec core-dom0-doc.spec)
|
||||
RPM_SPEC_FILES := rpm_spec/core-dom0.spec
|
||||
WIN_SOURCE_SUBDIRS := .
|
||||
WIN_COMPILER := mingw
|
||||
WIN_PACKAGE_CMD := make msi
|
||||
|
@ -1,61 +0,0 @@
|
||||
#
|
||||
# The Qubes OS Project, http://www.qubes-os.org
|
||||
#
|
||||
# Copyright (C) 2010 Joanna Rutkowska <joanna@invisiblethingslab.com>
|
||||
# Copyright (C) 2010 Rafal Wojtczuk <rafal@invisiblethingslab.com>
|
||||
# Copyright (C) 2012 Marek Marczykowski <marmarek@invisiblethingslab.com>
|
||||
#
|
||||
# This program is free software; you can redistribute it and/or
|
||||
# modify it under the terms of the GNU General Public License
|
||||
# as published by the Free Software Foundation; either version 2
|
||||
# of the License, or (at your option) any later version.
|
||||
#
|
||||
# This program is distributed in the hope that it will be useful,
|
||||
# but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
# GNU General Public License for more details.
|
||||
#
|
||||
# You should have received a copy of the GNU General Public License
|
||||
# along with this program; if not, write to the Free Software
|
||||
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
|
||||
#
|
||||
#
|
||||
|
||||
%{!?version: %define version %(cat version)}
|
||||
|
||||
|
||||
Name: qubes-core-dom0-doc
|
||||
Version: %{version}
|
||||
Release: 1
|
||||
Summary: The Qubes docs for dom0 tools
|
||||
|
||||
Group: Qubes
|
||||
Vendor: Invisible Things Lab
|
||||
License: GPL
|
||||
URL: http://www.qubes-os.org
|
||||
BuildRequires: python3-sphinx
|
||||
BuildRequires: python3-lxml
|
||||
BuildArch: noarch
|
||||
Obsoletes: qubes-doc-dom0 <= 2.0
|
||||
Provides: qubes-doc-dom0
|
||||
|
||||
%define _builddir %(pwd)/doc
|
||||
|
||||
%description
|
||||
The Qubes docs for dom0 tools
|
||||
|
||||
%build
|
||||
make PYTHON=%{__python3} SPHINXBUILD=sphinx-build-%{python3_version} man
|
||||
|
||||
%install
|
||||
|
||||
make DESTDIR=$RPM_BUILD_ROOT \
|
||||
PYTHON=%{__python3} SPHINXBUILD=sphinx-build-%{python3_version} \
|
||||
install
|
||||
|
||||
%clean
|
||||
rm -rf $RPM_BUILD_ROOT
|
||||
|
||||
%files
|
||||
%defattr(-,root,root,-)
|
||||
%{_mandir}/man1/qubes*.1*
|
@ -61,6 +61,7 @@ BuildRequires: python3-devel
|
||||
|
||||
# for building documentation
|
||||
BuildRequires: python3-sphinx
|
||||
BuildRequires: python3-lxml
|
||||
BuildRequires: libvirt-python3
|
||||
BuildRequires: python3-dbus
|
||||
|
||||
@ -102,6 +103,9 @@ Requires: PyQt4
|
||||
# for lvm support
|
||||
Requires: lvm2-python-libs
|
||||
|
||||
Obsoletes: qubes-core-dom0-doc <= 4.0
|
||||
Provides: qubes-core-dom0-doc
|
||||
|
||||
# Prevent preupgrade from installation (it pretend to provide distribution upgrade)
|
||||
Obsoletes: preupgrade < 2.0
|
||||
Provides: preupgrade = 2.0
|
||||
@ -120,6 +124,7 @@ ln -sf . %{name}-%{version}
|
||||
%build
|
||||
|
||||
make all
|
||||
make -C doc PYTHON=%{__python3} SPHINXBUILD=sphinx-build-%{python3_version} man
|
||||
|
||||
%install
|
||||
|
||||
@ -129,6 +134,11 @@ make install \
|
||||
PYTHON_SITEPATH=%{python3_sitelib} \
|
||||
SYSCONFDIR=%{_sysconfdir}
|
||||
|
||||
make -C doc DESTDIR=$RPM_BUILD_ROOT \
|
||||
PYTHON=%{__python3} SPHINXBUILD=sphinx-build-%{python3_version} \
|
||||
install
|
||||
|
||||
|
||||
%post
|
||||
|
||||
# Create NetworkManager configuration if we do not have it
|
||||
@ -218,6 +228,8 @@ fi
|
||||
/usr/bin/qrexec-policy
|
||||
/usr/bin/qrexec-policy-agent
|
||||
|
||||
%{_mandir}/man1/qubes*.1*
|
||||
|
||||
%dir %{python3_sitelib}/qubes-*.egg-info
|
||||
%{python3_sitelib}/qubes-*.egg-info/*
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user