rpms/NetworkManager/F-8 NetworkManager-0.6.5-fixup-internal-applet-build.patch, 1.15, 1.16 NetworkManager.spec, 1.210, 1.211 optionally-wait-for-network.patch, 1.2, 1.3 sources, 1.103, 1.104
Daniel Williams (dcbw)
fedora-extras-commits at redhat.com
Thu Jun 5 15:55:35 UTC 2008
Author: dcbw
Update of /cvs/pkgs/rpms/NetworkManager/F-8
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23089
Modified Files:
NetworkManager-0.6.5-fixup-internal-applet-build.patch
NetworkManager.spec optionally-wait-for-network.patch sources
Log Message:
* Wed Jun 4 2008 Dan Williams <dcbw at redhat.com> - 1:0.7.0-0.6.8.svn3675
- Move NM later in the shutdown process (rh #449070)
- Move libnm-util into a subpackage to allow NM to be removed more easily (rh #351101)
- Read global gateway from /etc/sysconfig/network if missing (rh #446527)
- nm-system-settings now terminates when dbus goes away (rh #444976)
NetworkManager-0.6.5-fixup-internal-applet-build.patch:
Index: NetworkManager-0.6.5-fixup-internal-applet-build.patch
===================================================================
RCS file: /cvs/pkgs/rpms/NetworkManager/F-8/NetworkManager-0.6.5-fixup-internal-applet-build.patch,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- NetworkManager-0.6.5-fixup-internal-applet-build.patch 14 May 2008 10:59:02 -0000 1.15
+++ NetworkManager-0.6.5-fixup-internal-applet-build.patch 5 Jun 2008 15:54:37 -0000 1.16
@@ -68,25 +68,14 @@
noinst_LTLIBRARIES = libutils.la
libutils_la_SOURCES = \
-@@ -10,7 +14,9 @@ libutils_la_SOURCES = \
-
- libutils_la_CPPFLAGS = $(NMA_CFLAGS)
+@@ -11,4 +15,7 @@ libutils_la_CPPFLAGS = \
+ -I${top_srcdir}/src/gconf-helpers \
+ -I${top_srcdir}/src
-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) -D_GNU_SOURCE
--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-11-07 12:12:16.000000000 -0500
Index: NetworkManager.spec
===================================================================
RCS file: /cvs/pkgs/rpms/NetworkManager/F-8/NetworkManager.spec,v
retrieving revision 1.210
retrieving revision 1.211
diff -u -r1.210 -r1.211
--- NetworkManager.spec 14 May 2008 14:14:05 -0000 1.210
+++ NetworkManager.spec 5 Jun 2008 15:54:37 -0000 1.211
@@ -9,8 +9,8 @@
%define libnl_version 1.0-0.15.pre8.git20071218
%define ppp_version 2.2.4
-%define snapshot svn3669
-%define applet_snapshot svn724
+%define snapshot svn3675
+%define applet_snapshot svn727
Name: NetworkManager
Summary: Network connection manager and user applications
@@ -78,6 +78,19 @@
from a DHCP server, and change nameservers whenever it sees fit.
+%package devel
+Summary: Libraries and headers for adding NetworkManager support to applications
+Group: Development/Libraries
+Requires: %{name} = %{epoch}:%{version}-%{release}
+Requires: dbus-devel >= %{dbus_version}
+Requires: dbus-glib >= %{dbus_glib_version}
+Requires: pkgconfig
+
+%description devel
+This package contains various headers accessing some NetworkManager functionality
+from applications.
+
+
%package gnome
Summary: GNOME applications for use with NetworkManager
Group: Applications/Internet
@@ -98,19 +111,6 @@
NetworkManager, including a panel applet for wireless networks.
-%package devel
-Summary: Libraries and headers for adding NetworkManager support to applications
-Group: Development/Libraries
-Requires: %{name} = %{epoch}:%{version}-%{release}
-Requires: dbus-devel >= %{dbus_version}
-Requires: dbus-glib >= %{dbus_glib_version}
-Requires: pkgconfig
-
-%description devel
-This package contains various headers accessing some NetworkManager functionality
-from applications.
-
-
%package glib
Summary: Libraries for adding NetworkManager support to applications that use glib.
Group: Development/Libraries
@@ -163,7 +163,7 @@
autoreconf -i
intltoolize --force
%configure \
- --disable-static \
+ --disable-static \
--with-notify \
--with-nss=yes \
--with-gnutls=no
@@ -248,7 +248,6 @@
%{_bindir}/nm-online
%{_libexecdir}/nm-dhcp-client.action
%{_libexecdir}/nm-dispatcher.action
-%{_libdir}/libnm-util.so*
%dir %{_libdir}/NetworkManager
%{_libdir}/NetworkManager/*.so*
%{_mandir}/man1/*
@@ -262,6 +261,13 @@
%{_libdir}/pppd/2.4.4/nm-pppd-plugin.so
%{_datadir}/PolicyKit/policy/*.policy
+%files devel
+%defattr(-,root,root,0755)
+%dir %{_includedir}/%{name}
+%{_includedir}/%{name}/%{name}.h
+%{_includedir}/%{name}/NetworkManagerVPN.h
+%{_libdir}/pkgconfig/%{name}.pc
+
%files gnome
%defattr(-,root,root,0755)
%{_sysconfdir}/dbus-1/system.d/nm-applet.conf
@@ -275,27 +281,29 @@
%{_datadir}/icons/hicolor/48x48/apps/*.png
%{_sysconfdir}/xdg/autostart/nm-applet.desktop
-%files devel
-%defattr(-,root,root,0755)
-%dir %{_includedir}/%{name}
-%{_includedir}/%{name}/*.h
-%{_libdir}/pkgconfig/%{name}.pc
-%{_libdir}/pkgconfig/libnm-util.pc
-%{_libdir}/libnm-util.so
-
%files glib
%defattr(-,root,root,0755)
%{_libdir}/libnm_glib.so.*
%{_libdir}/libnm_glib_vpn.so.*
+%{_libdir}/libnm-util.so.*
%files glib-devel
%{_includedir}/libnm-glib/*.h
+%{_includedir}/NetworkManager/nm-*.h
%{_libdir}/pkgconfig/libnm_glib.pc
+%{_libdir}/pkgconfig/libnm-util.pc
%{_libdir}/libnm_glib.so
%{_libdir}/libnm_glib_vpn.so
+%{_libdir}/libnm-util.so
%changelog
+* Wed Jun 4 2008 Dan Williams <dcbw at redhat.com> - 1:0.7.0-0.6.8.svn3675
+- Move NM later in the shutdown process (rh #449070)
+- Move libnm-util into a subpackage to allow NM to be removed more easily (rh #351101)
+- Read global gateway from /etc/sysconfig/network if missing (rh #446527)
+- nm-system-settings now terminates when dbus goes away (rh #444976)
+
* Tue May 14 2008 Dan Williams <dcbw at redhat.com> - 1:0.7.0-0.6.8.svn3669
- Fix initial carrier state detection on devices that are already up (rh #134886)
optionally-wait-for-network.patch:
Index: optionally-wait-for-network.patch
===================================================================
RCS file: /cvs/pkgs/rpms/NetworkManager/F-8/optionally-wait-for-network.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- optionally-wait-for-network.patch 28 Apr 2008 02:02:45 -0000 1.2
+++ optionally-wait-for-network.patch 5 Jun 2008 15:54:37 -0000 1.3
@@ -17,7 +17,7 @@
-# Provides: network_manager $network
+# Provides: network_manager
# Required-Start: messagebus haldaemon
- # Required-Stop: messagebus haldaemon
+ # Required-Stop: messagebus
# Default-Start: 2 3 4 5
@@ -34,6 +34,9 @@ NETWORKMANAGER_BIN=${sbindir}/NetworkMan
# Source function library.
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/NetworkManager/F-8/sources,v
retrieving revision 1.103
retrieving revision 1.104
diff -u -r1.103 -r1.104
--- sources 14 May 2008 14:14:05 -0000 1.103
+++ sources 5 Jun 2008 15:54:37 -0000 1.104
@@ -1,2 +1,2 @@
-90afda885df096e7017ddd8aefa52657 nm-applet-0.7.0.svn724.tar.gz
-6c5156882d805d024d7e47aac0cb3b9b NetworkManager-0.7.0.svn3669.tar.gz
+68f70309e5a8c53e73467318199725cc NetworkManager-0.7.0.svn3675.tar.gz
+82d5aa2ed1942fb419f46895f9817ad2 nm-applet-0.7.0.svn727.tar.gz
More information about the fedora-extras-commits
mailing list