- Fix issues with VPN passwords not getting found

This commit is contained in:
Daniel Williams 2008-04-10 03:54:04 +00:00
parent 94d373b1c6
commit 0ec7b9d1b9
3 changed files with 16 additions and 4 deletions

View File

@ -91,3 +91,5 @@ nm-applet-0.7.0.svn645.tar.gz
NetworkManager-0.7.0.svn3547.tar.gz NetworkManager-0.7.0.svn3547.tar.gz
nm-applet-0.7.0.svn657.tar.gz nm-applet-0.7.0.svn657.tar.gz
NetworkManager-0.7.0.svn3548.tar.gz NetworkManager-0.7.0.svn3548.tar.gz
NetworkManager-0.7.0.svn3549.tar.gz
nm-applet-0.7.0.svn662.tar.gz

View File

@ -9,8 +9,8 @@ ExcludeArch: s390 s390x
%define libnl_version 1.0-0.15.pre8.git20071218 %define libnl_version 1.0-0.15.pre8.git20071218
%define ppp_version 2.2.4 %define ppp_version 2.2.4
%define snapshot svn3548 %define snapshot svn3549
%define applet_snapshot svn657 %define applet_snapshot svn662
Name: NetworkManager Name: NetworkManager
Summary: Network connection manager and user applications Summary: Network connection manager and user applications
@ -40,6 +40,10 @@ Requires: %{name}-glib = %{epoch}:%{version}-%{release}
Requires: ppp >= %{ppp_version} Requires: ppp >= %{ppp_version}
Obsoletes: dhcdbd Obsoletes: dhcdbd
# Due to VPN auth-dialog changes in applet r662
Conflicts: NetworkManager-vpnc < 1:0.7.0-0.7.7.svn3549
Conflicts: NetworkManager-openvpn < 1:0.7.0-9.svn3549
BuildRequires: dbus-devel >= %{dbus_version} BuildRequires: dbus-devel >= %{dbus_version}
BuildRequires: dbus-glib-devel >= %{dbus_glib_version} BuildRequires: dbus-glib-devel >= %{dbus_glib_version}
BuildRequires: wireless-tools-devel >= %{wireless_tools_version} BuildRequires: wireless-tools-devel >= %{wireless_tools_version}
@ -183,6 +187,8 @@ cat nm-applet.lang >> %{name}.lang
%{__rm} -f $RPM_BUILD_ROOT%{_libdir}/pppd/2.4.4/*.la %{__rm} -f $RPM_BUILD_ROOT%{_libdir}/pppd/2.4.4/*.la
%{__rm} -f $RPM_BUILD_ROOT%{_libdir}/NetworkManager/*.la %{__rm} -f $RPM_BUILD_ROOT%{_libdir}/NetworkManager/*.la
install -m 0755 test/.libs/nm-online %{buildroot}/%{_bindir}
%clean %clean
%{__rm} -rf $RPM_BUILD_ROOT %{__rm} -rf $RPM_BUILD_ROOT
@ -233,6 +239,7 @@ fi
%dir %{_sysconfdir}/NetworkManager/dispatcher.d %dir %{_sysconfdir}/NetworkManager/dispatcher.d
%dir %{_sysconfdir}/NetworkManager/VPN %dir %{_sysconfdir}/NetworkManager/VPN
%{_bindir}/nm-tool %{_bindir}/nm-tool
%{_bindir}/nm-online
%{_libexecdir}/nm-dhcp-client.action %{_libexecdir}/nm-dhcp-client.action
%{_libdir}/libnm-util.so* %{_libdir}/libnm-util.so*
%dir %{_libdir}/NetworkManager %dir %{_libdir}/NetworkManager
@ -280,6 +287,9 @@ fi
%changelog %changelog
* Wed Apr 9 2008 Dan Williams <dcbw@redhat.com> - 1:0.7.0-0.9.1.svn3549
- Fix issues with VPN passwords not getting found
* Tue Apr 8 2008 Dan Williams <dcbw@redhat.com> - 1:0.7.0-0.9.1.svn3548 * Tue Apr 8 2008 Dan Williams <dcbw@redhat.com> - 1:0.7.0-0.9.1.svn3548
- Fix builds due to glib2 breakage of GStaticMutex with gcc 4.3 - Fix builds due to glib2 breakage of GStaticMutex with gcc 4.3

View File

@ -1,2 +1,2 @@
4d6200f8722278cfbcc7d3e7f3eddc06 nm-applet-0.7.0.svn657.tar.gz 126323fb50af92c634899c45d53f8596 NetworkManager-0.7.0.svn3549.tar.gz
2b363549f0cd2300b81c1f52a799b1dd NetworkManager-0.7.0.svn3548.tar.gz 75614d7d309c713defdb81d5c8288871 nm-applet-0.7.0.svn662.tar.gz