rpms/NetworkManager/F-8 .cvsignore, 1.64, 1.65 NetworkManager-0.6.5-fixup-internal-applet-build.patch, 1.7, 1.8 NetworkManager.spec, 1.188, 1.189 sources, 1.83, 1.84 nm-applet-0.7.0-applet-usb-vendor-fix.patch, 1.1, NONE
Daniel Williams (dcbw)
fedora-extras-commits at redhat.com
Tue Nov 13 21:23:06 UTC 2007
- Previous message (by thread): rpms/moreutils/F-7 .cvsignore, 1.2, 1.3 moreutils.spec, 1.1, 1.2 sources, 1.2, 1.3
- Next message (by thread): rpms/moreutils/F-8 .cvsignore, 1.2, 1.3 moreutils.spec, 1.1, 1.2 sources, 1.2, 1.3
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: dcbw
Update of /cvs/extras/rpms/NetworkManager/F-8
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31930
Modified Files:
.cvsignore
NetworkManager-0.6.5-fixup-internal-applet-build.patch
NetworkManager.spec sources
Removed Files:
nm-applet-0.7.0-applet-usb-vendor-fix.patch
Log Message:
* Tue Nov 13 2007 Dan Williams <dcbw at redhat.com> - 1:0.7.0-0.6.2.svn3080
- Clarify naming of WPA & WPA2 Personal encryption options (rh #374861, rh #373831)
- Don't require a CA certificate for applicable EAP methods (rh #359001)
- Fix certificate and private key handling for EAP-TTLS and EAP-TLS (rh #323371)
- Fix applet crash with USB devices (rh #337191)
- Support upgrades from NM 0.6.x GConf settings
Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/NetworkManager/F-8/.cvsignore,v
retrieving revision 1.64
retrieving revision 1.65
diff -u -r1.64 -r1.65
--- .cvsignore 27 Oct 2007 04:57:27 -0000 1.64
+++ .cvsignore 13 Nov 2007 21:22:32 -0000 1.65
@@ -46,3 +46,5 @@
NetworkManager-0.7.0.svn3030.tar.gz
nm-applet-0.7.0.svn301.tar.gz
nm-applet-0.7.0.svn302.tar.gz
+NetworkManager-0.7.0.svn3083.tar.gz
+nm-applet-0.7.0.svn346.tar.gz
NetworkManager-0.6.5-fixup-internal-applet-build.patch:
Index: NetworkManager-0.6.5-fixup-internal-applet-build.patch
===================================================================
RCS file: /cvs/extras/rpms/NetworkManager/F-8/NetworkManager-0.6.5-fixup-internal-applet-build.patch,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- NetworkManager-0.6.5-fixup-internal-applet-build.patch 16 Oct 2007 20:47:39 -0000 1.7
+++ NetworkManager-0.6.5-fixup-internal-applet-build.patch 13 Nov 2007 21:22:32 -0000 1.8
@@ -1,6 +1,6 @@
diff -up NetworkManager-0.7.0/nm-applet-0.7.0/configure.ac.buildfix NetworkManager-0.7.0/nm-applet-0.7.0/configure.ac
---- NetworkManager-0.7.0/nm-applet-0.7.0/configure.ac.buildfix 2007-10-13 20:48:35.000000000 -0400
-+++ NetworkManager-0.7.0/nm-applet-0.7.0/configure.ac 2007-10-16 13:14:57.000000000 -0400
+--- NetworkManager-0.7.0/nm-applet-0.7.0/configure.ac.buildfix 2007-11-13 09:53:39.000000000 -0500
++++ NetworkManager-0.7.0/nm-applet-0.7.0/configure.ac 2007-11-13 15:14:13.000000000 -0500
@@ -18,10 +18,10 @@ dnl
dnl This doesn't depend on gnome support, only on gnome-common, autogen already
dnl uses gnome-autogen
@@ -16,18 +16,19 @@
dnl
dnl Required headers
-@@ -60,8 +60,6 @@ AC_C_BIGENDIAN
+@@ -60,9 +60,6 @@ AC_C_BIGENDIAN
PKG_CHECK_MODULES(NMA,
[dbus-glib-1 >= 0.72
glib-2.0 >= 2.10
- NetworkManager >= 0.7.0
- libnm_glib
+- libnm-util
gtk+-2.0 >= 2.6
libglade-2.0
gconf-2.0
diff -up NetworkManager-0.7.0/nm-applet-0.7.0/src/vpn-properties/Makefile.am.buildfix NetworkManager-0.7.0/nm-applet-0.7.0/src/vpn-properties/Makefile.am
--- NetworkManager-0.7.0/nm-applet-0.7.0/src/vpn-properties/Makefile.am.buildfix 2007-09-22 22:54:27.000000000 -0400
-+++ NetworkManager-0.7.0/nm-applet-0.7.0/src/vpn-properties/Makefile.am 2007-10-16 13:14:57.000000000 -0400
++++ NetworkManager-0.7.0/nm-applet-0.7.0/src/vpn-properties/Makefile.am 2007-11-13 15:14:13.000000000 -0500
@@ -1,6 +1,10 @@
bin_PROGRAMS = nm-vpn-properties
@@ -51,16 +52,17 @@
CLEANFILES = $(server_DATA) *.bak *.gladep *~
diff -up NetworkManager-0.7.0/nm-applet-0.7.0/src/gconf-helpers/Makefile.am.buildfix NetworkManager-0.7.0/nm-applet-0.7.0/src/gconf-helpers/Makefile.am
---- NetworkManager-0.7.0/nm-applet-0.7.0/src/gconf-helpers/Makefile.am.buildfix 2007-09-19 22:53:14.000000000 -0400
-+++ NetworkManager-0.7.0/nm-applet-0.7.0/src/gconf-helpers/Makefile.am 2007-10-16 13:14:57.000000000 -0400
-@@ -1,8 +1,15 @@
+--- NetworkManager-0.7.0/nm-applet-0.7.0/src/gconf-helpers/Makefile.am.buildfix 2007-10-27 18:23:56.000000000 -0400
++++ NetworkManager-0.7.0/nm-applet-0.7.0/src/gconf-helpers/Makefile.am 2007-11-13 15:14:13.000000000 -0500
+@@ -1,3 +1,7 @@
+INCLUDES = -I${top_srcdir}/../include \
+ -I${top_srcdir}/../libnm-util \
+ -I${top_srcdir}/../libnm-glib
+
noinst_LTLIBRARIES = libgconf-helpers.la
- libgconf_helpers_la_SOURCES = gconf-helpers.h gconf-helpers.c
+ libgconf_helpers_la_SOURCES = \
+@@ -8,5 +12,8 @@ libgconf_helpers_la_SOURCES = \
libgconf_helpers_la_CPPFLAGS = $(NMA_CFLAGS)
@@ -70,9 +72,40 @@
+ -L${top_builddir}/../libnm-glib $(top_builddir)/../libnm-glib/libnm_glib.la
+
+diff -up NetworkManager-0.7.0/nm-applet-0.7.0/src/utils/Makefile.am.buildfix NetworkManager-0.7.0/nm-applet-0.7.0/src/utils/Makefile.am
+--- NetworkManager-0.7.0/nm-applet-0.7.0/src/utils/Makefile.am.buildfix 2007-11-13 15:41:01.000000000 -0500
++++ NetworkManager-0.7.0/nm-applet-0.7.0/src/utils/Makefile.am 2007-11-13 15:42:30.000000000 -0500
+@@ -1,3 +1,7 @@
++INCLUDES = -I${top_srcdir}/../include \
++ -I${top_srcdir}/../libnm-util \
++ -I${top_srcdir}/../libnm-glib
++
+ noinst_LTLIBRARIES = libutils.la
+
+ libutils_la_SOURCES = \
+@@ -10,7 +14,9 @@ libutils_la_SOURCES = \
+
+ libutils_la_CPPFLAGS = $(NMA_CFLAGS)
+
+-libutils_la_LIBADD = $(NMA_LIBS)
++libutils_la_LIBADD = $(NMA_LIBS) \
++ -L${top_builddir}/../libnm-util $(top_builddir)/../libnm-util/libnm-util.la \
++ -L${top_builddir}/../libnm-glib $(top_builddir)/../libnm-glib/libnm_glib.la
+
+ if WITH_GNUTLS
+ libutils_la_SOURCES += crypto_gnutls.c
+@@ -28,4 +34,7 @@ noinst_PROGRAMS = test-crypto
+
+ test_crypto_SOURCES = test-crypto.c
+ test_crypto_CPPFLAGS = $(NMA_CFLAGS)
+-test_crypto_LDADD = $(NMA_LIBS) ${top_builddir}/src/utils/libutils.la
++test_crypto_LDADD = $(NMA_LIBS) ${top_builddir}/src/utils/libutils.la \
++ -L${top_builddir}/../libnm-util $(top_builddir)/../libnm-util/libnm-util.la \
++ -L${top_builddir}/../libnm-glib $(top_builddir)/../libnm-glib/libnm_glib.la
++
diff -up NetworkManager-0.7.0/nm-applet-0.7.0/src/wireless-security/Makefile.am.buildfix NetworkManager-0.7.0/nm-applet-0.7.0/src/wireless-security/Makefile.am
---- NetworkManager-0.7.0/nm-applet-0.7.0/src/wireless-security/Makefile.am.buildfix 2007-10-16 13:25:35.000000000 -0400
-+++ NetworkManager-0.7.0/nm-applet-0.7.0/src/wireless-security/Makefile.am 2007-10-16 13:26:07.000000000 -0400
+--- NetworkManager-0.7.0/nm-applet-0.7.0/src/wireless-security/Makefile.am.buildfix 2007-11-07 12:12:16.000000000 -0500
++++ NetworkManager-0.7.0/nm-applet-0.7.0/src/wireless-security/Makefile.am 2007-11-13 15:14:13.000000000 -0500
@@ -1,5 +1,9 @@
noinst_LTLIBRARIES = libwireless-security.la
@@ -83,7 +116,7 @@
libwireless_security_la_SOURCES = \
wireless-security.h \
wireless-security.c \
-@@ -28,5 +32,7 @@ libwireless_security_la_CPPFLAGS = \
+@@ -35,5 +39,7 @@ libwireless_security_la_CPPFLAGS = \
libwireless_security_la_LIBADD = \
$(NMA_LIBS) \
@@ -94,7 +127,7 @@
diff -up NetworkManager-0.7.0/nm-applet-0.7.0/src/connection-editor/Makefile.am.buildfix NetworkManager-0.7.0/nm-applet-0.7.0/src/connection-editor/Makefile.am
--- NetworkManager-0.7.0/nm-applet-0.7.0/src/connection-editor/Makefile.am.buildfix 2007-09-20 07:40:37.000000000 -0400
-+++ NetworkManager-0.7.0/nm-applet-0.7.0/src/connection-editor/Makefile.am 2007-10-16 13:14:57.000000000 -0400
++++ NetworkManager-0.7.0/nm-applet-0.7.0/src/connection-editor/Makefile.am 2007-11-13 15:14:13.000000000 -0500
@@ -2,6 +2,10 @@ NULL=
bin_PROGRAMS = nm-connection-editor
@@ -118,8 +151,8 @@
gladedir = $(datadir)/nm-applet
glade_DATA = nm-connection-editor.glade
diff -up NetworkManager-0.7.0/nm-applet-0.7.0/src/Makefile.am.buildfix NetworkManager-0.7.0/nm-applet-0.7.0/src/Makefile.am
---- NetworkManager-0.7.0/nm-applet-0.7.0/src/Makefile.am.buildfix 2007-10-13 22:01:15.000000000 -0400
-+++ NetworkManager-0.7.0/nm-applet-0.7.0/src/Makefile.am 2007-10-16 13:14:57.000000000 -0400
+--- NetworkManager-0.7.0/nm-applet-0.7.0/src/Makefile.am.buildfix 2007-10-27 18:11:31.000000000 -0400
++++ NetworkManager-0.7.0/nm-applet-0.7.0/src/Makefile.am 2007-11-13 15:14:13.000000000 -0500
@@ -4,6 +4,10 @@ NULL=
bin_PROGRAMS = nm-applet
@@ -131,7 +164,7 @@
nm_applet_CPPFLAGS = \
$(NMA_CFLAGS) \
-DICONDIR=\""$(datadir)/icons"\" \
-@@ -60,7 +64,9 @@ nm_applet_LDADD = \
+@@ -58,7 +62,9 @@ nm_applet_LDADD = \
$(NMA_LIBS) \
${top_builddir}/src/utils/libutils.la \
${top_builddir}/src/gconf-helpers/libgconf-helpers.la \
Index: NetworkManager.spec
===================================================================
RCS file: /cvs/extras/rpms/NetworkManager/F-8/NetworkManager.spec,v
retrieving revision 1.188
retrieving revision 1.189
diff -u -r1.188 -r1.189
--- NetworkManager.spec 1 Nov 2007 11:29:49 -0000 1.188
+++ NetworkManager.spec 13 Nov 2007 21:22:32 -0000 1.189
@@ -7,21 +7,20 @@
%define gtk2_version 2.10.0
%define wireless_tools_version 1:28-0pre9
-%define snapshot svn3030
+%define snapshot svn3083
Name: NetworkManager
Summary: Network connection manager and user applications
Epoch: 1
Version: 0.7.0
-Release: 0.6.1.%{snapshot}%{?dist}
+Release: 0.6.2.%{snapshot}%{?dist}
Group: System Environment/Base
License: GPLv2+
URL: http://www.gnome.org/projects/NetworkManager/
Source: %{name}-%{version}.%{snapshot}.tar.gz
-Source1: nm-applet-%{version}.svn302.tar.gz
+Source1: nm-applet-%{version}.svn346.tar.gz
Patch1: NetworkManager-0.6.5-fixup-internal-applet-build.patch
Patch2: nm-applet-0.7.0-disable-stuff.patch
-Patch3: nm-applet-0.7.0-applet-usb-vendor-fix.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
PreReq: chkconfig
@@ -31,7 +30,7 @@
Requires: hal >= %{hal_version}
Requires: iproute openssl
Requires: dhclient >= 3.0.2-12
-Requires: wpa_supplicant >= 0.5.7-13
+Requires: wpa_supplicant >= 0.5.7-16
Requires: %{name}-glib = %{epoch}:%{version}-%{release}
Obsoletes: dhcdbd
@@ -127,7 +126,6 @@
tar -xzf %{SOURCE1}
%patch1 -p1 -b .buildfix
%patch2 -p1 -b .disable-stuff
-%patch3 -p1 -b .applet-usb-vendor-fix
%build
# Even though we don't require named, we still build with it
@@ -147,9 +145,8 @@
%configure \
--disable-static \
--with-notify \
- --with-named=/usr/sbin/named \
- --with-named-dir=/var/named/data \
- --with-named-user=named
+ --with-nss=yes \
+ --with-gnutls=no
make
popd
@@ -262,6 +259,13 @@
%changelog
+* Tue Nov 13 2007 Dan Williams <dcbw at redhat.com> - 1:0.7.0-0.6.2.svn3080
+- Clarify naming of WPA & WPA2 Personal encryption options (rh #374861, rh #373831)
+- Don't require a CA certificate for applicable EAP methods (rh #359001)
+- Fix certificate and private key handling for EAP-TTLS and EAP-TLS (rh #323371)
+- Fix applet crash with USB devices (rh #337191)
+- Support upgrades from NM 0.6.x GConf settings
+
* Thu Nov 1 2007 Dan Williams <dcbw at redhat.com> - 1:0.7.0-0.6.1.svn3030
- Fix applet crash with USB devices that don't advertise a product or vendor
(rh #337191)
Index: sources
===================================================================
RCS file: /cvs/extras/rpms/NetworkManager/F-8/sources,v
retrieving revision 1.83
retrieving revision 1.84
diff -u -r1.83 -r1.84
--- sources 27 Oct 2007 04:57:27 -0000 1.83
+++ sources 13 Nov 2007 21:22:32 -0000 1.84
@@ -1,2 +1,2 @@
-80a4e166b219a7fadfb760870d0585ab NetworkManager-0.7.0.svn3030.tar.gz
-a8af8c29954daaf1ff7b79d286894992 nm-applet-0.7.0.svn302.tar.gz
+3d8d6ab926d09b82fa93caadc7a53f45 NetworkManager-0.7.0.svn3083.tar.gz
+83a1250a1dae4148cf854ce0c259ce32 nm-applet-0.7.0.svn346.tar.gz
--- nm-applet-0.7.0-applet-usb-vendor-fix.patch DELETED ---
- Previous message (by thread): rpms/moreutils/F-7 .cvsignore, 1.2, 1.3 moreutils.spec, 1.1, 1.2 sources, 1.2, 1.3
- Next message (by thread): rpms/moreutils/F-8 .cvsignore, 1.2, 1.3 moreutils.spec, 1.1, 1.2 sources, 1.2, 1.3
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the fedora-extras-commits
mailing list