diff --git a/.cvsignore b/.cvsignore index f1847ab..bbf8bd1 100644 --- a/.cvsignore +++ b/.cvsignore @@ -14,3 +14,5 @@ nm-applet-0.7.0.svn199.tar.gz NetworkManager-0.7.0.svn2884.tar.gz nm-applet-0.7.0.svn200.tar.gz NetworkManager-0.7.0.svn2886.tar.gz +NetworkManager-0.7.0.svn2907.tar.gz +nm-applet-0.7.0.svn202.tar.gz diff --git a/NetworkManager-0.6.5-deprecated.patch b/NetworkManager-0.6.5-deprecated.patch deleted file mode 100644 index ccbd913..0000000 --- a/NetworkManager-0.6.5-deprecated.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff -up NetworkManager-0.6.5/gnome/vpn-properties/Makefile.in.deprecated NetworkManager-0.6.5/gnome/vpn-properties/Makefile.in ---- NetworkManager-0.6.5/gnome/vpn-properties/Makefile.in.deprecated 2007-08-07 15:18:50.000000000 -0400 -+++ NetworkManager-0.6.5/gnome/vpn-properties/Makefile.in 2007-08-07 15:19:19.000000000 -0400 -@@ -307,9 +307,6 @@ nm_vpn_properties_CFLAGS = \ - -DSYSCONFDIR=\"$(sysconfdir)\" \ - -DICONDIR=\""$(datadir)/icons"\" \ - -DGLADEDIR=\""$(gladedir)"\" \ -- -DG_DISABLE_DEPRECATED \ -- -DGDK_DISABLE_DEPRECATED \ -- -DGNOME_DISABLE_DEPRECATED \ - -DGNOMELOCALEDIR=\"$(datadir)/locale\" \ - -DVERSION=\"$(VERSION)\" \ - $(NULL) diff --git a/NetworkManager.spec b/NetworkManager.spec index 6fd4aa1..8a30eb3 100644 --- a/NetworkManager.spec +++ b/NetworkManager.spec @@ -7,7 +7,7 @@ ExcludeArch: s390 s390x %define gtk2_version 2.10.0 %define wireless_tools_version 1:28-0pre9 -%define snapshot svn2886 +%define snapshot svn2907 Name: NetworkManager Summary: Network connection manager and user applications @@ -18,7 +18,7 @@ Group: System Environment/Base License: GPLv2+ URL: http://www.gnome.org/projects/NetworkManager/ Source: %{name}-%{version}.%{snapshot}.tar.gz -Source1: nm-applet-%{version}.svn200.tar.gz +Source1: nm-applet-%{version}.svn202.tar.gz Patch1: NetworkManager-0.6.5-fixup-internal-applet-build.patch Patch2: nm-applet-0.7.0-disable-stuff.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -31,6 +31,7 @@ Requires: hal >= %{hal_version} Requires: iproute openssl Requires: dhclient >= 3.0.2-12 Requires: wpa_supplicant >= 0.5.7-7 +Requires: %{name}-glib = %{epoch}:%{version}-%{release} Obsoletes: dhcdbd BuildRequires: dbus-devel >= %{dbus_version} @@ -67,6 +68,7 @@ from a DHCP server, and change nameservers whenever it sees fit. Summary: GNOME applications for use with NetworkManager Group: Applications/Internet Requires: %{name} = %{epoch}:%{version}-%{release} +Requires: %{name}-glib = %{epoch}:%{version}-%{release} Requires: gnome-panel Requires: dbus >= %{dbus_version} Requires: dbus-glib >= %{dbus_glib_version} @@ -258,6 +260,10 @@ fi %changelog +* Thu Sep 27 2007 Dan Williams - 1:0.7.0-0.3.svn2907 +- New snapshot + - VPN support (only vpnc plugin ported at this time) + * Tue Sep 25 2007 Dan Williams - 1:0.7.0-0.3.svn2886 - New snapshot - Make wired device carrier state work in the applet diff --git a/sources b/sources index 680ab93..b8236b5 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -8edfd5854389ea6a6b4eb1f507b46c38 nm-applet-0.7.0.svn200.tar.gz -fe78cab7288beef5e69dcf897a76d16b NetworkManager-0.7.0.svn2886.tar.gz +14197b29863a439baa51f1b9bc5403da NetworkManager-0.7.0.svn2907.tar.gz +89e397896518d51c02a6a1f700564a9c nm-applet-0.7.0.svn202.tar.gz