rpm: integrate documentation into main package

QubesOS/qubes-issues#2771

Makefile.builder

@@ -1,6 +1,5 @@
 ifeq ($(PACKAGE_SET),vm)
-  RPM_SPEC_FILES := rpm_spec/core-agent.spec \
-  rpm_spec/core-vm-doc.spec
+  RPM_SPEC_FILES := rpm_spec/core-agent.spec
 
   ifneq ($(filter $(DISTRIBUTION), debian qubuntu),)
     DEBIAN_BUILD_DIRS := debian

rpm_spec/core-agent.spec

@@ -150,6 +150,9 @@ Obsoletes:  qubes-core-vm-kernel-placeholder <= 1.0
 Obsoletes:  qubes-upgrade-vm < 3.2
 Provides:   qubes-core-vm = %{version}-%{release}
 Obsoletes:  qubes-core-vm < 4.0.0
+Provides:	qubes-core-vm-doc = %{version}-%{release}
+Obsoletes:	qubes-core-vm-doc < 4.0.0
+BuildRequires: pandoc
 BuildRequires: xen-devel
 BuildRequires: libX11-devel
 BuildRequires: qubes-utils-devel >= 3.1.3
@@ -240,6 +243,7 @@ ln -sf . %{name}-%{version}
 for dir in qubes-rpc qrexec misc; do
   (cd $dir; make)
 done
+make -C doc manpages
 
 %pre
 # Make sure there is a qubes group
@@ -267,6 +271,8 @@ usermod -L user
 (cd qrexec; make install DESTDIR=$RPM_BUILD_ROOT)
 make install-vm DESTDIR=$RPM_BUILD_ROOT
 
+make -C doc install DESTDIR=$RPM_BUILD_ROOT
+
 %if %{fedora} >= 22
 rm -f $RPM_BUILD_ROOT/etc/yum/post-actions/qubes-trigger-sync-appmenus.action
 %endif
@@ -554,6 +560,7 @@ rm -f %{name}-%{version}
 /usr/share/glib-2.0/schemas/20_org.gnome.nautilus.qubes.gschema.override
 /usr/share/glib-2.0/schemas/20_org.mate.NotificationDaemon.qubes.gschema.override
 /usr/share/glib-2.0/schemas/20_org.gnome.desktop.wm.preferences.qubes.gschema.override
+%{_mandir}/man1/qvm-*.1*
 
 %dir %{python_sitelib}/qubesagent-*-py2.7.egg-info
 %{python_sitelib}/qubesagent-*-py2.7.egg-info/*

rpm_spec/core-vm-doc.spec

@@ -1,57 +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-vm-doc
-Version:	%{version}
-Release:	1
-Summary:	The Qubes docs for VM tools
-
-Group:		Qubes
-Vendor:		Invisible Things Lab
-License:	GPL
-URL:		http://www.qubes-os.org
-BuildRequires: pandoc
-BuildArch: noarch
-Obsoletes:  qubes-doc-vm <= 2.0
-
-%define _builddir %(pwd)/doc
-
-%description
-The Qubes docs for VM tools
-
-%build
-make manpages
-
-%install
-
-make DESTDIR=$RPM_BUILD_ROOT install
-
-%clean
-rm -rf $RPM_BUILD_ROOT
-
-%files
-%defattr(-,root,root,-)
-%{_mandir}/man1/qvm-*.1*