rpms/NetworkManager/devel .cvsignore, 1.42, 1.43 NetworkManager-0.6.5-fixup-internal-applet-build.patch, 1.2, 1.3 NetworkManager.spec, 1.156, 1.157 sources, 1.61, 1.62 NetworkManager-0.6.4-startup-dhcdbd.patch, 1.1, NONE NetworkManager-0.6.5-no-killswitch-fix.patch, 1.1, NONE linkdebug.patch, 1.1, NONE
Daniel Williams (dcbw)
fedora-extras-commits at redhat.com
Thu Aug 30 22:03:53 UTC 2007
Author: dcbw
Update of /cvs/extras/rpms/NetworkManager/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25953
Modified Files:
.cvsignore
NetworkManager-0.6.5-fixup-internal-applet-build.patch
NetworkManager.spec sources
Removed Files:
NetworkManager-0.6.4-startup-dhcdbd.patch
NetworkManager-0.6.5-no-killswitch-fix.patch linkdebug.patch
Log Message:
* Thu Aug 30 2007 Dan Williams <dcbw at redhat.com> - 1:0.7.0-0.1.svn2736
- Update to SVN snapshot of 0.7
Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/NetworkManager/devel/.cvsignore,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -r1.42 -r1.43
--- .cvsignore 20 Apr 2007 03:35:58 -0000 1.42
+++ .cvsignore 30 Aug 2007 22:03:19 -0000 1.43
@@ -1,2 +1,4 @@
network-manager-applet-0.6.5.tar.bz2
NetworkManager-0.6.5.tar.bz2
+NetworkManager-0.7.0.svn2736.tar.gz
+nm-applet-0.7.0.svn129.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/devel/NetworkManager-0.6.5-fixup-internal-applet-build.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- NetworkManager-0.6.5-fixup-internal-applet-build.patch 15 Mar 2007 20:35:01 -0000 1.2
+++ NetworkManager-0.6.5-fixup-internal-applet-build.patch 30 Aug 2007 22:03:19 -0000 1.3
@@ -1,35 +1,6 @@
---- NetworkManager-0.6.5/nm-applet-0.6.5/src/Makefile.am.buildfix 2007-02-02 10:53:26.000000000 -0500
-+++ NetworkManager-0.6.5/nm-applet-0.6.5/src/Makefile.am 2007-03-15 14:20:32.000000000 -0400
-@@ -2,6 +2,9 @@
-
- bin_PROGRAMS = nm-applet
-
-+INCLUDES = -I${top_srcdir}/../include \
-+ -I${top_srcdir}/../libnm-util
-+
- nm_applet_CPPFLAGS = \
- $(DBUS_CFLAGS) \
- $(GTHREAD_CFLAGS) \
-@@ -12,7 +15,6 @@
- $(GCONF_CFLAGS) \
- $(LIBGNOMEUI_CFLAGS) \
- $(GNOME_KEYRING_CFLAGS) \
-- $(NM_CFLAGS) \
- -DICONDIR=\""$(datadir)/icons"\" \
- -DGLADEDIR=\""$(gladedir)"\" \
- -DBINDIR=\""$(bindir)"\" \
-@@ -112,7 +114,7 @@
- $(GCONF_LIBS) \
- $(LIBGNOMEUI_LIBS) \
- $(GNOME_KEYRING_LIBS) \
-- $(NM_LIBS) \
-+ -L${top_srcdir}/../libnm-util $(top_builddir)/../libnm-util/libnm-util.la \
- $(NULL)
-
- if WITH_NOTIFY
---- NetworkManager-0.6.5/nm-applet-0.6.5/configure.ac.buildfix 2007-03-15 11:51:49.000000000 -0400
-+++ NetworkManager-0.6.5/nm-applet-0.6.5/configure.ac 2007-03-15 16:33:34.000000000 -0400
-@@ -18,10 +18,10 @@
+--- NetworkManager-0.7.0/nm-applet-0.7.0/configure.ac.buildfix 2007-08-30 15:04:50.000000000 -0400
++++ NetworkManager-0.7.0/nm-applet-0.7.0/configure.ac 2007-08-30 15:19:48.000000000 -0400
+@@ -18,10 +18,10 @@ dnl
dnl This doesn't depend on gnome support, only on gnome-common, autogen already
dnl uses gnome-autogen
dnl
@@ -44,14 +15,35 @@
dnl
dnl Required headers
-@@ -112,10 +112,6 @@
- AC_SUBST(GOBJECT_CFLAGS)
- AC_SUBST(GOBJECT_LIBS)
+@@ -62,7 +62,6 @@ AC_CHECK_LIB(nm-util, ieee_802_11_cipher
+ PKG_CHECK_MODULES(NMA,
+ [dbus-glib-1 >= 0.72
+ glib-2.0 >= 2.10
+- NetworkManager >= 0.7.0
+ libnm_glib
+ gtk+-2.0 >= 2.6
+ libglade-2.0
+--- NetworkManager-0.7.0/nm-applet-0.7.0/src/Makefile.am.buildfix 2007-08-30 15:02:27.000000000 -0400
++++ NetworkManager-0.7.0/nm-applet-0.7.0/src/Makefile.am 2007-08-30 15:24:08.000000000 -0400
+@@ -4,6 +4,10 @@ NULL=
+
+ bin_PROGRAMS = nm-applet
--PKG_CHECK_MODULES(NM, NetworkManager)
--AC_SUBST(NM_CFLAGS)
--AC_SUBST(NM_LIBS)
--
- AC_ARG_WITH(notify, AC_HELP_STRING([--with-notify], [Use libnotify]), enable_notify=$withval, enable_notify=auto)
++INCLUDES = -I${top_srcdir}/../include \
++ -I${top_srcdir}/../libnm-util \
++ -I${top_srcdir}/../libnm-glib
++
+ nm_applet_CPPFLAGS = \
+ $(NMA_CFLAGS) \
+ -DICONDIR=\""$(datadir)/icons"\" \
+@@ -89,7 +93,9 @@ if WITH_NOTIFY
+ nm_applet_SOURCES += applet-notifications.c applet-notifications.h
+ endif
+
+-nm_applet_LDADD = $(NMA_LIBS)
++nm_applet_LDADD = $(NMA_LIBS) \
++ -L${top_srcdir}/../libnm-util $(top_builddir)/../libnm-util/libnm-util.la \
++ -L${top_srcdir}/../libnm-glib $(top_builddir)/../libnm-glib/libnm_glib.la
- PKG_CHECK_MODULES(GTK, gtk+-2.0)
+ if WITH_NOTIFY
+ nm_applet_LDADD += $(NOTIFY_LIBS)
Index: NetworkManager.spec
===================================================================
RCS file: /cvs/extras/rpms/NetworkManager/devel/NetworkManager.spec,v
retrieving revision 1.156
retrieving revision 1.157
diff -u -r1.156 -r1.157
--- NetworkManager.spec 13 Aug 2007 20:52:51 -0000 1.156
+++ NetworkManager.spec 30 Aug 2007 22:03:19 -0000 1.157
@@ -1,26 +1,25 @@
ExcludeArch: s390 s390x
-%define dbus_version 0.90
-%define dbus_glib_version 0.70
+%define dbus_version 1.0.2
+%define dbus_glib_version 0.73
%define hal_version 0.5.0
-%define gtk2_version 2.6.0
+%define gtk2_version 2.10.0
%define wireless_tools_version 1:28-0pre9
+%define snapshot svn2736
+
Name: NetworkManager
Summary: Network connection manager and user applications
Epoch: 1
-Version: 0.6.5
-Release: 9%{?dist}
+Version: 0.7.0
+Release: 0.1.%{snapshot}%{?dist}
Group: System Environment/Base
License: GPLv2+
URL: http://www.gnome.org/projects/NetworkManager/
-Source: %{name}-%{version}.tar.bz2
-Source1: nm-applet-%{version}.tar.bz2
-Patch0: NetworkManager-0.6.4-startup-dhcdbd.patch
+Source: %{name}-%{version}.%{snapshot}.tar.gz
+Source1: nm-applet-%{version}.svn129.tar.gz
Patch1: NetworkManager-0.6.5-fixup-internal-applet-build.patch
-Patch2: linkdebug.patch
-Patch3: NetworkManager-0.6.5-no-killswitch-fix.patch
Patch4: NetworkManager-0.6.5-deprecated.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -28,11 +27,10 @@
Requires: wireless-tools >= %{wireless_tools_version}
Requires: dbus >= %{dbus_version}
Requires: dbus-glib >= %{dbus_glib_version}
-Requires: hal >= 0.5.0
+Requires: hal >= %{hal_version}
Requires: iproute openssl
-Requires: dhcdbd
Requires: dhclient >= 3.0.2-12
-Requires: wpa_supplicant
+Requires: wpa_supplicant >= 0.5.7-7
BuildRequires: dbus-devel >= %{dbus_version}
BuildRequires: dbus-glib-devel >= %{dbus_glib_version}
@@ -119,13 +117,10 @@
%prep
%setup -q
-%patch0 -p1 -b .startup-dhcdbd
-%patch2 -p1 -b .linkdebug
-%patch3 -p1 -b .no-killswitch-fix
-%patch4 -p1 -b .deprecated
+#%patch4 -p1 -b .deprecated
# unpack the applet
-tar -xjf %{SOURCE1}
+tar -xzf %{SOURCE1}
%patch1 -p1 -b .buildfix
%build
@@ -139,7 +134,7 @@
make
# build the applet
-pushd nm-applet-0.6.5
+pushd nm-applet-0.7.0
autoreconf -i
intltoolize --force
%configure \
@@ -158,7 +153,7 @@
make install DESTDIR=$RPM_BUILD_ROOT
# install the applet
-pushd nm-applet-0.6.5
+pushd nm-applet-0.7.0
make install DESTDIR=$RPM_BUILD_ROOT
popd
@@ -208,7 +203,8 @@
%files -f %{name}.lang
%defattr(-,root,root,0755)
%doc COPYING ChangeLog NEWS AUTHORS README CONTRIBUTING TODO
-%config %{_sysconfdir}/dbus-1/system.d/NetworkManager.conf
+%{_sysconfdir}/dbus-1/system.d/NetworkManager.conf
+%{_sysconfdir}/dbus-1/system.d/nm-dhcp-client.conf
%config %{_sysconfdir}/rc.d/init.d/NetworkManager
%config %{_sysconfdir}/rc.d/init.d/NetworkManagerDispatcher
%{_sbindir}/%{name}
@@ -217,10 +213,11 @@
%dir %{_sysconfdir}/NetworkManager/dispatcher.d
%dir %{_sysconfdir}/NetworkManager/VPN
%{_bindir}/nm-tool
+%{_libexecdir}/nm-dhcp-client.action
%{_libdir}/libnm-util.so*
-%{_mandir}/man1/NetworkManager.1.gz
-%{_mandir}/man1/NetworkManagerDispatcher.1.gz
-%{_mandir}/man1/nm-tool.1.gz
+%{_libdir}/nm-pppd-plugin.so
+%{_mandir}/man1/*
+%{_mandir}/man8/*
%dir %{_localstatedir}/run/NetworkManager
%{_prefix}/libexec/nm-crash-logger
%dir %{_datadir}/NetworkManager
@@ -250,12 +247,15 @@
%{_libdir}/libnm_glib.so.*
%files glib-devel
-%{_includedir}/%{name}/libnm_glib.h
+%{_includedir}/libnm-glib/*.h
%{_libdir}/pkgconfig/libnm_glib.pc
%{_libdir}/libnm_glib.so
%changelog
+* Thu Aug 30 2007 Dan Williams <dcbw at redhat.com> - 1:0.7.0-0.1.svn2736
+- Update to SVN snapshot of 0.7
+
* Mon Aug 13 2007 Christopher Aillon <caillon at redhat.com> 1:0.6.5-9
- Update the license tag
Index: sources
===================================================================
RCS file: /cvs/extras/rpms/NetworkManager/devel/sources,v
retrieving revision 1.61
retrieving revision 1.62
diff -u -r1.61 -r1.62
--- sources 21 Jun 2007 15:11:09 -0000 1.61
+++ sources 30 Aug 2007 22:03:19 -0000 1.62
@@ -1,2 +1,2 @@
-5f9161b0f3c0011b7f44bd0a7321e7c0 NetworkManager-0.6.5.tar.bz2
-a629a8e2e90f7e1eb9cfd3fba35d7113 nm-applet-0.6.5.tar.bz2
+29fcb5b6f13bf40e806a1a7a81e0f105 NetworkManager-0.7.0.svn2736.tar.gz
+63540152eb1482cdcd68bc1b806672d4 nm-applet-0.7.0.svn129.tar.gz
--- NetworkManager-0.6.4-startup-dhcdbd.patch DELETED ---
--- NetworkManager-0.6.5-no-killswitch-fix.patch DELETED ---
--- linkdebug.patch DELETED ---
More information about the fedora-extras-commits
mailing list