[packages/colord] - dropped completions patch, BR: bash-completion-devel instead
qboosh
qboosh at pld-linux.org
Sun Mar 14 12:26:16 CET 2021
commit 255980e204852b3fc65f266b94c2ac604836fe58
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date: Sun Mar 14 12:27:23 2021 +0100
- dropped completions patch, BR: bash-completion-devel instead
colord-completions.patch | 32 --------------------------------
colord.spec | 8 +++-----
2 files changed, 3 insertions(+), 37 deletions(-)
---
diff --git a/colord.spec b/colord.spec
index 294add7..096dffa 100644
--- a/colord.spec
+++ b/colord.spec
@@ -1,8 +1,8 @@
#
# Conditional build:
-%bcond_without apidocs # do not build and package API docs
+%bcond_without apidocs # gtk-doc based API documentation
%bcond_without sane # SANE support
-%bcond_without vala # don't build Vala API
+%bcond_without vala # Vala API
Summary: Color daemon - system daemon for managing color devices
Summary(pl.UTF-8): Demon colord - usługa systemowa do zarządzania urządzeniami obsługującymi kolory
@@ -13,10 +13,10 @@ License: GPL v2+ and LGPL v2+
Group: Daemons
Source0: https://www.freedesktop.org/software/colord/releases/%{name}-%{version}.tar.xz
# Source0-md5: adc4501b54fb8667ee99f64cff87e12d
-Patch0: %{name}-completions.patch
URL: https://www.freedesktop.org/software/colord/
# for colprof,spotread programs detection
BuildRequires: argyllcms
+BuildRequires: bash-completion-devel >= 2.0
BuildRequires: dbus-devel
BuildRequires: docbook-utils
BuildRequires: gcc >= 5:3.2
@@ -135,7 +135,6 @@ Bashowe uzupełnianie poleceń terminalowych colormgr.
%prep
%setup -q
-%patch0 -p1
%build
%meson build \
@@ -143,7 +142,6 @@ Bashowe uzupełnianie poleceń terminalowych colormgr.
-Dlibcolordcompat=true \
%{?with_sane:-Dsane=true} \
%{?with_vala:-Dvapi=true} \
- -Dbash_completion_dir=%{bash_compdir} \
-Ddaemon_user=colord
%meson_build -C build
diff --git a/colord-completions.patch b/colord-completions.patch
deleted file mode 100644
index 87467e7..0000000
--- a/colord-completions.patch
+++ /dev/null
@@ -1,32 +0,0 @@
---- colord-1.4.1/data/meson.build.orig 2017-08-21 11:02:36.000000000 +0200
-+++ colord-1.4.1/data/meson.build 2017-12-23 22:57:10.663716927 +0100
-@@ -14,7 +14,7 @@
-
- if get_option('enable-bash-completion')
- install_data('colormgr',
-- install_dir: bash_completion.get_pkgconfig_variable('completionsdir')
-+ install_dir: get_option('bash_completion_dir')
- )
- endif
-
---- colord-1.4.3/meson.build.orig 2018-09-29 19:42:17.407154714 +0200
-+++ colord-1.4.3/meson.build 2018-09-29 19:43:56.833820242 +0200
-@@ -149,9 +149,6 @@
- gnome_desktop = dependency('gnome-desktop-3.0', version : '>= 0.2.7')
- colord_gtk = dependency('colord-gtk', version : '>= 0.1.24')
- endif
--if get_option('bash_completion')
-- bash_completion = dependency('bash-completion', version : '>= 2.0')
--endif
-
- if get_option('sane')
- sane = dependency('sane-backends')
---- colord-1.4.3/meson_options.txt.orig 2018-09-29 19:42:17.410488047 +0200
-+++ colord-1.4.3/meson_options.txt 2018-09-29 19:43:20.723820651 +0200
-@@ -1,5 +1,6 @@
- option('session_example', type : 'boolean', value : false, description : 'Enable session example')
- option('bash_completion', type : 'boolean', value : true, description : 'Enable bash completion')
-+option('bash_completion_dir', type : 'string', description : 'Bash completion dir')
- option('udev_rules', type: 'boolean', value: true, description: 'Install udev rules')
- option('systemd', type : 'boolean', value : true, description : 'Enable systemd integration')
- option('libcolordcompat', type : 'boolean', value : false, description : 'Enable libcolordcompat.so which is used by ArgyllCMS')
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/colord.git/commitdiff/255980e204852b3fc65f266b94c2ac604836fe58
More information about the pld-cvs-commit
mailing list