Correct D-Bus service file name - it can change when _eds_dbus_services_prefix is defined

This commit is contained in:
Milan Crha 2020-10-05 13:35:14 +02:00
parent ddee48b946
commit 2d56769e4f

View File

@ -36,11 +36,23 @@
%define modules_dir %{_libdir}/evolution-data-server/registry-modules %define modules_dir %{_libdir}/evolution-data-server/registry-modules
%define uimodules_dir %{_libdir}/evolution-data-server/ui-modules %define uimodules_dir %{_libdir}/evolution-data-server/ui-modules
%global dbus_service_name_address_book org.gnome.evolution.dataserver.AddressBook10
%global dbus_service_name_calendar org.gnome.evolution.dataserver.Calendar8
%global dbus_service_name_sources org.gnome.evolution.dataserver.Sources5
%global dbus_service_name_user_prompter org.gnome.evolution.dataserver.UserPrompter0
%if "%{?_eds_dbus_services_prefix}" != ""
%global dbus_service_name_address_book %{?_eds_dbus_services_prefix}.%{dbus_service_name_address_book}
%global dbus_service_name_calendar %{?_eds_dbus_services_prefix}.%{dbus_service_name_calendar}
%global dbus_service_name_sources %{?_eds_dbus_services_prefix}.%{dbus_service_name_sources}
%global dbus_service_name_user_prompter %{?_eds_dbus_services_prefix}.%{dbus_service_name_user_prompter}
%endif
### Abstract ### ### Abstract ###
Name: evolution-data-server Name: evolution-data-server
Version: 3.38.1 Version: 3.38.1
Release: 1%{?dist} Release: 2%{?dist}
Summary: Backend data server for Evolution Summary: Backend data server for Evolution
License: LGPLv2+ License: LGPLv2+
URL: https://wiki.gnome.org/Apps/Evolution URL: https://wiki.gnome.org/Apps/Evolution
@ -336,10 +348,10 @@ find $RPM_BUILD_ROOT -name '*.so.*' -exec chmod +x {} \;
%{_datadir}/glib-2.0/schemas/org.gnome.evolution.shell.network-config.gschema.xml %{_datadir}/glib-2.0/schemas/org.gnome.evolution.shell.network-config.gschema.xml
%{_datadir}/evolution-data-server %{_datadir}/evolution-data-server
%{_datadir}/dbus-1/services/org.gnome.evolution.dataserver.AddressBook10.service %{_datadir}/dbus-1/services/%{dbus_service_name_address_book}.service
%{_datadir}/dbus-1/services/org.gnome.evolution.dataserver.Calendar8.service %{_datadir}/dbus-1/services/%{dbus_service_name_calendar}.service
%{_datadir}/dbus-1/services/org.gnome.evolution.dataserver.Sources5.service %{_datadir}/dbus-1/services/%{dbus_service_name_sources}.service
%{_datadir}/dbus-1/services/org.gnome.evolution.dataserver.UserPrompter0.service %{_datadir}/dbus-1/services/%{dbus_service_name_user_prompter}.service
%{_datadir}/pixmaps/evolution-data-server %{_datadir}/pixmaps/evolution-data-server
%if ! 0%{?flatpak} %if ! 0%{?flatpak}
@ -470,6 +482,9 @@ find $RPM_BUILD_ROOT -name '*.so.*' -exec chmod +x {} \;
%{_datadir}/installed-tests %{_datadir}/installed-tests
%changelog %changelog
* Mon Oct 05 2020 Milan Crha <mcrha@redhat.com> - 3.38.1-2
- Correct D-Bus service file name - it can change when _eds_dbus_services_prefix is defined
* Fri Oct 02 2020 Milan Crha <mcrha@redhat.com> - 3.38.1-1 * Fri Oct 02 2020 Milan Crha <mcrha@redhat.com> - 3.38.1-1
- Update to 3.38.1 - Update to 3.38.1