Fix path to configuration file. Release 2

[packages/NetworkManager-pptp.git] / NetworkManager-pptp.spec

diff --git a/NetworkManager-pptp.spec b/NetworkManager-pptp.spec
index d80e77e4244420dfd9c1846f5c0d558733c8cd5e..9ded081405647d2c515041b4306e1996dd07688d 100644 (file)
--- a/NetworkManager-pptp.spec
+++ b/NetworkManager-pptp.spec
@@ -1,31 +1,32 @@
-#
-%define                ppp_version     2.4.5
-#
 Summary:       NetworkManager VPN integration for PPTP
 Summary(pl.UTF-8):     Integracja NetworkManagera z protokołem PPTP
 Name:          NetworkManager-pptp
-Version:       0.8
+Version:       1.2.2
 Release:       2
-License:       GPL v2
+License:       GPL v2+
 Group:         X11/Applications
-Source0:       http://ftp.gnome.org/pub/GNOME/sources/NetworkManager-pptp/0.8/%{name}-%{version}.tar.bz2
-# Source0-md5: f87226c2d56c920617b53cf429e0c4b6
-URL:           http://projects.gnome.org/NetworkManager/
-BuildRequires: GConf2-devel >= 2.0
-BuildRequires: NetworkManager-devel >= 0.8
+Source0:       http://ftp.gnome.org/pub/GNOME/sources/NetworkManager-pptp/1.2/%{name}-%{version}.tar.xz
+# Source0-md5: e1d0021eff80fcf6ad1c445b4fa0451d
+URL:           https://wiki.gnome.org/Projects/NetworkManager
+BuildRequires: NetworkManager-devel >= 2:1.2.0
+BuildRequires: NetworkManager-gtk-lib-devel >= 1.2.0
 BuildRequires: autoconf >= 2.59
 BuildRequires: automake >= 1:1.9
-BuildRequires: dbus-glib-devel >= 0.74
-BuildRequires: gettext-devel
-BuildRequires: gnome-keyring-devel
-BuildRequires: gtk+2-devel >= 2:2.6.0
+BuildRequires: gettext-tools
+BuildRequires: glib2-devel >= 1:2.32
+BuildRequires: gtk+3-devel >= 3.4
 BuildRequires: intltool >= 0.35.0
-BuildRequires: libglade2-devel >= 2.0
+BuildRequires: libsecret-devel
 BuildRequires: libtool
 BuildRequires: pkgconfig
-BuildRequires: ppp-plugin-devel >= 3:%{ppp_version}
-Requires:      NetworkManager >= 0.8
-Requires:      ppp = 3:%{ppp_version}
+BuildRequires: ppp-plugin-devel >= 3:2.4.5
+BuildRequires: tar >= 1:1.22
+BuildRequires: xz
+Requires:      NetworkManager >= 2:1.0.0
+Requires:      NetworkManager-gtk-lib >= 1.0.6
+Requires:      glib2 >= 1:2.32
+Requires:      gtk+3 >= 3.4
+%requires_eq   ppp
 Requires:      pptp
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -46,7 +47,8 @@ Integracja NetworkManagera z protokołem PPTP.
 %{__autoheader}
 %{__automake}
 %configure \
-       --with-pppd-plugin-dir=%{_libdir}/pppd/%{ppp_version}
+       --disable-static \
+       --with-pppd-plugin-dir=%{_libdir}/pppd/plugins
 %{__make}
 
 %install
@@ -55,8 +57,8 @@ rm -rf $RPM_BUILD_ROOT
 %{__make} install \
        DESTDIR=$RPM_BUILD_ROOT
 
-rm -rf $RPM_BUILD_ROOT%{_libdir}/NetworkManager/*.{a,la}
-rm -rf $RPM_BUILD_ROOT%{_libdir}/pppd/*.*.*/*.{a,la}
+%{__rm} $RPM_BUILD_ROOT%{_libdir}/NetworkManager/*.la
+%{__rm} $RPM_BUILD_ROOT%{_libdir}/pppd/plugins/*.la
 
 %find_lang %{name}
 
@@ -66,10 +68,13 @@ rm -rf $RPM_BUILD_ROOT
 %files -f %{name}.lang
 %defattr(644,root,root,755)
 %doc AUTHORS ChangeLog README TODO
+%attr(755,root,root) %{_libdir}/NetworkManager/libnm-vpn-plugin-pptp.so
 %attr(755,root,root) %{_libdir}/NetworkManager/libnm-pptp-properties.so
 %attr(755,root,root) %{_libdir}/nm-pptp-auth-dialog
 %attr(755,root,root) %{_libdir}/nm-pptp-service
-%attr(755,root,root) %{_libdir}/pppd/%{ppp_version}/nm-pptp-pppd-plugin.so
+%attr(755,root,root) %{_libdir}/pppd/plugins/nm-pptp-pppd-plugin.so
 %{_sysconfdir}/NetworkManager/VPN/nm-pptp-service.name
-%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/dbus-1/system.d/nm-pptp-service.conf
+%{_prefix}/lib/NetworkManager/VPN/nm-pptp-service.name
+%config(noreplace) %verify(not md5 mtime size) /etc/dbus-1/system.d/nm-pptp-service.conf
+%{_datadir}/appdata/network-manager-pptp.metainfo.xml
 %{_datadir}/gnome-vpn-properties/pptp