- added bash-completion patch (use explicit bash_compdir patch, don't buildrequire...

diff --git a/dconf-bash-completion.patch b/dconf-bash-completion.patch
new file mode 100644 (file)
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(

diff --git a/dconf.spec b/dconf.spec
index a8831caef1b09751ddc98567d8c5c74f428bd0e1..db0f8824eb224d33b40983bc823d49eefa2da00c 100644 (file)
--- 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