Move dbus service file into /usr/share/dbus-1

NetworkManager-libreswan.spec

@@ -4,23 +4,16 @@
 %bcond_with libnm_glib
 %endif
 
-%global real_version     1.2.14
-%global rpm_version      1.2.14
-%global release_version  1
-
-%global real_version_major %(printf '%s' '%{real_version}' | sed -n 's/^\\([1-9][0-9]*\\.[1-9][0-9]*\\)\\.[1-9][0-9]*$/\\1/p')
-
 %global nm_version       1:1.2.0
 %global nma_version      1.2.0
 
-
 Summary:   NetworkManager VPN plug-in for IPsec VPN
 Name:      NetworkManager-libreswan
-Version:   %{rpm_version}
-Release:   %{release_version}%{?dist}.1
+Version:   1.2.14
+Release:   2%{?dist}
 License:   GPLv2+
 URL:       http://www.gnome.org/projects/NetworkManager/
-Source0:   https://download.gnome.org/sources/NetworkManager-libreswan/%{real_version_major}/%{name}-%{real_version}.tar.xz
+Source0:   https://download.gnome.org/sources/NetworkManager-libreswan/1.2/%{name}-%{version}.tar.xz
 
 #Patch1: 0001-some.patch
 
@@ -40,7 +33,7 @@ BuildRequires: libnm-gtk-devel >= %{nma_version}
 %endif
 
 Requires: NetworkManager >= %{nm_version}
-Requires: dbus
+Requires: dbus-common
 Requires: /usr/sbin/ipsec
 
 Provides: NetworkManager-openswan = %{version}-%{release}
@@ -71,7 +64,7 @@ the libreswan server with NetworkManager (GNOME files).
 
 
 %prep
-%autosetup -p1 -n "%{name}-%{real_version}"
+%autosetup -p1
 
 
 %build
@@ -88,12 +81,13 @@ make %{?_smp_mflags}
 %install
 make install DESTDIR=%{buildroot}
 rm -f %{buildroot}%{_libdir}/NetworkManager/lib*.la
+mv %{buildroot}%{_sysconfdir}/dbus-1 %{buildroot}%{_datadir}/
 
 %find_lang %{name}
 
 %files -f %{name}.lang
 %{_libdir}/NetworkManager/libnm-vpn-plugin-libreswan.so
-%{_sysconfdir}/dbus-1/system.d/nm-libreswan-service.conf
+%{_datadir}/dbus-1/system.d/nm-libreswan-service.conf
 %{_prefix}/lib/NetworkManager/VPN/nm-libreswan-service.name
 %{_libexecdir}/nm-libreswan-service
 %{_libexecdir}/nm-libreswan-service-helper
@@ -116,6 +110,9 @@ rm -f %{buildroot}%{_libdir}/NetworkManager/lib*.la
 
 
 %changelog
+* Mon Feb 15 2021 Lubomir Rintel <lkundrak@v3.sk> - 1.2.14-2
+- Move dbus service file into /usr/share/dbus-1
+
 * Mon Jan 25 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1.2.14-1.1
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild