[libvirt-dbus PATCH 0/2] Revert recent commits
Pushed under the "we agreed to get rid of this" rule. Andrea Bolognani (2): spec: Pick documentation from source directory meson: Don't install documentation libvirt-dbus.spec.in | 4 +--- meson.build | 18 ------------------ 2 files changed, 1 insertion(+), 21 deletions(-) -- 2.25.4
We will stop installing documentation very soon, at which point we will not longer be able to pick it from the installation directory. This reverts commit 651f43f5e4a88bdbe8bbb6f7fa5f44b5c176ade8. Signed-off-by: Andrea Bolognani <abologna@redhat.com> --- libvirt-dbus.spec.in | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/libvirt-dbus.spec.in b/libvirt-dbus.spec.in index e756ff6..84172fa 100644 --- a/libvirt-dbus.spec.in +++ b/libvirt-dbus.spec.in @@ -50,9 +50,7 @@ getent passwd %{system_user} >/dev/null || \ exit 0 %files -%doc %{_docdir}/%{name}/AUTHORS.rst -%doc %{_docdir}/%{name}/NEWS.rst -%exclude %{_docdir}/%{name}/COPYING +%doc AUTHORS.rst NEWS.rst %license COPYING %{_sbindir}/libvirt-dbus %{_datadir}/dbus-1/services/org.libvirt.service -- 2.25.4
Standard practice is to not install these files when building from source. This reverts commit 64a1a72be1ecac30359e6964557eeffedc06bb7d. Signed-off-by: Andrea Bolognani <abologna@redhat.com> --- meson.build | 18 ------------------ 1 file changed, 18 deletions(-) diff --git a/meson.build b/meson.build index 64e1fb6..7518e94 100644 --- a/meson.build +++ b/meson.build @@ -12,7 +12,6 @@ project( prefix = get_option('prefix') datadir = prefix / get_option('datadir') sbindir = prefix / get_option('sbindir') -docdir = datadir / 'doc' / meson.project_name() opt_dirs = [ 'dbus_interfaces', @@ -259,7 +258,6 @@ if git configuration: { 'contributorslist': authors.stdout() }, input: 'AUTHORS.rst.in', output: 'AUTHORS.rst', - install_dir: docdir, ) foreach file : [ 'libvirt-dbus.spec', 'AUTHORS.rst' ] @@ -268,22 +266,6 @@ if git endif -# Install documentation - -docs = [ - 'COPYING', - 'NEWS.rst', -] -if not git - docs += ['AUTHORS.rst'] -endif - -install_data( - docs, - install_dir: docdir, -) - - # Include sub-directories subdir('data') -- 2.25.4
participants (1)
-
Andrea Bolognani