rpms/NetworkManager-pptp/F-12 .cvsignore, 1.10, 1.11 NetworkManager-pptp.spec, 1.18, 1.19 sources, 1.10, 1.11
Daniel Williams
dcbw at fedoraproject.org
Thu Jan 21 03:46:46 UTC 2010
Author: dcbw
Update of /cvs/pkgs/rpms/NetworkManager-pptp/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1718
Modified Files:
.cvsignore NetworkManager-pptp.spec sources
Log Message:
* Wed Jan 20 2010 Dan Williams <dcbw at redhat.com> - 1:0.7.997-1.git20100120
- Rebuild for new pppd
- Fix connections to PPtP gateways specified using hostnames
- Fix saving MPPE options
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/NetworkManager-pptp/F-12/.cvsignore,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- .cvsignore 21 Sep 2009 22:59:20 -0000 1.10
+++ .cvsignore 21 Jan 2010 03:46:46 -0000 1.11
@@ -7,3 +7,4 @@ NetworkManager-pptp-0.7.0.97.tar.bz2
NetworkManager-pptp-0.7.0.99.tar.bz2
NetworkManager-pptp-0.7.996.git20090828.tar.bz2
NetworkManager-pptp-0.7.996.git20090921.tar.bz2
+NetworkManager-pptp-0.7.997.git20100120.tar.bz2
Index: NetworkManager-pptp.spec
===================================================================
RCS file: /cvs/pkgs/rpms/NetworkManager-pptp/F-12/NetworkManager-pptp.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -p -r1.18 -r1.19
--- NetworkManager-pptp.spec 5 Oct 2009 17:59:31 -0000 1.18
+++ NetworkManager-pptp.spec 21 Jan 2010 03:46:46 -0000 1.19
@@ -1,20 +1,20 @@
%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 .git20090921
+%define git_snapshot .git20100120
Summary: NetworkManager VPN plugin for pptp
Name: NetworkManager-pptp
Epoch: 1
-Version: 0.7.996
-Release: 4%{svn_snapshot}%{?dist}
+Version: 0.7.997
+Release: 1%{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,18 @@ 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 <dcbw at redhat.com> - 1:0.7.997-1.git20100120
+- Rebuild for new pppd
+- Fix connections to PPtP gateways specified using hostnames
+- Fix saving MPPE options
+
* Mon Oct 5 2009 Dan Williams <dcbw at redhat.com> - 1:0.7.996-4.git20090921
- Rebuild for updated NetworkManager
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/NetworkManager-pptp/F-12/sources,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- sources 21 Sep 2009 22:59:21 -0000 1.10
+++ sources 21 Jan 2010 03:46:46 -0000 1.11
@@ -1 +1 @@
-7793770d136a65e8aebb66855a4f2ab4 NetworkManager-pptp-0.7.996.git20090921.tar.bz2
+3f7207a551a3afc3fcc8a5b35cfa2fd9 NetworkManager-pptp-0.7.997.git20100120.tar.bz2
More information about the scm-commits
mailing list