Update to 0.9.1.90
This commit is contained in:
Dan Williams
parent
f0fa260b64
commit
71139934b4
2
.gitignore
vendored
2
.gitignore
vendored
@ -259,3 +259,5 @@ network-manager-applet-0.8.1.tar.bz2
|
||||
/network-manager-applet-0.8.9997.git20110721.tar.bz2
|
||||
/NetworkManager-0.9.0.tar.bz2
|
||||
/network-manager-applet-0.9.0.tar.bz2
|
||||
/NetworkManager-0.9.1.90.tar.bz2
|
||||
/network-manager-applet-0.9.1.90.tar.bz2
|
||||
|
||||
@ -9,13 +9,13 @@
|
||||
|
||||
%define snapshot %{nil}
|
||||
%define applet_snapshot %{nil}
|
||||
%define realversion 0.9.0
|
||||
%define realversion 0.9.1.90
|
||||
|
||||
Name: NetworkManager
|
||||
Summary: Network connection manager and user applications
|
||||
Epoch: 1
|
||||
Version: 0.9.0
|
||||
Release: 2%{snapshot}%{?dist}
|
||||
Version: 0.9.1.90
|
||||
Release: 1%{snapshot}%{?dist}
|
||||
Group: System Environment/Base
|
||||
License: GPLv2+
|
||||
URL: http://www.gnome.org/projects/NetworkManager/
|
||||
@ -116,6 +116,7 @@ Summary: GNOME applications for use with NetworkManager
|
||||
Group: Applications/Internet
|
||||
Requires: %{name} = %{epoch}:%{version}-%{release}
|
||||
Requires: %{name}-glib = %{epoch}:%{version}-%{release}
|
||||
Requires: %{name}-gtk = %{epoch}:%{version}-%{release}
|
||||
Requires: dbus >= %{dbus_version}
|
||||
Requires: dbus-glib >= %{dbus_glib_version}
|
||||
Requires: libnotify >= 0.4.3
|
||||
@ -154,6 +155,29 @@ This package contains the header and pkg-config files for development applicatio
|
||||
NetworkManager functionality from applications that use glib.
|
||||
|
||||
|
||||
%package gtk
|
||||
Summary: Private libraries for NetworkManager GUI support
|
||||
Group: Development/Libraries
|
||||
Requires: gtk3 >= %{gtk3_version}
|
||||
|
||||
%description gtk
|
||||
This package contains private libraries to be used only by nm-applet and
|
||||
the GNOME Control Center.
|
||||
|
||||
|
||||
%package gtk-devel
|
||||
Summary: Private header files for NetworkManager GUI support
|
||||
Group: Development/Libraries
|
||||
Requires: %{name}-devel = %{epoch}:%{version}-%{release}
|
||||
Requires: %{name}-glib = %{epoch}:%{version}-%{release}
|
||||
Requires: gtk3-devel
|
||||
Requires: pkgconfig
|
||||
|
||||
%description gtk-devel
|
||||
This package contains private header and pkg-config files to be used only by
|
||||
nm-applet and the GNOME control center.
|
||||
|
||||
|
||||
%prep
|
||||
%setup -q -n NetworkManager-%{realversion}
|
||||
|
||||
@ -419,7 +443,28 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
|
||||
%dir %{_datadir}/gtk-doc/html/libnm-util
|
||||
%{_datadir}/gtk-doc/html/libnm-util/*
|
||||
|
||||
%files gtk
|
||||
%defattr(-,root,root,0755)
|
||||
%{_libdir}/libnm-gtk.so.*
|
||||
|
||||
%files gtk-devel
|
||||
%defattr(-,root,root,0755)
|
||||
%dir %{_includedir}/libnm-gtk
|
||||
%{_includedir}/libnm-gtk/*.h
|
||||
%{_libdir}/pkgconfig/libnm-gtk.pc
|
||||
%{_libdir}/libnm-gtk.so
|
||||
%dir %{_datadir}/libnm-gtk
|
||||
%{_datadir}/libnm-gtk/*.ui
|
||||
|
||||
%changelog
|
||||
* Mon Sep 19 2011 Dan Williams <dcbw@redhat.com> - 0.9.1.90-1
|
||||
- Update to 0.9.1.90 (0.9.2-beta1)
|
||||
- core: fix IPv6 link-local DNS servers in the dnsmasq DNS plugin
|
||||
- cli: add ability to delete connections
|
||||
- keyfile: fix an issue with duplicated keyfile connections
|
||||
- core: ensure the 'novj' option is passed through to pppd
|
||||
- core: store timestamps for VPN connections too (rh #725353)
|
||||
|
||||
* Fri Sep 9 2011 Tom Callaway <spot@fedoraproject.org> - 0.9.0-2
|
||||
- fix systemd scriptlets and trigger
|
||||
|
||||
|
||||
@ -1,14 +1,14 @@
|
||||
diff -up NetworkManager-0.9.0/network-manager-applet-0.9.0/configure.ac.buildfix NetworkManager-0.9.0/network-manager-applet-0.9.0/configure.ac
|
||||
--- NetworkManager-0.9.0/network-manager-applet-0.9.0/configure.ac.buildfix 2009-07-28 10:01:26.000000000 -0400
|
||||
+++ NetworkManager-0.9.0/network-manager-applet-0.9.0/configure.ac 2009-07-28 13:11:39.261718877 -0400
|
||||
diff -up NetworkManager-0.9.1.90/network-manager-applet-0.9.1.90/configure.ac.buildfix NetworkManager-0.9.1.90/network-manager-applet-0.9.1.90/configure.ac
|
||||
--- NetworkManager-0.9.1.90/network-manager-applet-0.9.1.90/configure.ac.buildfix 2009-07-28 10:01:26.000000000 -0400
|
||||
+++ NetworkManager-0.9.1.90/network-manager-applet-0.9.1.90/configure.ac 2009-07-28 13:11:39.261718877 -0400
|
||||
@@ -70,10 +70,6 @@ PKG_CHECK_MODULES(GOBJECT, gobject-2.0)
|
||||
PKG_CHECK_MODULES(NMA,
|
||||
[dbus-glib-1 >= 0.74
|
||||
glib-2.0 >= 2.16
|
||||
- NetworkManager >= 0.9
|
||||
- libnm-glib >= 0.9
|
||||
- libnm-util >= 0.9
|
||||
- libnm-glib-vpn >= 0.9
|
||||
- NetworkManager >= 0.9.1
|
||||
- libnm-glib >= 0.9.1
|
||||
- libnm-util >= 0.9.1
|
||||
- libnm-glib-vpn >= 0.9.1
|
||||
gmodule-export-2.0])
|
||||
|
||||
PKG_CHECK_MODULES(GCONF, [gconf-2.0])
|
||||
@ -17,16 +17,16 @@ diff -up NetworkManager-0.9.0/network-manager-applet-0.9.0/configure.ac.buildfix
|
||||
AC_MSG_CHECKING(for gnome-bluetooth)
|
||||
PKG_CHECK_MODULES(GNOME_BLUETOOTH,
|
||||
- gnome-bluetooth-1.0 >= 2.27.6
|
||||
- libnm-util >= 0.9
|
||||
- libnm-glib >= 0.9,
|
||||
- libnm-util >= 0.9.1
|
||||
- libnm-glib >= 0.9.1,
|
||||
+ gnome-bluetooth-1.0 >= 2.27.6,
|
||||
have_gbt=yes, have_gbt=no)
|
||||
;;
|
||||
esac
|
||||
|
||||
diff -up NetworkManager-0.9.0/network-manager-applet-0.9.0/src/connection-editor/Makefile.am.buildfix NetworkManager-0.9.0/network-manager-applet-0.9.0/src/connection-editor/Makefile.am
|
||||
--- NetworkManager-0.9.0/network-manager-applet-0.9.0/src/connection-editor/Makefile.am.buildfix 2009-07-23 10:51:39.000000000 -0400
|
||||
+++ NetworkManager-0.9.0/network-manager-applet-0.9.0/src/connection-editor/Makefile.am 2009-07-28 11:29:11.685841724 -0400
|
||||
diff -up NetworkManager-0.9.1.90/network-manager-applet-0.9.1.90/src/connection-editor/Makefile.am.buildfix NetworkManager-0.9.1.90/network-manager-applet-0.9.1.90/src/connection-editor/Makefile.am
|
||||
--- NetworkManager-0.9.1.90/network-manager-applet-0.9.1.90/src/connection-editor/Makefile.am.buildfix 2009-07-23 10:51:39.000000000 -0400
|
||||
+++ NetworkManager-0.9.1.90/network-manager-applet-0.9.1.90/src/connection-editor/Makefile.am 2009-07-28 11:29:11.685841724 -0400
|
||||
@@ -1,5 +1,9 @@
|
||||
bin_PROGRAMS = nm-connection-editor
|
||||
|
||||
@ -38,7 +38,7 @@ diff -up NetworkManager-0.9.0/network-manager-applet-0.9.0/src/connection-editor
|
||||
$(GTK_CFLAGS) \
|
||||
$(NMA_CFLAGS) \
|
||||
@@ -63,7 +67,10 @@ nm_connection_editor_LDADD = \
|
||||
${top_builddir}/src/marshallers/libmarshallers.la \
|
||||
${top_builddir}/src/libnm-gtk/libnm-gtk.la \
|
||||
$(GTK_LIBS) \
|
||||
$(NMA_LIBS) \
|
||||
- -lm
|
||||
@ -49,9 +49,9 @@ diff -up NetworkManager-0.9.0/network-manager-applet-0.9.0/src/connection-editor
|
||||
|
||||
uidir = $(datadir)/nm-applet
|
||||
ui_DATA = \
|
||||
diff -up NetworkManager-0.9.0/network-manager-applet-0.9.0/src/gconf-helpers/Makefile.am.buildfix NetworkManager-0.9.0/network-manager-applet-0.9.0/src/gconf-helpers/Makefile.am
|
||||
--- NetworkManager-0.9.0/network-manager-applet-0.9.0/src/gconf-helpers/Makefile.am.buildfix 2009-04-20 07:09:10.000000000 -0400
|
||||
+++ NetworkManager-0.9.0/network-manager-applet-0.9.0/src/gconf-helpers/Makefile.am 2009-07-28 11:29:11.686841642 -0400
|
||||
diff -up NetworkManager-0.9.1.90/network-manager-applet-0.9.1.90/src/gconf-helpers/Makefile.am.buildfix NetworkManager-0.9.1.90/network-manager-applet-0.9.1.90/src/gconf-helpers/Makefile.am
|
||||
--- NetworkManager-0.9.1.90/network-manager-applet-0.9.1.90/src/gconf-helpers/Makefile.am.buildfix 2009-04-20 07:09:10.000000000 -0400
|
||||
+++ NetworkManager-0.9.1.90/network-manager-applet-0.9.1.90/src/gconf-helpers/Makefile.am 2009-07-28 11:29:11.686841642 -0400
|
||||
@@ -1,5 +1,9 @@
|
||||
SUBDIRS=. tests
|
||||
|
||||
@ -82,9 +82,9 @@ diff -up NetworkManager-0.9.0/network-manager-applet-0.9.0/src/gconf-helpers/Mak
|
||||
+ -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.9.0/network-manager-applet-0.9.0/src/gconf-helpers/tests/Makefile.am.buildfix NetworkManager-0.9.0/network-manager-applet-0.9.0/src/gconf-helpers/tests/Makefile.am
|
||||
--- NetworkManager-0.9.0/network-manager-applet-0.9.0/src/gconf-helpers/tests/Makefile.am.buildfix 2011-03-10 02:19:03.664936744 -0600
|
||||
+++ NetworkManager-0.9.0/network-manager-applet-0.9.0/src/gconf-helpers/tests/Makefile.am 2011-03-10 02:20:10.784097638 -0600
|
||||
diff -up NetworkManager-0.9.1.90/network-manager-applet-0.9.1.90/src/gconf-helpers/tests/Makefile.am.buildfix NetworkManager-0.9.1.90/network-manager-applet-0.9.1.90/src/gconf-helpers/tests/Makefile.am
|
||||
--- NetworkManager-0.9.1.90/network-manager-applet-0.9.1.90/src/gconf-helpers/tests/Makefile.am.buildfix 2011-03-10 02:19:03.664936744 -0600
|
||||
+++ NetworkManager-0.9.1.90/network-manager-applet-0.9.1.90/src/gconf-helpers/tests/Makefile.am 2011-03-10 02:20:10.784097638 -0600
|
||||
@@ -1,4 +1,7 @@
|
||||
-INCLUDES = -I$(top_srcdir)/src/utils
|
||||
+INCLUDES = -I$(top_srcdir)/src/utils \
|
||||
@ -94,13 +94,13 @@ diff -up NetworkManager-0.9.0/network-manager-applet-0.9.0/src/gconf-helpers/tes
|
||||
|
||||
noinst_PROGRAMS = test-upgrade
|
||||
|
||||
diff -up NetworkManager-0.9.0/network-manager-applet-0.9.0/src/gnome-bluetooth/Makefile.am.buildfix NetworkManager-0.9.0/network-manager-applet-0.9.0/src/gnome-bluetooth/Makefile.am
|
||||
--- NetworkManager-0.9.0/network-manager-applet-0.9.0/src/gnome-bluetooth/Makefile.am.buildfix 2009-07-28 13:23:40.282718683 -0400
|
||||
+++ NetworkManager-0.9.0/network-manager-applet-0.9.0/src/gnome-bluetooth/Makefile.am 2009-07-28 13:24:56.316719077 -0400
|
||||
diff -up NetworkManager-0.9.1.90/network-manager-applet-0.9.1.90/src/gnome-bluetooth/Makefile.am.buildfix NetworkManager-0.9.1.90/network-manager-applet-0.9.1.90/src/gnome-bluetooth/Makefile.am
|
||||
--- NetworkManager-0.9.1.90/network-manager-applet-0.9.1.90/src/gnome-bluetooth/Makefile.am.buildfix 2009-07-28 13:23:40.282718683 -0400
|
||||
+++ NetworkManager-0.9.1.90/network-manager-applet-0.9.1.90/src/gnome-bluetooth/Makefile.am 2009-07-28 13:24:56.316719077 -0400
|
||||
@@ -6,6 +6,9 @@ INCLUDES = \
|
||||
-I$(top_builddir) \
|
||||
-I${top_builddir}/src/marshallers \
|
||||
-I${top_srcdir}/src/utils \
|
||||
-I${top_srcdir}/src/libnm-gtk \
|
||||
+ -I${top_srcdir}/../include \
|
||||
+ -I${top_srcdir}/../libnm-util \
|
||||
+ -I${top_srcdir}/../libnm-glib \
|
||||
@ -108,9 +108,9 @@ diff -up NetworkManager-0.9.0/network-manager-applet-0.9.0/src/gnome-bluetooth/M
|
||||
$(DISABLE_DEPRECATED) \
|
||||
$(WARN_CFLAGS)
|
||||
@@ -14,7 +17,9 @@ plugin_LTLIBRARIES = libnma.la
|
||||
libnma_la_LIBADD = \
|
||||
$(top_builddir)/src/marshallers/libmarshallers.la \
|
||||
$(top_builddir)/src/utils/libutils.la \
|
||||
$(top_builddir)/src/libnm-gtk/libnm-gtk.la \
|
||||
- $(GNOME_BLUETOOTH_LIBS)
|
||||
+ $(GNOME_BLUETOOTH_LIBS) \
|
||||
+ -L${top_builddir}/../libnm-util $(top_builddir)/../libnm-util/libnm-util.la \
|
||||
@ -118,9 +118,9 @@ diff -up NetworkManager-0.9.0/network-manager-applet-0.9.0/src/gnome-bluetooth/M
|
||||
endif
|
||||
|
||||
EXTRA_DIST = $(BT_WIDGET_SOURCES)
|
||||
diff -up NetworkManager-0.9.0/network-manager-applet-0.9.0/src/Makefile.am.buildfix NetworkManager-0.9.0/network-manager-applet-0.9.0/src/Makefile.am
|
||||
--- NetworkManager-0.9.0/network-manager-applet-0.9.0/src/Makefile.am.buildfix 2009-07-27 15:26:53.000000000 -0400
|
||||
+++ NetworkManager-0.9.0/network-manager-applet-0.9.0/src/Makefile.am 2009-07-28 11:29:11.686841642 -0400
|
||||
diff -up NetworkManager-0.9.1.90/network-manager-applet-0.9.1.90/src/Makefile.am.buildfix NetworkManager-0.9.1.90/network-manager-applet-0.9.1.90/src/Makefile.am
|
||||
--- NetworkManager-0.9.1.90/network-manager-applet-0.9.1.90/src/Makefile.am.buildfix 2009-07-27 15:26:53.000000000 -0400
|
||||
+++ NetworkManager-0.9.1.90/network-manager-applet-0.9.1.90/src/Makefile.am 2009-07-28 11:29:11.686841642 -0400
|
||||
@@ -2,6 +2,10 @@ SUBDIRS = marshallers utils gconf-helper
|
||||
|
||||
bin_PROGRAMS = nm-applet
|
||||
@ -133,19 +133,19 @@ diff -up NetworkManager-0.9.0/network-manager-applet-0.9.0/src/Makefile.am.build
|
||||
$(GTK_CFLAGS) \
|
||||
$(NMA_CFLAGS) \
|
||||
@@ -54,7 +58,9 @@ nm_applet_LDADD = \
|
||||
${top_builddir}/src/marshallers/libmarshallers.la \
|
||||
${top_builddir}/src/utils/libutils.la \
|
||||
${top_builddir}/src/gconf-helpers/libgconf-helpers.la \
|
||||
- ${top_builddir}/src/wireless-security/libwireless-security.la
|
||||
+ ${top_builddir}/src/wireless-security/libwireless-security.la \
|
||||
${top_builddir}/src/wireless-security/libwireless-security.la \
|
||||
- ${top_builddir}/src/libnm-gtk/libnm-gtk.la
|
||||
+ ${top_builddir}/src/libnm-gtk/libnm-gtk.la \
|
||||
+ -L${top_srcdir}/../libnm-util $(top_builddir)/../libnm-util/libnm-util.la \
|
||||
+ -L${top_srcdir}/../libnm-glib $(top_builddir)/../libnm-glib/libnm-glib.la
|
||||
|
||||
uidir = $(datadir)/nm-applet
|
||||
ui_DATA = gsm-unlock.ui info.ui wired-8021x.ui wifi.ui keyring.png
|
||||
diff -up NetworkManager-0.9.0/network-manager-applet-0.9.0/src/utils/Makefile.am.buildfix NetworkManager-0.9.0/network-manager-applet-0.9.0/src/utils/Makefile.am
|
||||
--- NetworkManager-0.9.0/network-manager-applet-0.9.0/src/utils/Makefile.am.buildfix 2009-07-02 16:32:26.000000000 -0400
|
||||
+++ NetworkManager-0.9.0/network-manager-applet-0.9.0/src/utils/Makefile.am 2009-07-28 11:29:11.686841642 -0400
|
||||
ui_DATA = gsm-unlock.ui info.ui wired-8021x.ui keyring.png
|
||||
diff -up NetworkManager-0.9.1.90/network-manager-applet-0.9.1.90/src/utils/Makefile.am.buildfix NetworkManager-0.9.1.90/network-manager-applet-0.9.1.90/src/utils/Makefile.am
|
||||
--- NetworkManager-0.9.1.90/network-manager-applet-0.9.1.90/src/utils/Makefile.am.buildfix 2009-07-02 16:32:26.000000000 -0400
|
||||
+++ NetworkManager-0.9.1.90/network-manager-applet-0.9.1.90/src/utils/Makefile.am 2009-07-28 11:29:11.686841642 -0400
|
||||
@@ -1,5 +1,9 @@
|
||||
SUBDIRS=. tests
|
||||
|
||||
@ -165,9 +165,9 @@ diff -up NetworkManager-0.9.0/network-manager-applet-0.9.0/src/utils/Makefile.am
|
||||
+ -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.9.0/network-manager-applet-0.9.0/src/utils/tests/Makefile.am.buildfix NetworkManager-0.9.0/network-manager-applet-0.9.0/src/utils/tests/Makefile.am
|
||||
--- NetworkManager-0.9.0/network-manager-applet-0.9.0/src/utils/tests/Makefile.am.buildfix 2009-07-02 16:32:26.000000000 -0400
|
||||
+++ NetworkManager-0.9.0/network-manager-applet-0.9.0/src/utils/tests/Makefile.am 2009-07-28 11:29:11.686841642 -0400
|
||||
diff -up NetworkManager-0.9.1.90/network-manager-applet-0.9.1.90/src/utils/tests/Makefile.am.buildfix NetworkManager-0.9.1.90/network-manager-applet-0.9.1.90/src/utils/tests/Makefile.am
|
||||
--- NetworkManager-0.9.1.90/network-manager-applet-0.9.1.90/src/utils/tests/Makefile.am.buildfix 2009-07-02 16:32:26.000000000 -0400
|
||||
+++ NetworkManager-0.9.1.90/network-manager-applet-0.9.1.90/src/utils/tests/Makefile.am 2009-07-28 11:29:11.686841642 -0400
|
||||
@@ -1,4 +1,7 @@
|
||||
-INCLUDES = -I$(top_srcdir)/src/utils
|
||||
+INCLUDES = -I$(top_srcdir)/src/utils \
|
||||
@ -177,9 +177,9 @@ diff -up NetworkManager-0.9.0/network-manager-applet-0.9.0/src/utils/tests/Makef
|
||||
|
||||
noinst_PROGRAMS = test-utils
|
||||
|
||||
diff -up NetworkManager-0.9.0/network-manager-applet-0.9.0/src/wireless-security/Makefile.am.buildfix NetworkManager-0.9.0/network-manager-applet-0.9.0/src/wireless-security/Makefile.am
|
||||
--- NetworkManager-0.9.0/network-manager-applet-0.9.0/src/wireless-security/Makefile.am.buildfix 2009-07-02 16:32:26.000000000 -0400
|
||||
+++ NetworkManager-0.9.0/network-manager-applet-0.9.0/src/wireless-security/Makefile.am 2009-07-28 11:29:11.687841490 -0400
|
||||
diff -up NetworkManager-0.9.1.90/network-manager-applet-0.9.1.90/src/wireless-security/Makefile.am.buildfix NetworkManager-0.9.1.90/network-manager-applet-0.9.1.90/src/wireless-security/Makefile.am
|
||||
--- NetworkManager-0.9.1.90/network-manager-applet-0.9.1.90/src/wireless-security/Makefile.am.buildfix 2009-07-02 16:32:26.000000000 -0400
|
||||
+++ NetworkManager-0.9.1.90/network-manager-applet-0.9.1.90/src/wireless-security/Makefile.am 2009-07-28 11:29:11.687841490 -0400
|
||||
@@ -1,5 +1,9 @@
|
||||
noinst_LTLIBRARIES = libwireless-security.la
|
||||
|
||||
@ -202,3 +202,32 @@ diff -up NetworkManager-0.9.0/network-manager-applet-0.9.0/src/wireless-security
|
||||
uidir = $(datadir)/nm-applet
|
||||
ui_DATA = \
|
||||
|
||||
diff -up NetworkManager-0.9.1.90/network-manager-applet-0.9.1.90/src/libnm-gtk/Makefile.am.blah NetworkManager-0.9.1.90/network-manager-applet-0.9.1.90/src/libnm-gtk/Makefile.am
|
||||
--- NetworkManager-0.9.1.90/network-manager-applet-0.9.1.90/src/libnm-gtk/Makefile.am.blah 2011-09-19 23:44:41.648498871 -0500
|
||||
+++ NetworkManager-0.9.1.90/network-manager-applet-0.9.1.90/src/libnm-gtk/Makefile.am 2011-09-19 23:45:26.556937440 -0500
|
||||
@@ -1,3 +1,7 @@
|
||||
+INCLUDES = -I${top_srcdir}/../include \
|
||||
+ -I${top_srcdir}/../libnm-util \
|
||||
+ -I${top_srcdir}/../libnm-glib
|
||||
+
|
||||
uidir = $(datadir)/libnm-gtk
|
||||
ui_DATA = wifi.ui
|
||||
|
||||
@@ -36,11 +40,14 @@ libnm_gtk_la_LIBADD = \
|
||||
$(NMA_LIBS) \
|
||||
$(GNOME_KEYRING_LIBS) \
|
||||
$(top_builddir)/src/marshallers/libmarshallers.la \
|
||||
- $(top_builddir)/src/wireless-security/libwireless-security.la
|
||||
+ $(top_builddir)/src/wireless-security/libwireless-security.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 \
|
||||
+ -L${top_builddir}/../libnm-glib $(top_builddir)/../libnm-glib/libnm-glib-vpn.la
|
||||
|
||||
libnm_gtk_la_LDFLAGS = -Wl,-no-undefined
|
||||
|
||||
pkgconfigdir = $(libdir)/pkgconfig
|
||||
pkgconfig_DATA = libnm-gtk.pc
|
||||
|
||||
-EXTRA_DIST = libnm-gtk.pc.in $(ui_DATA)
|
||||
\ No newline at end of file
|
||||
+EXTRA_DIST = libnm-gtk.pc.in $(ui_DATA)
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
diff -up NetworkManager-0.9.0/network-manager-applet-0.9.0/nm-applet.schemas.in.foo NetworkManager-0.9.0/network-manager-applet-0.9.0/nm-applet.schemas.in
|
||||
--- NetworkManager-0.9.0/network-manager-applet-0.9.0/nm-applet.schemas.in.foo 2009-10-21 17:23:29.480267635 -0700
|
||||
+++ NetworkManager-0.9.0/network-manager-applet-0.9.0/nm-applet.schemas.in 2009-10-21 17:39:42.734142996 -0700
|
||||
diff -up NetworkManager-0.9.1.90/network-manager-applet-0.9.1.90/nm-applet.schemas.in.foo NetworkManager-0.9.1.90/network-manager-applet-0.9.1.90/nm-applet.schemas.in
|
||||
--- NetworkManager-0.9.1.90/network-manager-applet-0.9.1.90/nm-applet.schemas.in.foo 2009-10-21 17:23:29.480267635 -0700
|
||||
+++ NetworkManager-0.9.1.90/network-manager-applet-0.9.1.90/nm-applet.schemas.in 2009-10-21 17:39:42.734142996 -0700
|
||||
@@ -6,7 +6,7 @@
|
||||
<applyto>/apps/nm-applet/disable-connected-notifications</applyto>
|
||||
<owner>nm-applet</owner>
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
diff --git NetworkManager-0.9.0/network-manager-applet-0.9.0/src/wireless-dialog.c NetworkManager-0.9.0/network-manager-applet-0.9.0/src/wireless-dialog.c
|
||||
diff --git NetworkManager-0.9.1.90/network-manager-applet-0.9.1.90/src/libnm-gtk/nm-wireless-dialog.c NetworkManager-0.9.1.90/network-manager-applet-0.9.1.90/src/libnm-gtk/nm-wireless-dialog.c
|
||||
index 2cd75e0..5ae4764 100644
|
||||
--- NetworkManager-0.9.0/network-manager-applet-0.9.0/src/wireless-dialog.c
|
||||
+++ NetworkManager-0.9.0/network-manager-applet-0.9.0/src/wireless-dialog.c
|
||||
--- NetworkManager-0.9.1.90/network-manager-applet-0.9.1.90/src/libnm-gtk/nm-wireless-dialog.c
|
||||
+++ NetworkManager-0.9.1.90/network-manager-applet-0.9.1.90/src/libnm-gtk/nm-wireless-dialog.c
|
||||
@@ -1151,24 +1151,28 @@ internal_init (NMAWirelessDialog *self,
|
||||
|
||||
tmp = g_strdup_printf (_("Passwords or encryption keys are required to access the wireless network '%s'."),
|
||||
|
||||
4
sources
4
sources
@ -1,2 +1,2 @@
|
||||
0acb51a218ed16454d0ee04fe186e445 NetworkManager-0.9.0.tar.bz2
|
||||
8d1e26870039e27ae6b4606f593631d5 network-manager-applet-0.9.0.tar.bz2
|
||||
eef82b56869329b46f7d6960bfb041cb NetworkManager-0.9.1.90.tar.bz2
|
||||
c2eba14ca9194efac58334eebf0b844c network-manager-applet-0.9.1.90.tar.bz2
|
||||
|
||||
Loading…
Reference in New Issue
Block a user