From d06bbdc967bdcf2b6c744227375b06c57ecfb327 Mon Sep 17 00:00:00 2001 From: Marek Marczykowski Date: Sat, 16 Mar 2013 18:34:00 +0100 Subject: [PATCH] appmenus: include standalone qvm-sync-appmenus and its manpage --- appmenus-scripts/qvm-sync-appmenus | 2 ++ doc/Makefile | 27 +++++++++++++++++++++++++++ doc/tools/qvm-sync-appmenus.rst | 26 ++++++++++++++++++++++++++ rpm_spec/core-dom0-linux.spec | 9 ++++++++- 4 files changed, 63 insertions(+), 1 deletion(-) create mode 100755 appmenus-scripts/qvm-sync-appmenus create mode 100644 doc/Makefile create mode 100644 doc/tools/qvm-sync-appmenus.rst diff --git a/appmenus-scripts/qvm-sync-appmenus b/appmenus-scripts/qvm-sync-appmenus new file mode 100755 index 0000000..77fd43e --- /dev/null +++ b/appmenus-scripts/qvm-sync-appmenus @@ -0,0 +1,2 @@ +#!/bin/sh +exec /usr/libexec/qubes-appmenus/qubes-receive-appmenus $@ diff --git a/doc/Makefile b/doc/Makefile new file mode 100644 index 0000000..3f6c472 --- /dev/null +++ b/doc/Makefile @@ -0,0 +1,27 @@ +TOOLS_DIR=tools +PANDOC=pandoc -s -f rst -t man + +TOOLS_DOCS=$(patsubst %.rst,%.1.gz,$(wildcard $(TOOLS_DIR)/*.rst)) + +help: + @echo "make rst=example.rst preview -- generate manpage preview from example.rst" + @echo "make manpages -- generate manpages" + @echo "make install -- generate manpages and copy them to /usr/share/man" + +install: manpages + mkdir -p $(DESTDIR)/usr/share/man/man1 + cp $(TOOLS_DOCS) $(DESTDIR)/usr/share/man/man1/ + +%.1: %.rst + $(PANDOC) $< > $@ + +%.1.gz: %.1 + gzip -f $< + +manpages: $(TOOLS_DOCS) + +preview: $(rst) + pandoc -s -f rst -t man $(rst) | groff -mandoc -Tlatin1 | less -R + +clean: + rm -f $(TOOLS_DOCS) diff --git a/doc/tools/qvm-sync-appmenus.rst b/doc/tools/qvm-sync-appmenus.rst new file mode 100644 index 0000000..bb9775c --- /dev/null +++ b/doc/tools/qvm-sync-appmenus.rst @@ -0,0 +1,26 @@ +================= +qvm-sync-appmenus +================= + +NAME +==== +qvm-sync-appmenus - updates desktop file templates for given StandaloneVM or TemplateVM + +:Date: 2012-04-11 + +SYNOPSIS +======== +| qvm-sync-appmenus [options] + +OPTIONS +======= +-h, --help + Show this help message and exit +-v, --verbose + Run in verbose mode + +AUTHORS +======= +| Joanna Rutkowska +| Rafal Wojtczuk +| Marek Marczykowski diff --git a/rpm_spec/core-dom0-linux.spec b/rpm_spec/core-dom0-linux.spec index e731d0e..c277fec 100644 --- a/rpm_spec/core-dom0-linux.spec +++ b/rpm_spec/core-dom0-linux.spec @@ -42,6 +42,7 @@ License: GPL URL: http://www.qubes-os.org BuildRequires: ImageMagick +BuildRequires: pandoc Requires: qubes-core-dom0 %define _builddir %(pwd) @@ -61,6 +62,7 @@ ln -sf . %{name}-%{version} %build python -m compileall appmenus-scripts python -O -m compileall appmenus-scripts +(cd doc; make manpages) %install mkdir -p $RPM_BUILD_ROOT%{python_sitearch}/qubes/modules @@ -72,6 +74,8 @@ mkdir -p $RPM_BUILD_ROOT/usr/libexec/qubes-appmenus cp appmenus-scripts/*.sh $RPM_BUILD_ROOT/usr/libexec/qubes-appmenus/ cp appmenus-scripts/qubes-receive-appmenus $RPM_BUILD_ROOT/usr/libexec/qubes-appmenus/ +install -D appmenus-scripts/qvm-sync-appmenus $RPM_BUILD_ROOT/usr/bin/qvm-sync-appmenus + mkdir -p $RPM_BUILD_ROOT/etc/qubes-rpc/policy cp appmenus-scripts/qubes.SyncAppMenus $RPM_BUILD_ROOT/etc/qubes-rpc/ cp appmenus-scripts/qubes.SyncAppMenus.policy $RPM_BUILD_ROOT/etc/qubes-rpc/policy/ @@ -84,6 +88,8 @@ done mkdir -p $RPM_BUILD_ROOT/usr/share/qubes-appmenus/ cp appmenus-files/* $RPM_BUILD_ROOT/usr/share/qubes-appmenus/ +(cd doc; make DESTDIR=$RPM_BUILD_ROOT install) + %post for i in /usr/share/qubes/icons/*.png ; do @@ -123,6 +129,7 @@ fi /usr/share/qubes-appmenus/qubes-templatevm.directory.template /usr/share/qubes-appmenus/qubes-vm.directory.template /usr/share/qubes/icons/*.png +/usr/bin/qvm-sync-appmenus +%{_mandir}/man1/qvm-*.1* %changelog -