commit 1a5d98e0efef4f1e224d83d69708f25b1c349594
Author: Jakub Bogusz <qbo...@pld-linux.org>
Date: Sat Sep 29 20:30:57 2018 +0200
- updated to 1.4.3
- updated completions patch
colord-completions.patch | 29 +++++++++++++++--------------
colord.spec | 16 ++++++++--------
2 files changed, 23 insertions(+), 22 deletions(-)
---
diff --git a/colord.spec b/colord.spec
index 14441a4..7f339a7 100644
--- a/colord.spec
+++ b/colord.spec
@@ -7,12 +7,12 @@
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
Name: colord
-Version: 1.4.2
+Version: 1.4.3
Release: 1
License: GPL v2+ and LGPL v2+
Group: Daemons
Source0:
https://www.freedesktop.org/software/colord/releases/%{name}-%{version}.tar.xz
-# Source0-md5: eb6bcc5b826e1ad9bfa75c94534826a4
+# Source0-md5: f032ecac927e9078c41fff97800441e8
Patch0: %{name}-completions.patch
URL: https://www.freedesktop.org/software/colord/
# for colprof,spotread programs detection
@@ -144,12 +144,12 @@ Bashowe uzupełnianie poleceń terminalowych colormgr.
%build
%meson build \
- %{!?with_apidocs:-Denable-docs=false} \
- -Denable-libcolordcompat=true \
- %{?with_sane:-Denable-sane=true} \
- %{?with_vala:-Denable-vala=true} \
- -Dwith-bash-completion-dir=%{bash_compdir} \
- -Dwith-daemon-user=colord
+ %{!?with_apidocs:-Ddocs=false} \
+ -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
index 1a81535..87467e7 100644
--- a/colord-completions.patch
+++ b/colord-completions.patch
@@ -5,27 +5,28 @@
if get_option('enable-bash-completion')
install_data('colormgr',
- install_dir: bash_completion.get_pkgconfig_variable('completionsdir')
-+ install_dir: get_option('with-bash-completion-dir')
++ install_dir: get_option('bash_completion_dir')
)
endif
---- colord-1.4.1/meson.build.orig 2017-08-21 11:02:36.000000000 +0200
-+++ colord-1.4.1/meson.build 2017-12-23 23:41:23.647019972 +0100
-@@ -146,9 +146,6 @@
+--- 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('enable-bash-completion')
+-if get_option('bash_completion')
- bash_completion = dependency('bash-completion', version : '>= 2.0')
-endif
- if get_option('enable-sane')
+ if get_option('sane')
sane = dependency('sane-backends')
---- colord-1.4.1/meson_options.txt.orig 2017-08-21 11:02:36.000000000
+0200
-+++ colord-1.4.1/meson_options.txt 2017-12-23 23:42:47.510352342 +0100
-@@ -12,3 +12,5 @@
- option('with-daemon-user', type : 'string', value : 'root', description :
'User for running the colord daemon')
- option('enable-man', type : 'boolean', value : true, description : 'Generate
man pages')
- option('enable-docs', type : 'boolean', value : true, description : 'Generate
documentation')
-+option('with-bash-completion-dir', type : 'string', description : 'Bash
-+completions dir')
+--- 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/1a5d98e0efef4f1e224d83d69708f25b1c349594
_______________________________________________
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
