Disable the defaults service when building for Flatpak inclusion

epel9
Owen W. Taylor 6 years ago
parent e85a30a2fa
commit bcb7fe84d0

@ -3,10 +3,14 @@
%define dbus_version 1.0.1
%define dbus_glib_version 0.74
%if !0%{?flatpak}
%define defaults_service 1
%endif
Summary: A process-transparent configuration system
Name: GConf2
Version: 3.2.6
Release: 21%{?dist}
Release: 22%{?dist}
License: LGPLv2+ and GPLv2+
Group: System Environment/Base
#VCS: git:git://git.gnome.org/gconf
@ -31,11 +35,15 @@ BuildRequires: gtk-doc >= 0.9
BuildRequires: pkgconfig >= 0.14
BuildRequires: gettext
BuildRequires: intltool
%if 0%{?defaults_service}
BuildRequires: polkit-devel >= 0.92
%endif
BuildRequires: dbus-glib-devel >= 0.8
BuildRequires: gobject-introspection-devel >= 0.6.7
BuildRequires: autoconf automake libtool
%if 0%{?defaults_service}
Requires: dbus
%endif
# for patch0
Requires: /usr/bin/killall
Conflicts: GConf2-dbus
@ -75,7 +83,10 @@ development using GConf.
autoreconf -i -f
%build
%configure --disable-static --enable-defaults-service --disable-orbit --with-gtk=3.0
%configure --disable-static \
%{?defaults_service:--enable-defaults-service} \
%{!?defaults_service:--disable-defaults-service} \
--disable-orbit --with-gtk=3.0
# drop unneeded direct library deps with --as-needed
# libtool doesn't make this easy, so we do it the hard way
@ -140,11 +151,13 @@ fi
%dir %{_libdir}/GConf
%dir %{_libdir}/GConf/2
%{_rpmconfigdir}/macros.d/macros.gconf2
%if 0%{?defaults_service}
%{_sysconfdir}/dbus-1/system.d/org.gnome.GConf.Defaults.conf
%{_libexecdir}/gconf-defaults-mechanism
%{_datadir}/polkit-1/actions/org.gnome.gconf.defaults.policy
%{_datadir}/dbus-1/system-services/org.gnome.GConf.Defaults.service
%{_datadir}/dbus-1/services/org.gnome.GConf.service
%endif
%{_localstatedir}/lib/rpm-state/gconf/
%{_libdir}/gio/modules/libgsettingsgconfbackend.so
%{_libdir}/girepository-1.0
@ -160,6 +173,9 @@ fi
%{_mandir}/man1/gsettings-schema-convert.1*
%changelog
* Thu Oct 4 2018 Owen Taylor <otaylor@redhat.com> - 3.2.6-22
- Disable the defaults service when building for Flatpak inclusion
* Thu Jul 12 2018 Fedora Release Engineering <releng@fedoraproject.org> - 3.2.6-21
- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild

Loading…
Cancel
Save