commit 517c8d5d27028c01484d8d8a7ce8da62a0f2dc83
Author: Jakub Bogusz <qbo...@pld-linux.org>
Date: Wed Oct 31 07:12:46 2018 +0100
- added bash-completion patch (use explicit bash_compdir patch, don't
buildrequire bash-completion package)
dconf-bash-completion.patch | 22 ++++++++++++++++++++++
dconf.spec | 8 +++++---
2 files changed, 27 insertions(+), 3 deletions(-)
---
diff --git a/dconf.spec b/dconf.spec
index a8831ca..db0f882 100644
--- a/dconf.spec
+++ b/dconf.spec
@@ -8,10 +8,11 @@ Summary(pl.UTF-8): Niskopoziomowy system konfiguracji
Name: dconf
Version: 0.30.1
Release: 1
-License: LGPL v2+
+License: LGPL v2.1+
Group: Libraries
Source0:
http://ftp.gnome.org/pub/GNOME/sources/dconf/0.30/%{name}-%{version}.tar.xz
# Source0-md5: a959eef51c917b3c57cfbef1448a375e
+Patch0: %{name}-bash-completion.patch
URL: http://live.gnome.org/dconf
BuildRequires: glib2-devel >= 1:2.44.0
BuildRequires: gtk-doc >= 1.15
@@ -24,7 +25,7 @@ BuildRequires: tar >= 1:1.22
# not needed atm., generated files are packaged
#%{?with_vala:BuildRequires: vala >= 2:0.18.0}
BuildRequires: xz
-Requires(post,postun): glib2 >= 1:2.39.1
+Requires(post,postun): glib2 >= 1:2.44.0
Requires: dbus
Requires: glib2 >= 1:2.44.0
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -100,16 +101,17 @@ API dconf dla języka Vala.
%prep
%setup -q
+%patch0 -p1
%build
%meson build \
+ -Dbash_completion_dir=%{bash_compdir} \
-Dgtk_doc=%{__true_false apidocs}
%meson_build -C build
%install
rm -rf $RPM_BUILD_ROOT
-
install -d $RPM_BUILD_ROOT%{_sysconfdir}/dconf/{db,profile}
install -d $RPM_BUILD_ROOT%{_datadir}/dconf/profile
diff --git a/dconf-bash-completion.patch b/dconf-bash-completion.patch
new file mode 100644
index 0000000..3334e62
--- /dev/null
+++ b/dconf-bash-completion.patch
@@ -0,0 +1,22 @@
+--- dconf-0.30.1/meson_options.txt.orig 2018-10-22 23:53:04.000000000
+0200
++++ dconf-0.30.1/meson_options.txt 2018-10-30 20:32:08.195263612 +0100
+@@ -1,3 +1,4 @@
+ option('bash_completion', type: 'boolean', value: true, description: 'install
bash completion files')
++option('bash_completion_dir', type: 'string', value: '')
+ option('man', type: 'boolean', value: true, description: 'generate man pages')
+ option('gtk_doc', type: 'boolean', value: false, description: 'use gtk-doc to
build documentation')
+--- dconf-0.30.1/meson.build.orig 2018-10-22 23:53:04.000000000 +0200
++++ dconf-0.30.1/meson.build 2018-10-30 21:08:19.195238826 +0100
+@@ -52,8 +52,12 @@
+
+ enable_bash_completion = get_option('bash_completion')
+ if enable_bash_completion
++ if get_option('bash_completion_dir') != ''
++ completions_dir = get_option('bash_completion_dir')
++ else
+ # FIXME: the `.pc` file is wrong because `completionsdir` should be
relative to `datadir`, not `prefix`
+ completions_dir =
dependency('bash-completion').get_pkgconfig_variable('completionsdir',
define_variable: ['prefix', dconf_prefix])
++ endif
+ endif
+
+ configure_file(
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/dconf.git/commitdiff/517c8d5d27028c01484d8d8a7ce8da62a0f2dc83
_______________________________________________
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
