Hello community,
here is the log from the commit of package NetworkManager-openconnect for openSUSE:12.1:Update:Test checked in at 2012-02-08 17:55:10
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:12.1:Update:Test/NetworkManager-openconnect (Old)
and /work/SRC/openSUSE:12.1:Update:Test/.NetworkManager-openconnect.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "NetworkManager-openconnect", Maintainer is ""
Changes:
--------
--- /work/SRC/openSUSE:12.1:Update:Test/NetworkManager-openconnect/NetworkManager-openconnect.changes 2012-01-31 14:40:34.000000000 +0100
+++ /work/SRC/openSUSE:12.1:Update:Test/.NetworkManager-openconnect.new/NetworkManager-openconnect.changes 2012-02-08 17:55:12.000000000 +0100
@@ -1,0 +2,7 @@
+Wed Feb 8 16:04:45 UTC 2012 - toddrme2178@gmail.com
+
+- Backport factory spec file updates to openSUSE 12.1-compatible
+ version
+- Submitting as an update for openSUSE 12.1 (see bnc#729095)
+
+-------------------------------------------------------------------
Old:
----
NetworkManager-openconnect-0.9.2.0.tar.bz2
nm-openconnect-0.9.2.0-g_thread_init.patch
nm-openconnect-0.9.2.0-g_thread_new.patch
nm-openconnect-0.9.2.0-gmutex.patch
nm-openconnect-0.9.2.0-gtk_box_new.patch
nm-openconnect-0.9.2.0-gtypes.patch
New:
----
NetworkManager-openconnect-0.9.0.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ NetworkManager-openconnect.spec ++++++
--- /var/tmp/diff_new_pack.CU0XIu/_old 2012-02-08 17:55:12.000000000 +0100
+++ /var/tmp/diff_new_pack.CU0XIu/_new 2012-02-08 17:55:12.000000000 +0100
@@ -1,7 +1,7 @@
#
# spec file for package NetworkManager-openconnect
#
-# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -16,23 +16,13 @@
#
Name: NetworkManager-openconnect
-Version: 0.9.2.0
+Version: 0.9.0
Release: 1
License: GPL-2.0+ ; LGPL-2.1
Summary: NetworkManager VPN support for OpenConnect
Url: http://www.gnome.org/projects/NetworkManager
Group: Productivity/Networking/System
Source0: http://download.gnome.org/sources/%{name}/0.9/%{name}-%{version}.tar.bz2
-# PATCH-FIX-UPSTREAM nm-openconnect-0.9.2.0-gtypes.patch commit: ca8a39d1bb999ba98ead45e53041fc3ea28ecd5c - fixed in 0.9.3
-Patch0: nm-openconnect-0.9.2.0-gtypes.patch
-# PATCH-FIX-UPSTREAM nm-openconnect-0.9.2.0-gtk_box_new.patch commit: b2a5782abc44710345ad6f907b7d855d81061ee5 - fixed in 0.9.3
-Patch1: nm-openconnect-0.9.2.0-gtk_box_new.patch
-# PATCH-FIX-UPSTREAM nm-openconnect-0.9.2.0-g_thread_init.patch commit: c6d92c3e64898ea62789def04b86752dec904326 - fixed in 0.9.3
-Patch2: nm-openconnect-0.9.2.0-g_thread_init.patch
-# PATCH-FIX-UPSTREAM nm-openconnect-0.9.2.0-gmutex.patch commit: 50af1fcf4fdb34b45799bbaa07be68b8adc8007b - fixed in 0.9.3
-Patch3: nm-openconnect-0.9.2.0-gmutex.patch
-# PATCH-FIX-UPSTREAM nm-openconnect-0.9.2.0-g_thread_new.patch commit: e95980d9a4b96ac72c20740a35f411ceaca61312 - fixed in 0.9.3
-Patch4: nm-openconnect-0.9.2.0-g_thread_new.patch
BuildRequires: intltool
BuildRequires: openconnect-devel
BuildRequires: translation-update-upstream
@@ -69,11 +59,6 @@
%lang_package
%prep
%setup -q
-%patch0 -p1
-%patch1 -p1
-%patch2 -p1
-%patch3 -p1
-%patch4 -p1
translation-update-upstream
%build
@@ -100,7 +85,7 @@
%files
%defattr(-,root,root,-)
-%doc AUTHORS ChangeLog COPYING NEWS
+%doc AUTHORS ChangeLog COPYING
%{_libexecdir}/nm-openconnect-service
%{_libexecdir}/nm-openconnect-service-openconnect-helper
%{_sysconfdir}/NetworkManager/VPN/nm-openconnect-service.name
++++++ NetworkManager-openconnect-0.9.2.0.tar.bz2 -> NetworkManager-openconnect-0.9.0.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/NetworkManager-openconnect-0.9.2.0/Makefile.in new/NetworkManager-openconnect-0.9.0/Makefile.in
--- old/NetworkManager-openconnect-0.9.2.0/Makefile.in 2011-11-10 04:22:18.000000000 +0100
+++ new/NetworkManager-openconnect-0.9.0/Makefile.in 2011-08-23 05:20:09.000000000 +0200
@@ -39,7 +39,7 @@
subdir = .
DIST_COMMON = $(am__configure_deps) $(srcdir)/Makefile.am \
$(srcdir)/Makefile.in $(srcdir)/config.h.in \
- $(top_srcdir)/configure AUTHORS COPYING ChangeLog NEWS compile \
+ $(top_srcdir)/configure AUTHORS COPYING ChangeLog compile \
config.guess config.sub depcomp install-sh ltmain.sh missing \
mkinstalldirs
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/NetworkManager-openconnect-0.9.2.0/NEWS new/NetworkManager-openconnect-0.9.0/NEWS
--- old/NetworkManager-openconnect-0.9.2.0/NEWS 2011-10-28 21:31:25.000000000 +0200
+++ new/NetworkManager-openconnect-0.9.0/NEWS 1970-01-01 01:00:00.000000000 +0100
@@ -1,22 +0,0 @@
-=======================================================
-network-manager-openconnect-0.9.2
-Overview of changes since network-manager-openconnect-0.9.0
-=======================================================
-
-This is a new stable release of network-manager-openconnect. Notable changes include:
-
-* Show errors in the auth dialog properly
-* Look for openconnect binary in /usr/sbin too
-* Updated translations
-
-
-=======================================================
-network-manager-openconnect-0.9.0
-Overview of changes since network-manager-openconnect-0.8.x
-=======================================================
-
-This is a new stable release of network-manager-openconnect. Notable changes include:
-
-* Updated for NM 0.9 simplified configuration and secrets handling
-* Updated to build with GTK+ 3.0 and later
-
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/NetworkManager-openconnect-0.9.2.0/aclocal.m4 new/NetworkManager-openconnect-0.9.0/aclocal.m4
--- old/NetworkManager-openconnect-0.9.2.0/aclocal.m4 2011-11-10 04:22:16.000000000 +0100
+++ new/NetworkManager-openconnect-0.9.0/aclocal.m4 2011-08-23 05:20:08.000000000 +0200
@@ -260,10 +260,6 @@
[CATOBJEXT=.mo
DATADIRNAME=lib])
;;
- *-*-openbsd*)
- CATOBJEXT=.mo
- DATADIRNAME=share
- ;;
*)
CATOBJEXT=.mo
DATADIRNAME=lib
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/NetworkManager-openconnect-0.9.2.0/auth-dialog/main.c new/NetworkManager-openconnect-0.9.0/auth-dialog/main.c
--- old/NetworkManager-openconnect-0.9.2.0/auth-dialog/main.c 2011-10-28 21:29:29.000000000 +0200
+++ new/NetworkManager-openconnect-0.9.0/auth-dialog/main.c 2011-08-19 22:56:01.000000000 +0200
@@ -51,6 +51,8 @@
#include
#include
+static char *last_message;
+
static char *lasthost;
typedef struct vpnhost {
@@ -88,7 +90,6 @@
GtkWidget *ssl_box;
GtkWidget *cancel_button;
GtkWidget *login_button;
- GtkWidget *last_notice_icon;
GtkTextBuffer *log;
int retval;
@@ -133,6 +134,7 @@
static void ssl_box_add_error(auth_ui_data *ui_data, const char *msg)
{
GtkWidget *hbox, *text, *image;
+ int width;
hbox = gtk_hbox_new(FALSE, 8);
gtk_box_pack_start(GTK_BOX(ui_data->ssl_box), hbox, FALSE, FALSE, 0);
@@ -143,26 +145,10 @@
text = gtk_label_new(msg);
gtk_label_set_line_wrap(GTK_LABEL(text), TRUE);
- gtk_box_pack_start(GTK_BOX(hbox), text, TRUE, TRUE, 0);
- ui_data->last_notice_icon = NULL;
-}
-
-static void ssl_box_add_notice(auth_ui_data *ui_data, const char *msg)
-{
- GtkWidget *hbox, *text, *image;
-
- hbox = gtk_hbox_new(FALSE, 8);
- gtk_box_pack_start(GTK_BOX(ui_data->ssl_box), hbox, FALSE, FALSE, 0);
-
- image = gtk_image_new_from_stock(GTK_STOCK_DIALOG_WARNING,
- GTK_ICON_SIZE_DIALOG);
- gtk_box_pack_start(GTK_BOX(hbox), image, FALSE, FALSE, 0);
-
- text = gtk_label_new(msg);
- gtk_label_set_line_wrap(GTK_LABEL(text), TRUE);
- gtk_box_pack_start(GTK_BOX(hbox), text, TRUE, TRUE, 0);
- gtk_widget_show_all(ui_data->ssl_box);
- ui_data->last_notice_icon = image;
+ gtk_window_get_size(GTK_WINDOW(ui_data->dialog), &width, NULL);
+ /* FIXME: this is not very nice -- can't make the window thinner after this */
+ gtk_widget_set_size_request(text, width - 100, -1);
+ gtk_box_pack_start(GTK_BOX(hbox), text, FALSE, FALSE, 0);
}
static void ssl_box_add_info(auth_ui_data *ui_data, const char *msg)
@@ -182,7 +168,6 @@
{
gtk_widget_hide(ui_data->no_form_label);
gtk_widget_hide(ui_data->getting_form_label);
- ui_data->last_notice_icon = NULL;
gtk_container_foreach(GTK_CONTAINER(ui_data->ssl_box),
container_child_remove, ui_data->ssl_box);
gtk_widget_set_sensitive (ui_data->login_button, FALSE);
@@ -507,6 +492,8 @@
auth_ui_data *ui_data = _ui_data; /* FIXME global */
struct oc_form_opt *opt;
+ ssl_box_clear(ui_data);
+
g_mutex_lock(ui_data->form_mutex);
while (!g_queue_is_empty (ui_data->form_entries)) {
ui_fragment_data *data;
@@ -985,37 +972,30 @@
return FALSE;
}
-/* NOTE: write_progress_real() will free the given string */
-static gboolean write_notice_real(char *message)
-{
- auth_ui_data *ui_data = _ui_data; /* FIXME global */
-
- g_return_val_if_fail(message, FALSE);
-
- ssl_box_add_notice(ui_data, message);
- g_free(message);
-
- return FALSE;
-}
-
/* runs in worker thread */
static void write_progress(struct openconnect_info *info, int level, const char *fmt, ...)
{
va_list args;
char *msg;
+ if (last_message) {
+ g_free(last_message);
+ last_message = NULL;
+ }
+
va_start(args, fmt);
msg = g_strdup_vprintf(fmt, args);
va_end(args);
- if (level <= PRG_ERR) {
- g_idle_add((GSourceFunc)write_notice_real, g_strdup(msg));
+ if (level <= PRG_DEBUG) {
+ g_idle_add((GSourceFunc)write_progress_real, g_strdup(msg));
}
- if (level <= PRG_DEBUG)
- g_idle_add((GSourceFunc)write_progress_real, msg);
- else
- g_free(msg);
+ if (level <= PRG_ERR) {
+ last_message = msg;
+ return;
+ }
+ g_free(msg);
}
static gboolean hash_merge_one (gpointer key, gpointer value, gpointer new_hash)
@@ -1043,10 +1023,8 @@
if (ui_data->cookie_retval < 0) {
/* error while getting cookie */
- if (ui_data->last_notice_icon) {
- gtk_image_set_from_stock(GTK_IMAGE (ui_data->last_notice_icon),
- GTK_STOCK_DIALOG_ERROR,
- GTK_ICON_SIZE_DIALOG);
+ if (last_message) {
+ ssl_box_add_error(ui_data, last_message);
gtk_widget_show_all(ui_data->ssl_box);
gtk_widget_set_sensitive(ui_data->cancel_button, TRUE);
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/NetworkManager-openconnect-0.9.2.0/configure new/NetworkManager-openconnect-0.9.0/configure
--- old/NetworkManager-openconnect-0.9.2.0/configure 2011-11-10 04:22:17.000000000 +0100
+++ new/NetworkManager-openconnect-0.9.0/configure 2011-08-23 05:20:10.000000000 +0200
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.68 for NetworkManager-openconnect 0.9.2.0.
+# Generated by GNU Autoconf 2.68 for NetworkManager-openconnect 0.9.0.
#
# Report bugs to .
#
@@ -709,8 +709,8 @@
# Identity of this package.
PACKAGE_NAME='NetworkManager-openconnect'
PACKAGE_TARNAME='NetworkManager-openconnect'
-PACKAGE_VERSION='0.9.2.0'
-PACKAGE_STRING='NetworkManager-openconnect 0.9.2.0'
+PACKAGE_VERSION='0.9.0'
+PACKAGE_STRING='NetworkManager-openconnect 0.9.0'
PACKAGE_BUGREPORT='dcbw@redhat.com'
PACKAGE_URL=''
@@ -1510,7 +1510,7 @@
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
-\`configure' configures NetworkManager-openconnect 0.9.2.0 to adapt to many kinds of systems.
+\`configure' configures NetworkManager-openconnect 0.9.0 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1581,7 +1581,7 @@
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of NetworkManager-openconnect 0.9.2.0:";;
+ short | recursive ) echo "Configuration of NetworkManager-openconnect 0.9.0:";;
esac
cat <<\_ACEOF
@@ -1716,7 +1716,7 @@
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-NetworkManager-openconnect configure 0.9.2.0
+NetworkManager-openconnect configure 0.9.0
generated by GNU Autoconf 2.68
Copyright (C) 2010 Free Software Foundation, Inc.
@@ -2139,7 +2139,7 @@
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by NetworkManager-openconnect $as_me 0.9.2.0, which was
+It was created by NetworkManager-openconnect $as_me 0.9.0, which was
generated by GNU Autoconf 2.68. Invocation command line was
$ $0 $@
@@ -2954,7 +2954,7 @@
# Define the identity of the package.
PACKAGE='NetworkManager-openconnect'
- VERSION='0.9.2.0'
+ VERSION='0.9.0'
cat >>confdefs.h <<_ACEOF
@@ -12225,10 +12225,6 @@
fi
;;
- *-*-openbsd*)
- CATOBJEXT=.mo
- DATADIRNAME=share
- ;;
*)
CATOBJEXT=.mo
DATADIRNAME=lib
@@ -13403,21 +13399,21 @@
pkg_cv_NETWORKMANAGER_CFLAGS="$NETWORKMANAGER_CFLAGS"
elif test -n "$PKG_CONFIG"; then
if test -n "$PKG_CONFIG" && \
- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"NetworkManager >= 0.9.2
- libnm-util >= 0.9.2
- libnm-glib >= 0.9.2
- libnm-glib-vpn >= 0.9.2\""; } >&5
- ($PKG_CONFIG --exists --print-errors "NetworkManager >= 0.9.2
- libnm-util >= 0.9.2
- libnm-glib >= 0.9.2
- libnm-glib-vpn >= 0.9.2") 2>&5
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"NetworkManager >= 0.8.998
+ libnm-util >= 0.8.998
+ libnm-glib >= 0.8.998
+ libnm-glib-vpn >= 0.8.998\""; } >&5
+ ($PKG_CONFIG --exists --print-errors "NetworkManager >= 0.8.998
+ libnm-util >= 0.8.998
+ libnm-glib >= 0.8.998
+ libnm-glib-vpn >= 0.8.998") 2>&5
ac_status=$?
$as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
test $ac_status = 0; }; then
- pkg_cv_NETWORKMANAGER_CFLAGS=`$PKG_CONFIG --cflags "NetworkManager >= 0.9.2
- libnm-util >= 0.9.2
- libnm-glib >= 0.9.2
- libnm-glib-vpn >= 0.9.2" 2>/dev/null`
+ pkg_cv_NETWORKMANAGER_CFLAGS=`$PKG_CONFIG --cflags "NetworkManager >= 0.8.998
+ libnm-util >= 0.8.998
+ libnm-glib >= 0.8.998
+ libnm-glib-vpn >= 0.8.998" 2>/dev/null`
else
pkg_failed=yes
fi
@@ -13428,21 +13424,21 @@
pkg_cv_NETWORKMANAGER_LIBS="$NETWORKMANAGER_LIBS"
elif test -n "$PKG_CONFIG"; then
if test -n "$PKG_CONFIG" && \
- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"NetworkManager >= 0.9.2
- libnm-util >= 0.9.2
- libnm-glib >= 0.9.2
- libnm-glib-vpn >= 0.9.2\""; } >&5
- ($PKG_CONFIG --exists --print-errors "NetworkManager >= 0.9.2
- libnm-util >= 0.9.2
- libnm-glib >= 0.9.2
- libnm-glib-vpn >= 0.9.2") 2>&5
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"NetworkManager >= 0.8.998
+ libnm-util >= 0.8.998
+ libnm-glib >= 0.8.998
+ libnm-glib-vpn >= 0.8.998\""; } >&5
+ ($PKG_CONFIG --exists --print-errors "NetworkManager >= 0.8.998
+ libnm-util >= 0.8.998
+ libnm-glib >= 0.8.998
+ libnm-glib-vpn >= 0.8.998") 2>&5
ac_status=$?
$as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
test $ac_status = 0; }; then
- pkg_cv_NETWORKMANAGER_LIBS=`$PKG_CONFIG --libs "NetworkManager >= 0.9.2
- libnm-util >= 0.9.2
- libnm-glib >= 0.9.2
- libnm-glib-vpn >= 0.9.2" 2>/dev/null`
+ pkg_cv_NETWORKMANAGER_LIBS=`$PKG_CONFIG --libs "NetworkManager >= 0.8.998
+ libnm-util >= 0.8.998
+ libnm-glib >= 0.8.998
+ libnm-glib-vpn >= 0.8.998" 2>/dev/null`
else
pkg_failed=yes
fi
@@ -13462,23 +13458,23 @@
_pkg_short_errors_supported=no
fi
if test $_pkg_short_errors_supported = yes; then
- NETWORKMANAGER_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "NetworkManager >= 0.9.2
- libnm-util >= 0.9.2
- libnm-glib >= 0.9.2
- libnm-glib-vpn >= 0.9.2" 2>&1`
+ NETWORKMANAGER_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "NetworkManager >= 0.8.998
+ libnm-util >= 0.8.998
+ libnm-glib >= 0.8.998
+ libnm-glib-vpn >= 0.8.998" 2>&1`
else
- NETWORKMANAGER_PKG_ERRORS=`$PKG_CONFIG --print-errors "NetworkManager >= 0.9.2
- libnm-util >= 0.9.2
- libnm-glib >= 0.9.2
- libnm-glib-vpn >= 0.9.2" 2>&1`
+ NETWORKMANAGER_PKG_ERRORS=`$PKG_CONFIG --print-errors "NetworkManager >= 0.8.998
+ libnm-util >= 0.8.998
+ libnm-glib >= 0.8.998
+ libnm-glib-vpn >= 0.8.998" 2>&1`
fi
# Put the nasty error message in config.log where it belongs
echo "$NETWORKMANAGER_PKG_ERRORS" >&5
- as_fn_error $? "Package requirements (NetworkManager >= 0.9.2
- libnm-util >= 0.9.2
- libnm-glib >= 0.9.2
- libnm-glib-vpn >= 0.9.2) were not met:
+ as_fn_error $? "Package requirements (NetworkManager >= 0.8.998
+ libnm-util >= 0.8.998
+ libnm-glib >= 0.8.998
+ libnm-glib-vpn >= 0.8.998) were not met:
$NETWORKMANAGER_PKG_ERRORS
@@ -14121,7 +14117,7 @@
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by NetworkManager-openconnect $as_me 0.9.2.0, which was
+This file was extended by NetworkManager-openconnect $as_me 0.9.0, which was
generated by GNU Autoconf 2.68. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -14187,7 +14183,7 @@
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
ac_cs_version="\\
-NetworkManager-openconnect config.status 0.9.2.0
+NetworkManager-openconnect config.status 0.9.0
configured by $0, generated by GNU Autoconf 2.68,
with options \\"\$ac_cs_config\\"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/NetworkManager-openconnect-0.9.2.0/configure.ac new/NetworkManager-openconnect-0.9.0/configure.ac
--- old/NetworkManager-openconnect-0.9.2.0/configure.ac 2011-11-10 04:22:10.000000000 +0100
+++ new/NetworkManager-openconnect-0.9.0/configure.ac 2011-08-23 05:19:06.000000000 +0200
@@ -1,6 +1,6 @@
AC_PREREQ(2.52)
-AC_INIT(NetworkManager-openconnect, 0.9.2.0, dcbw@redhat.com, NetworkManager-openconnect)
+AC_INIT(NetworkManager-openconnect, 0.9.0, dcbw@redhat.com, NetworkManager-openconnect)
AM_INIT_AUTOMAKE([subdir-objects no-dist-gzip dist-bzip2])
AM_MAINTAINER_MODE
@@ -96,10 +96,10 @@
fi
PKG_CHECK_MODULES(NETWORKMANAGER,
- NetworkManager >= 0.9.2
- libnm-util >= 0.9.2
- libnm-glib >= 0.9.2
- libnm-glib-vpn >= 0.9.2)
+ NetworkManager >= 0.8.998
+ libnm-util >= 0.8.998
+ libnm-glib >= 0.8.998
+ libnm-glib-vpn >= 0.8.998)
AC_SUBST(NETWORKMANAGER_CFLAGS)
AC_SUBST(NETWORKMANAGER_LIBS)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/NetworkManager-openconnect-0.9.2.0/po/fr.po new/NetworkManager-openconnect-0.9.0/po/fr.po
--- old/NetworkManager-openconnect-0.9.2.0/po/fr.po 2011-10-28 21:29:29.000000000 +0200
+++ new/NetworkManager-openconnect-0.9.0/po/fr.po 2011-08-19 22:56:01.000000000 +0200
@@ -1,60 +1,24 @@
# French translation of network-manager-openconnect.
-# Copyright (C) 2009-2011 The GNOME Foundation.
+# Copyright (C) 2009-2010 The GNOME Foundation.
# This file is distributed under the same license as the network-manager-openconnect package.
#
# Laurent Coudeur , 2009.
# Nicolas Repentin , 2010.
# Bruno Brouard , 2011
-# Claude Paroz , 2011
-#
+#
msgid ""
msgstr ""
"Project-Id-Version: network-manager-openconnect.HEAD\n"
"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?"
-"product=NetworkManager&keywords=I18N+L10N&component=general\n"
-"POT-Creation-Date: 2011-03-31 11:34+0000\n"
-"PO-Revision-Date: 2011-09-02 22:06+0200\n"
-"Last-Translator: Claude Paroz \n"
+"product=NetworkManager&component=general\n"
+"POT-Creation-Date: 2011-02-23 17:39+0000\n"
+"PO-Revision-Date: 2011-03-03 12:25+0200\n"
+"Last-Translator: Bruno Brouard \n"
"Language-Team: GNOME French Team \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-#: ../auth-dialog/main.c:658
-#, c-format
-msgid ""
-"Certificate from VPN server \"%s\" failed verification.\n"
-"Reason: %s\n"
-"Do you want to accept it?"
-msgstr ""
-"La vérification du certificat du serveur VPN « %s » a échoué.\n"
-"Motif : %s\n"
-"Voulez-vous l'accepter ?"
-
-#: ../auth-dialog/main.c:1317
-msgid "VPN host"
-msgstr "Hôte VPN"
-
-#: ../auth-dialog/main.c:1337
-msgid "Automatically start connecting next time"
-msgstr "Démarrer automatiquement la connexion la prochaine fois"
-
-#: ../auth-dialog/main.c:1354
-msgid "Select a host to fetch the login form"
-msgstr "Choisissez un hôte pour obtenir le formulaire de connexion"
-
-#: ../auth-dialog/main.c:1359
-msgid "Contacting host, please wait..."
-msgstr "Contact de l'hôte, veuillez patienter…"
-
-#: ../auth-dialog/main.c:1371
-msgid "_Login"
-msgstr "Se _connecter"
-
-#: ../auth-dialog/main.c:1385
-msgid "Log"
-msgstr "Journal"
-
#: ../properties/auth-helpers.c:64
msgid "Choose a Certificate Authority certificate..."
msgstr "Choisissez un certificat d'autorité de certification..."
@@ -122,43 +86,3 @@
#: ../properties/nm-openconnect-dialog.ui.h:11
msgid "_User Certificate:"
msgstr "Certificat _utilisateur :"
-
-#: ../src/nm-openconnect-service.c:144
-#, c-format
-msgid "invalid integer property '%s' or out of range [%d -> %d]"
-msgstr "propriété nombre entier « %s » non valide ou hors limites [%d -> %d]"
-
-#: ../src/nm-openconnect-service.c:154
-#, c-format
-msgid "invalid boolean property '%s' (not yes or no)"
-msgstr "propriété booléenne « %s » non valide (pas oui ou non)"
-
-#: ../src/nm-openconnect-service.c:161
-#, c-format
-msgid "unhandled property '%s' type %s"
-msgstr "type %2$s de la propriété « %1$s » non géré"
-
-#: ../src/nm-openconnect-service.c:172
-#, c-format
-msgid "property '%s' invalid or not supported"
-msgstr "propriété « %s » non valide ou non prise en charge"
-
-#: ../src/nm-openconnect-service.c:188
-msgid "No VPN configuration options."
-msgstr "Aucune option de configuration du VPN."
-
-#: ../src/nm-openconnect-service.c:206
-msgid "No VPN secrets!"
-msgstr "Aucun secret VPN !"
-
-#: ../src/nm-openconnect-service.c:286
-msgid "Could not find openconnect binary."
-msgstr "Impossible de trouver le programme openconnect."
-
-#: ../src/nm-openconnect-service.c:298
-msgid "No VPN gateway specified."
-msgstr "Aucune passerelle VPN indiquée."
-
-#: ../src/nm-openconnect-service.c:308
-msgid "No WebVPN cookie provided."
-msgstr "Aucun cookie WebVPN fourni."
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/NetworkManager-openconnect-0.9.2.0/src/nm-openconnect-service.c new/NetworkManager-openconnect-0.9.0/src/nm-openconnect-service.c
--- old/NetworkManager-openconnect-0.9.2.0/src/nm-openconnect-service.c 2011-10-28 21:29:29.000000000 +0200
+++ new/NetworkManager-openconnect-0.9.0/src/nm-openconnect-service.c 2011-08-19 22:56:01.000000000 +0200
@@ -57,11 +57,8 @@
static const char *openconnect_binary_paths[] =
{
"/usr/bin/openconnect",
- "/usr/sbin/openconnect",
"/usr/local/bin/openconnect",
- "/usr/local/sbin/openconnect",
"/opt/bin/openconnect",
- "/opt/sbin/openconnect",
NULL
};
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org
