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

NetworkManager-pptp.spec

@@ -4,25 +4,17 @@
 %bcond_with libnm_glib
 %endif
 
-%global real_version     1.2.8
-%global rpm_version      1.2.8
-%global release_version  2
-
-%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')
-
 Summary:   NetworkManager VPN plugin for PPTP
 Name:      NetworkManager-pptp
 Epoch:     1
-Version:   %{rpm_version}
-Release:   %{release_version}%{?dist}.2
+Version:   1.2.8
+Release:   3%{?dist}
 License:   GPLv2+
 URL:       http://www.gnome.org/projects/NetworkManager/
 
-
-Source0:   https://download.gnome.org/sources/NetworkManager-pptp/%{real_version_major}/%{name}-%{real_version}.tar.xz
+Source0:   https://download.gnome.org/sources/NetworkManager-pptp/1.2/%{name}-%{version}.tar.xz
 #Patch1: 0001-example.patch
 
-
 %global ppp_version %(sed -n 's/^#define\\s*VERSION\\s*"\\([^\\s]*\\)"$/\\1/p' %{_includedir}/pppd/patchlevel.h 2>/dev/null | grep . || echo bad)
 
 BuildRequires: make
@@ -39,7 +31,7 @@ BuildRequires: NetworkManager-glib-devel >= 1:1.2.0
 BuildRequires: libnm-gtk-devel >= 0.9
 %endif
 
-Requires: dbus
+Requires: dbus-common
 Requires: NetworkManager >= 1:1.2.0
 Requires: pptp
 Requires: ppp = %{ppp_version}
@@ -64,7 +56,7 @@ the PPTP server with NetworkManager (GNOME files).
 
 
 %prep
-%autosetup -p1 -n "%{name}-%{real_version}"
+%autosetup -p1
 
 
 %build
@@ -89,12 +81,14 @@ make install DESTDIR=%{buildroot} INSTALL="%{__install} -p"
 rm -f %{buildroot}%{_libdir}/NetworkManager/lib*.la
 rm -f %{buildroot}%{_libdir}/pppd/%{ppp_version}/*.la
 
+mv %{buildroot}%{_sysconfdir}/dbus-1 %{buildroot}%{_datadir}/
+
 %find_lang %{name}
 
 
 %files -f %{name}.lang
 %{_libdir}/NetworkManager/libnm-vpn-plugin-pptp.so
-%{_sysconfdir}/dbus-1/system.d/nm-pptp-service.conf
+%{_datadir}/dbus-1/system.d/nm-pptp-service.conf
 %{_prefix}/lib/NetworkManager/VPN/nm-pptp-service.name
 %{_libexecdir}/nm-pptp-service
 %{_libdir}/pppd/%{ppp_version}/nm-pptp-pppd-plugin.so
@@ -113,6 +107,9 @@ rm -f %{buildroot}%{_libdir}/pppd/%{ppp_version}/*.la
 
 
 %changelog
+* Mon Feb 15 2021 Lubomir Rintel <lkundrak@v3.sk> - 1:1.2.8-3
+- Move dbus service file into /usr/share/dbus-1
+
 * Mon Jan 25 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1:1.2.8-2.2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild