From c3da031b0e850fe18dd34391eb7ac9ccdb5f79a1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= Date: Wed, 8 Sep 2021 20:20:31 +0200 Subject: [PATCH] Version 1.1.11 --- meson-patch1.diff | 38 -------------------------------------- plocate.spec | 7 ++----- 2 files changed, 2 insertions(+), 43 deletions(-) delete mode 100644 meson-patch1.diff diff --git a/meson-patch1.diff b/meson-patch1.diff deleted file mode 100644 index dd95858..0000000 --- a/meson-patch1.diff +++ /dev/null @@ -1,38 +0,0 @@ ---- plocate-1.1.8-c3da113/meson.build~ 2021-06-12 14:27:21.000000000 +0200 -+++ plocate-1.1.8-c3da113/meson.build 2021-06-21 16:54:09.389472902 +0200 -@@ -76,16 +76,18 @@ - configuration: conf_data) - install_man(updatedb_conf_man) - -+unitdir = get_option('systemdunitdir') - if get_option('install_systemd') -- systemd = dependency('systemd', required: false) -- if systemd.found() -- unitdir = systemd.get_pkgconfig_variable('systemdsystemunitdir') -- updatedb_service = configure_file(input: 'plocate-updatedb.service.in', -- output: 'plocate-updatedb.service', -- configuration: conf_data) -- install_data(updatedb_service, install_dir: unitdir) -- install_data('plocate-updatedb.timer', install_dir: unitdir) -- endif -+ if unitdir == '' -+ systemd = dependency('systemd', required: true) -+ unitdir = systemd.get_pkgconfig_variable('systemdsystemunitdir') -+ endif -+ -+ updatedb_service = configure_file(input: 'plocate-updatedb.service.in', -+ output: 'plocate-updatedb.service', -+ configuration: conf_data) -+ install_data(updatedb_service, install_dir: unitdir) -+ install_data('plocate-updatedb.timer', install_dir: unitdir) - endif - - # Requires having TurboPFor checked out, so not built by default. ---- plocate-1.1.8-c3da113/meson_options.txt~ 2021-06-12 14:27:21.000000000 +0200 -+++ plocate-1.1.8-c3da113/meson_options.txt 2021-06-21 16:54:18.807580758 +0200 -@@ -1,4 +1,5 @@ - option('install_cron', type: 'boolean', value: false, description: 'Install mlocate conversion script into /etc/cron.daily') - option('install_systemd', type: 'boolean', value: true, description: 'Install systemd service and timer for updatedb, if systemd is installed') -+option('systemdunitdir', type: 'string', description: 'Install systemd units here (default: autodetect') - option('locategroup', type: 'string', value: 'plocate', description: 'Group that the install script will use for the .db file') - option('updatedb_progname', type: 'string', value: 'updatedb', description: 'Binary name of updatedb') diff --git a/plocate.spec b/plocate.spec index 7fd481d..3aef237 100644 --- a/plocate.spec +++ b/plocate.spec @@ -1,5 +1,5 @@ Name: plocate -Version: 1.1.8 +Version: 1.1.11 Release: %autorelease Summary: Much faster locate @@ -8,9 +8,6 @@ URL: https://plocate.sesse.net/ Source0: https://plocate.sesse.net/download/plocate-%{version}.tar.gz Source1: plocate.sysusers -# Submitted upstream via mail -Patch1: meson-patch1.diff - BuildRequires: meson BuildRequires: gcc-c++ BuildRequires: systemd-rpm-macros @@ -33,7 +30,7 @@ mlocate in nearly all aspects, and is fast on SSDs and non-SSDs alike. %autosetup -p1 %build -%meson -Dsystemdunitdir=%_unitdir +%meson -Dsystemunitdir=%_unitdir -Dinstall_systemd=true %meson_build %install