rpms/NetworkManager/F-7 .cvsignore, 1.43, 1.44 NetworkManager-0.6.5-fixup-internal-applet-build.patch, 1.2, 1.3 NetworkManager.spec, 1.151, 1.152 sources, 1.61, 1.62 NetworkManager-0.6.5-no-killswitch-fix.patch, 1.1, NONE
Daniel Williams (dcbw)
fedora-extras-commits at redhat.com
Thu Mar 6 23:48:34 UTC 2008
Author: dcbw
Update of /cvs/extras/rpms/NetworkManager/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14930
Modified Files:
.cvsignore
NetworkManager-0.6.5-fixup-internal-applet-build.patch
NetworkManager.spec sources
Removed Files:
NetworkManager-0.6.5-no-killswitch-fix.patch
Log Message:
* Thu Mar 6 2008 Dan Williams <dcbw at redhat.com> 1:0.6.6-1
- Update to 0.6.6
Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/NetworkManager/F-7/.cvsignore,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -r1.43 -r1.44
--- .cvsignore 21 Jun 2007 14:33:59 -0000 1.43
+++ .cvsignore 6 Mar 2008 23:47:59 -0000 1.44
@@ -1,3 +1,5 @@
network-manager-applet-0.6.5.tar.bz2
NetworkManager-0.6.5.tar.bz2
nm-applet-0.6.5.tar.bz2
+NetworkManager-0.6.6.tar.gz
+nm-applet-0.6.6.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-7/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 6 Mar 2008 23:47:59 -0000 1.3
@@ -1,6 +1,49 @@
---- 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 @@
+diff -up NetworkManager-0.6.6/nm-applet-0.6.6/libnma/Makefile.am.buildfix NetworkManager-0.6.6/nm-applet-0.6.6/libnma/Makefile.am
+--- NetworkManager-0.6.6/nm-applet-0.6.6/libnma/Makefile.am.buildfix 2008-02-20 11:08:06.000000000 -0500
++++ NetworkManager-0.6.6/nm-applet-0.6.6/libnma/Makefile.am 2008-03-06 18:11:26.000000000 -0500
+@@ -1,7 +1,8 @@
+ INCLUDES = \
+ -I$(top_srcdir) \
+ $(GTK_CFLAGS) \
+- $(NM_CFLAGS)
++ -I${top_srcdir}/../include \
++ -I${top_srcdir}/../libnm-util
+
+ noinst_LTLIBRARIES = libnma.la
+
+diff -up NetworkManager-0.6.6/nm-applet-0.6.6/configure.ac.buildfix NetworkManager-0.6.6/nm-applet-0.6.6/configure.ac
+--- NetworkManager-0.6.6/nm-applet-0.6.6/configure.ac.buildfix 2008-03-06 16:50:35.000000000 -0500
++++ NetworkManager-0.6.6/nm-applet-0.6.6/configure.ac 2008-03-06 18:11:26.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
+ dnl
+-GNOME_COMMON_INIT
+-GNOME_DEBUG_CHECK
+-GNOME_COMPILE_WARNINGS([maximum])
+-GNOME_MAINTAINER_MODE_DEFINES
++dnl GNOME_COMMON_INIT
++dnl GNOME_DEBUG_CHECK
++dnl GNOME_COMPILE_WARNINGS([maximum])
++dnl GNOME_MAINTAINER_MODE_DEFINES
+
+ dnl
+ dnl Required headers
+@@ -111,10 +111,6 @@ PKG_CHECK_MODULES(GOBJECT, gobject-2.0)
+ AC_SUBST(GOBJECT_CFLAGS)
+ AC_SUBST(GOBJECT_LIBS)
+
+-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)
+
+ PKG_CHECK_MODULES(GTK, gtk+-2.0)
+diff -up NetworkManager-0.6.6/nm-applet-0.6.6/src/Makefile.am.buildfix NetworkManager-0.6.6/nm-applet-0.6.6/src/Makefile.am
+--- NetworkManager-0.6.6/nm-applet-0.6.6/src/Makefile.am.buildfix 2008-02-20 11:08:06.000000000 -0500
++++ NetworkManager-0.6.6/nm-applet-0.6.6/src/Makefile.am 2008-03-06 18:11:26.000000000 -0500
+@@ -2,6 +2,9 @@ NULL=
bin_PROGRAMS = nm-applet
@@ -8,9 +51,9 @@
+ -I${top_srcdir}/../libnm-util
+
nm_applet_CPPFLAGS = \
+ -I$(top_srcdir) \
$(DBUS_CFLAGS) \
- $(GTHREAD_CFLAGS) \
-@@ -12,7 +15,6 @@
+@@ -13,7 +16,6 @@ nm_applet_CPPFLAGS = \
$(GCONF_CFLAGS) \
$(LIBGNOMEUI_CFLAGS) \
$(GNOME_KEYRING_CFLAGS) \
@@ -18,40 +61,47 @@
-DICONDIR=\""$(datadir)/icons"\" \
-DGLADEDIR=\""$(gladedir)"\" \
-DBINDIR=\""$(bindir)"\" \
-@@ -112,7 +114,7 @@
+@@ -114,8 +116,8 @@ nm_applet_LDADD = \
$(GCONF_LIBS) \
$(LIBGNOMEUI_LIBS) \
$(GNOME_KEYRING_LIBS) \
- $(NM_LIBS) \
+- ../libnma/libnma.la \
+ -L${top_srcdir}/../libnm-util $(top_builddir)/../libnm-util/libnm-util.la \
++ $(top_builddir)/libnma/libnma.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 @@
- dnl This doesn't depend on gnome support, only on gnome-common, autogen already
- dnl uses gnome-autogen
- dnl
--GNOME_COMMON_INIT
--GNOME_DEBUG_CHECK
--GNOME_COMPILE_WARNINGS([maximum])
--GNOME_MAINTAINER_MODE_DEFINES
-+dnl GNOME_COMMON_INIT
-+dnl GNOME_DEBUG_CHECK
-+dnl GNOME_COMPILE_WARNINGS([maximum])
-+dnl GNOME_MAINTAINER_MODE_DEFINES
+diff -up NetworkManager-0.6.6/nm-applet-0.6.6/editor/Makefile.am.buildfix NetworkManager-0.6.6/nm-applet-0.6.6/editor/Makefile.am
+--- NetworkManager-0.6.6/nm-applet-0.6.6/editor/Makefile.am.buildfix 2008-03-06 18:13:34.000000000 -0500
++++ NetworkManager-0.6.6/nm-applet-0.6.6/editor/Makefile.am 2008-03-06 18:16:30.000000000 -0500
+@@ -1,6 +1,8 @@
+ NULL=
+
+-INCLUDES = -I${top_srcdir}
++INCLUDES = -I${top_srcdir} \
++ -I${top_srcdir}/../include \
++ -I${top_srcdir}/../libnm-util
- dnl
- dnl Required headers
-@@ -112,10 +112,6 @@
- AC_SUBST(GOBJECT_CFLAGS)
- AC_SUBST(GOBJECT_LIBS)
+ bin_PROGRAMS = nm-editor
+
+@@ -15,7 +17,6 @@ nm_editor_CPPFLAGS = \
+ $(LIBGNOMEUI_CFLAGS) \
+ $(PANEL_APPLET_CFLAGS) \
+ $(GNOME_KEYRING_CFLAGS) \
+- $(NM_CFLAGS) \
+ -DICONDIR=\""$(datadir)/pixmaps"\" \
+ -DGLADEDIR=\""$(datadir)/nm-applet"\" \
+ -DBINDIR=\""$(bindir)"\" \
+@@ -57,8 +58,9 @@ nm_editor_LDADD = \
+ $(GCONF_LIBS) \
+ $(LIBGNOMEUI_LIBS) \
+ $(GNOME_KEYRING_LIBS) \
+- $(NM_LIBS) \
+- ../libnma/libnma.la \
++ -L${top_srcdir}/../libnm-util \
++ $(top_builddir)/../libnm-util/libnm-util.la \
++ $(top_builddir)/libnma/libnma.la \
+ $(NULL)
--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)
- PKG_CHECK_MODULES(GTK, gtk+-2.0)
Index: NetworkManager.spec
===================================================================
RCS file: /cvs/extras/rpms/NetworkManager/F-7/NetworkManager.spec,v
retrieving revision 1.151
retrieving revision 1.152
diff -u -r1.151 -r1.152
--- NetworkManager.spec 27 Jun 2007 14:08:52 -0000 1.151
+++ NetworkManager.spec 6 Mar 2008 23:47:59 -0000 1.152
@@ -6,21 +6,20 @@
%define gtk2_version 2.6.0
%define wireless_tools_version 1:28-0pre9
+%define libnl_version 1.1
Name: NetworkManager
Summary: Network connection manager and user applications
Epoch: 1
-Version: 0.6.5
-Release: 7%{?dist}
+Version: 0.6.6
+Release: 1%{?dist}
Group: System Environment/Base
License: GPL
URL: http://www.gnome.org/projects/NetworkManager/
-Source: %{name}-%{version}.tar.bz2
-Source1: nm-applet-%{version}.tar.bz2
+Source: %{name}-%{version}.tar.gz
+Source1: nm-applet-%{version}.tar.gz
Patch0: NetworkManager-0.6.4-startup-dhcdbd.patch
Patch1: NetworkManager-0.6.5-fixup-internal-applet-build.patch
-Patch2: linkdebug.patch
-Patch3: NetworkManager-0.6.5-no-killswitch-fix.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
PreReq: chkconfig
@@ -32,6 +31,7 @@
Requires: dhcdbd
Requires: dhclient >= 3.0.2-12
Requires: wpa_supplicant
+Requires: libnl >= %{libnl_version}
BuildRequires: dbus-devel >= %{dbus_version}
BuildRequires: dbus-glib-devel >= %{dbus_glib_version}
@@ -48,7 +48,7 @@
BuildRequires: pkgconfig
BuildRequires: dhcdbd
BuildRequires: wpa_supplicant
-BuildRequires: libnl-devel
+BuildRequires: libnl-devel >= %{libnl_version}
BuildRequires: libnotify-devel >= 0.3
BuildRequires: perl(XML::Parser)
BuildRequires: automake autoconf intltool libtool
@@ -117,13 +117,11 @@
%prep
-%setup -q
+%setup -q -n %{name}-0.6.6
%patch0 -p1 -b .startup-dhcdbd
-%patch2 -p1 -b .linkdebug
-%patch3 -p1 -b .no-killswitch-fix
# unpack the applet
-tar -xjf %{SOURCE1}
+tar -xzf %{SOURCE1}
%patch1 -p1 -b .buildfix
%build
@@ -137,7 +135,7 @@
make
# build the applet
-pushd nm-applet-0.6.5
+pushd nm-applet-0.6.6
autoreconf -i
intltoolize --force
%configure \
@@ -156,7 +154,7 @@
make install DESTDIR=$RPM_BUILD_ROOT
# install the applet
-pushd nm-applet-0.6.5
+pushd nm-applet-0.6.6
make install DESTDIR=$RPM_BUILD_ROOT
popd
@@ -166,6 +164,11 @@
%{__rm} -f $RPM_BUILD_ROOT%{_libdir}/*.la
%{__cp} test/nm-tool $RPM_BUILD_ROOT%{_bindir}/
+%{__rm} -f $RPM_BUILD_ROOT%{_datadir}/applications/nm-editor.desktop
+
+%{__mkdir} -p $RPM_BUILD_ROOT%{_datadir}/gnome/autostart/
+%{__mv} $RPM_BUILD_ROOT%{_sysconfdir}/xdg/autostart/nm-applet.desktop $RPM_BUILD_ROOT%{_datadir}/gnome/autostart/nm-applet.desktop
+
%clean
%{__rm} -rf $RPM_BUILD_ROOT
@@ -211,8 +214,8 @@
%dir %{_sysconfdir}/NetworkManager/
%{_bindir}/nm-tool
%{_libdir}/libnm-util.so*
-%{_mandir}/man1/NetworkManager.1.gz
-%{_mandir}/man1/NetworkManagerDispatcher.1.gz
+%{_mandir}/man8/NetworkManager.8.gz
+%{_mandir}/man8/NetworkManagerDispatcher.8.gz
%{_mandir}/man1/nm-tool.1.gz
%dir %{_localstatedir}/run/NetworkManager
%{_prefix}/libexec/nm-crash-logger
@@ -225,6 +228,7 @@
%{_bindir}/nm-applet
%{_bindir}/nm-vpn-properties
%{_datadir}/gnome-vpn-properties/nm-vpn-properties.glade
+%{_bindir}/nm-editor
%{_datadir}/nm-applet/
%{_datadir}/icons/hicolor/22x22/apps/*.png
%{_datadir}/icons/hicolor/48x48/apps/*.png
@@ -249,6 +253,9 @@
%changelog
+* Thu Mar 6 2008 Dan Williams <dcbw at redhat.com> 1:0.6.6-1
+- Update to 0.6.6
+
* Wed Jun 27 2007 Dan Williams <dcbw at redhat.com> 1:0.6.5-7
- Fix Wireless Enabled checkbox when no killswitches are present
Index: sources
===================================================================
RCS file: /cvs/extras/rpms/NetworkManager/F-7/sources,v
retrieving revision 1.61
retrieving revision 1.62
diff -u -r1.61 -r1.62
--- sources 21 Jun 2007 14:33:59 -0000 1.61
+++ sources 6 Mar 2008 23:47:59 -0000 1.62
@@ -1,2 +1,2 @@
-5f9161b0f3c0011b7f44bd0a7321e7c0 NetworkManager-0.6.5.tar.bz2
-a629a8e2e90f7e1eb9cfd3fba35d7113 nm-applet-0.6.5.tar.bz2
+412ed4db5d2db04285799c4303ddeeed NetworkManager-0.6.6.tar.gz
+16e95a3515e4255d034b14045a9effd5 nm-applet-0.6.6.tar.gz
--- NetworkManager-0.6.5-no-killswitch-fix.patch DELETED ---
More information about the fedora-extras-commits
mailing list