diff --git a/.gitignore b/.gitignore index 7cd088a..1d78e78 100644 --- a/.gitignore +++ b/.gitignore @@ -15,3 +15,4 @@ NetworkManager-pptp-0.8.1.tar.bz2 /NetworkManager-pptp-0.9.8.2.tar.bz2 /NetworkManager-pptp-1.0.0.tar.xz /NetworkManager-pptp-1.1.0.20150428git695d4f2.tar.bz2 +/NetworkManager-pptp-1.2.0.tar.xz diff --git a/NetworkManager-pptp.spec b/NetworkManager-pptp.spec index a5c7619..eb98a81 100644 --- a/NetworkManager-pptp.spec +++ b/NetworkManager-pptp.spec @@ -1,25 +1,26 @@ -%global snapshot .20150428git695d4f2 +%global snapshot .20150903git345c34e %global ppp_version %(rpm -q ppp --queryformat '%{VERSION}') Summary: NetworkManager VPN plugin for PPTP Name: NetworkManager-pptp Epoch: 1 -Version: 1.1.0 -Release: 3%{snapshot}%{?dist} +Version: 1.2.0 +Release: 0.1%{?snapshot}%{?dist} License: GPLv2+ URL: http://www.gnome.org/projects/NetworkManager/ Group: System Environment/Base -Source0: https://download.gnome.org/sources/NetworkManager-pptp/1.0/%{name}-%{version}%{snapshot}.tar.bz2 +Source0: https://download.gnome.org/sources/NetworkManager-pptp/1.2/%{name}-%{version}.tar.xz BuildRequires: gtk3-devel -BuildRequires: dbus-devel BuildRequires: NetworkManager-devel -BuildRequires: NetworkManager-glib-devel +BuildRequires: NetworkManager-glib-devel >= 1:1.1.0 +BuildRequires: NetworkManager-libnm-devel >= 1:1.1.0 BuildRequires: glib2-devel BuildRequires: ppp-devel BuildRequires: libtool intltool gettext BuildRequires: libsecret-devel -BuildRequires: libnm-gtk-devel +BuildRequires: libnm-gtk-devel >= 0.9 +BuildRequires: libnma-devel >= 1.1.0 Requires: gtk3 Requires: dbus @@ -43,7 +44,7 @@ the PPTP server with NetworkManager. Summary: NetworkManager VPN plugin for PPTP - GNOME files Group: System Environment/Base -Requires: NetworkManager-pptp = %{epoch}:%{version}-%{release} +Requires: %{name}%{?_isa} = %{epoch}:%{version}-%{release} Requires: nm-connection-editor Obsoletes: NetworkManager-pptp < 1:0.9.8.2-3 @@ -61,7 +62,8 @@ fi %configure \ --disable-static \ --enable-more-warnings=yes \ - --with-pppd-plugin-dir=%{_libdir}/pppd/%{ppp_version} + --with-pppd-plugin-dir=%{_libdir}/pppd/%{ppp_version} \ + --with-dist-version=%{version}-%{release} make %{?_smp_mflags} %check @@ -71,28 +73,31 @@ make check make install DESTDIR=%{buildroot} INSTALL="%{__install} -p" rm -f %{buildroot}%{_libdir}/NetworkManager/lib*.la -rm -f %{buildroot}%{_libdir}/NetworkManager/lib*.a rm -f %{buildroot}%{_libdir}/pppd/%{ppp_version}/*.la %find_lang %{name} %files -f %{name}.lang -%doc COPYING AUTHORS README ChangeLog %{_sysconfdir}/dbus-1/system.d/nm-pptp-service.conf -%{_sysconfdir}/NetworkManager/VPN/nm-pptp-service.name +%{_prefix}/lib/NetworkManager/VPN/nm-pptp-service.name %{_libexecdir}/nm-pptp-service %{_libexecdir}/nm-pptp-auth-dialog %{_libdir}/pppd/%{ppp_version}/nm-pptp-pppd-plugin.so +%doc AUTHORS README ChangeLog NEWS +%license COPYING %files -n NetworkManager-pptp-gnome -%doc COPYING AUTHORS README ChangeLog %{_libdir}/NetworkManager/lib*.so* %dir %{_datadir}/gnome-vpn-properties/pptp %{_datadir}/gnome-vpn-properties/pptp/nm-pptp-dialog.ui +%{_sysconfdir}/NetworkManager/VPN/nm-pptp-service.name %changelog +* Thu Sep 3 2015 Lubomir Rintel - 1:1.2.0-0.1.20150901git345c34e +- Update to 1.2 git snapshot with libnm-based properties plugin + * Thu Sep 3 2015 Lubomir Rintel - 1:1.1.0-3.20150428git695d4f2 -- Avoid requireing NetworkManager-gnome +- Avoid requiring NetworkManager-gnome * Tue Jun 16 2015 Fedora Release Engineering - 1:1.1.0-2.20150428git695d4f2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild diff --git a/sources b/sources index c73c291..1856f8e 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -5843ec177126eec3f4f349422c535491 NetworkManager-pptp-1.1.0.20150428git695d4f2.tar.bz2 +5d5a43ef2f79bd110713e1fe318fcbd3 NetworkManager-pptp-1.2.0.tar.xz