- rel 4

[packages/dconf.git] / dconf.spec

diff --git a/dconf.spec b/dconf.spec
index 6396a17b6d7da18398d0b620e43f1e852e1aae38..23e9b0d1a419441630f00ca6ed749084e4a28001 100644 (file)
--- a/dconf.spec
+++ b/dconf.spec
@@ -1,19 +1,19 @@
 #
 # Conditional build:
-%bcond_without apidocs         # do not build and package API docs
-%bcond_without vala            # do not build Vala API
+%bcond_without apidocs         # gtk-doc based API documentation
+%bcond_without vala            # Vala API
 #
 Summary:       Low-level configuration system
 Summary(pl.UTF-8):     Niskopoziomowy system konfiguracji
 Name:          dconf
-Version:       0.36.0
-Release:       1
+Version:       0.40.0
+Release:       4
 License:       LGPL v2.1+
 Group:         Libraries
-Source0:       http://ftp.gnome.org/pub/GNOME/sources/dconf/0.36/%{name}-%{version}.tar.xz
-# Source0-md5: 1a50c988d9f0206f74a44f7c6d09cead
-Patch0:                %{name}-bash-completion.patch
-URL:           http://live.gnome.org/dconf
+Source0:       https://download.gnome.org/sources/dconf/0.40/%{name}-%{version}.tar.xz
+# Source0-md5: ac8db20b0d6b996d4bbbeb96463d01f0
+URL:           https://wiki.gnome.org/Projects/dconf
+BuildRequires: bash-completion-devel >= 2.10
 BuildRequires: dbus-devel
 BuildRequires: glib2-devel >= 1:2.44.0
 BuildRequires: gtk-doc >= 1.15
@@ -21,6 +21,7 @@ BuildRequires:        libxslt-progs
 BuildRequires: meson >= 0.47.0
 BuildRequires: ninja >= 1.5
 BuildRequires: pkgconfig
+BuildRequires: rpm-build >= 4.6
 BuildRequires: rpmbuild(macros) >= 1.736
 BuildRequires: tar >= 1:1.22
 # not needed atm., generated files (.deps, .vapi) are packaged in tarball
@@ -59,9 +60,7 @@ Summary:      dconf API documentation
 Summary(pl.UTF-8):     Dokumentacja API biblioteki dconf
 Group:         Documentation
 Requires:      gtk-doc-common
-%if "%{_rpmversion}" >= "4.6"
 BuildArch:     noarch
-%endif
 
 %description apidocs
 API documentation for dconf library.
@@ -73,10 +72,8 @@ Dokumentacja API biblioteki dconf.
 Summary:       bash-completion for dconf
 Summary(pl.UTF-8):     Bashowe uzupełnianie nazw dla dconf
 Group:         Applications/Shells
-Requires:      bash-completion >= 2
-%if "%{_rpmversion}" >= "4.6"
+Requires:      bash-completion >= 2.10
 BuildArch:     noarch
-%endif
 
 %description -n bash-completion-dconf
 bash-completion for dconf.
@@ -90,9 +87,7 @@ Summary(pl.UTF-8):    API dconf dla języka Vala
 Group:         Development/Libraries
 Requires:      %{name}-devel = %{version}-%{release}
 Requires:      vala >= 2:0.18.0
-%if "%{_rpmversion}" >= "4.6"
 BuildArch:     noarch
-%endif
 
 %description -n vala-dconf
 dconf API for Vala language.
@@ -102,12 +97,11 @@ API dconf dla języka Vala.
 
 %prep
 %setup -q
-%patch0 -p1
 
 %build
 %meson build \
-       -Dbash_completion_dir=%{bash_compdir} \
-       -Dgtk_doc=%{__true_false apidocs}
+       -Dgtk_doc=%{__true_false apidocs} \
+       -Dsystemduserunitdir=%{systemduserunitdir}
 
 %ninja_build -C build
 
@@ -148,6 +142,7 @@ umask 022
 %attr(755,root,root) %{_libexecdir}/dconf-service
 %attr(755,root,root) %{_libdir}/gio/modules/libdconfsettings.so
 %{_datadir}/dbus-1/services/ca.desrt.dconf.service
+%{systemduserunitdir}/dconf.service
 %dir %{_sysconfdir}/dconf
 %dir %{_sysconfdir}/dconf/db
 %dir %{_sysconfdir}/dconf/profile