diff --git a/NetworkManager-pptp.spec b/NetworkManager-pptp.spec index a01f13c..5d3673c 100644 --- a/NetworkManager-pptp.spec +++ b/NetworkManager-pptp.spec @@ -1,20 +1,20 @@ -%define nm_version 1:0.7.997-1 +%define nm_version 1:0.7.996-2 %define dbus_version 1.1 %define gtk2_version 2.10.0 -%define ppp_version 2.2.4 +%define ppp_version 2.4.5 %define shared_mime_version 0.16-3 -%define svn_snapshot %{nil} +%define git_snapshot .git20100120 Summary: NetworkManager VPN plugin for pptp Name: NetworkManager-pptp Epoch: 1 Version: 0.7.997 -Release: 1%{svn_snapshot}%{?dist} +Release: 2%{git_snapshot}%{?dist} License: GPLv2+ Group: System Environment/Base URL: http://www.gnome.org/projects/NetworkManager/ -Source: %{name}-%{version}%{svn_snapshot}.tar.bz2 +Source: %{name}-%{version}%{git_snapshot}.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-root @@ -27,12 +27,12 @@ BuildRequires: GConf2-devel BuildRequires: gnome-keyring-devel BuildRequires: libglade2-devel BuildRequires: intltool gettext -BuildRequires: ppp-devel >= %{ppp_version} +BuildRequires: ppp-devel = %{ppp_version} Requires: gtk2 >= %{gtk2_version} Requires: dbus >= %{dbus_version} Requires: NetworkManager >= %{nm_version} -Requires: ppp >= %{ppp_version} +Requires: ppp = %{ppp_version} Requires: shared-mime-info >= %{shared_mime_version} Requires: pptp Requires: GConf2 @@ -60,8 +60,8 @@ make install DESTDIR=$RPM_BUILD_ROOT rm -f %{buildroot}%{_libdir}/NetworkManager/lib*.la rm -f %{buildroot}%{_libdir}/NetworkManager/lib*.a -rm -f %{buildroot}%{_libdir}/pppd/2.4.4/nm-pptp-pppd-plugin.la -rm -f %{buildroot}%{_libdir}/pppd/2.4.4/nm-pptp-pppd-plugin.a +rm -f %{buildroot}%{_libdir}/pppd/2.*/nm-pptp-pppd-plugin.la +rm -f %{buildroot}%{_libdir}/pppd/2.*/nm-pptp-pppd-plugin.a %find_lang %{name} @@ -97,13 +97,16 @@ fi %{_sysconfdir}/dbus-1/system.d/nm-pptp-service.conf %{_sysconfdir}/NetworkManager/VPN/nm-pptp-service.name %{_libexecdir}/nm-pptp-service -%{_libdir}/pppd/2.4.4/nm-pptp-pppd-plugin.so +%{_libdir}/pppd/2.*/nm-pptp-pppd-plugin.so %{_datadir}/gnome-vpn-properties/pptp/nm-pptp-dialog.glade %{_datadir}/applications/nm-pptp.desktop %{_datadir}/icons/hicolor/48x48/apps/gnome-mime-application-x-pptp-settings.png %dir %{_datadir}/gnome-vpn-properties/pptp %changelog +* Wed Jan 20 2010 Dan Williams - 1:0.7.997-2.git20100120 +- Rebuild for new pppd + * Mon Dec 14 2009 Dan Williams - 1:0.7.997-1 - Add debugging helpers - Fix saving MPPE-related settings from the properties dialog diff --git a/sources b/sources index 02029a2..07f3bb8 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -8cc3b32ec753421327fa64a82c571b24 NetworkManager-pptp-0.7.997.tar.bz2 +3f7207a551a3afc3fcc8a5b35cfa2fd9 NetworkManager-pptp-0.7.997.git20100120.tar.bz2