Update to 0.0.3 release
This commit is contained in:
Daniel P. Berrange
parent
c915214fb6
commit
043bb2722b
@ -1 +1,5 @@
|
||||
virt-viewer-0.0.2.tar.gz
|
||||
.build*.log
|
||||
*.rpm
|
||||
x86_64
|
||||
i386
|
||||
virt-viewer-*.tar.gz
|
||||
|
||||
2
sources
2
sources
@ -1 +1 @@
|
||||
9dfec5581975346183b977767aee4700 virt-viewer-0.0.2.tar.gz
|
||||
feb97e8e0df27fbeeeefe733b49cc157 virt-viewer-0.0.3.tar.gz
|
||||
|
||||
@ -1,12 +0,0 @@
|
||||
diff -rup virt-viewer-0.0.2.orig/src/main.c virt-viewer-0.0.2.new/src/main.c
|
||||
--- virt-viewer-0.0.2.orig/src/main.c 2008-01-11 17:30:23.000000000 -0500
|
||||
+++ virt-viewer-0.0.2.new/src/main.c 2008-01-11 17:32:00.000000000 -0500
|
||||
@@ -233,6 +233,8 @@ static void viewer_credential(GtkWidget
|
||||
continue;
|
||||
}
|
||||
entry[row] = gtk_entry_new();
|
||||
+ if (g_value_get_enum(cred) == VNC_DISPLAY_CREDENTIAL_PASSWORD)
|
||||
+ gtk_entry_set_visibility(GTK_ENTRY(entry[row]), FALSE);
|
||||
|
||||
gtk_table_attach(GTK_TABLE(box), label[i], 0, 1, row, row+1, GTK_SHRINK, GTK_SHRINK, 3, 3);
|
||||
gtk_table_attach(GTK_TABLE(box), entry[i], 1, 2, row, row+1, GTK_SHRINK, GTK_SHRINK, 3, 3);
|
||||
@ -1,12 +0,0 @@
|
||||
diff -rup virt-viewer-0.0.2/src/main.c virt-viewer-0.0.2.new/src/main.c
|
||||
--- virt-viewer-0.0.2/src/main.c 2007-08-28 20:33:27.000000000 -0400
|
||||
+++ virt-viewer-0.0.2.new/src/main.c 2007-10-15 17:00:44.000000000 -0400
|
||||
@@ -197,7 +197,7 @@ static void viewer_credential(GtkWidget
|
||||
prompt++;
|
||||
break;
|
||||
case VNC_DISPLAY_CREDENTIAL_CLIENTNAME:
|
||||
- data[i] = "libvirt";
|
||||
+ data[i] = "libvirt-vnc";
|
||||
default:
|
||||
break;
|
||||
}
|
||||
@ -1,74 +0,0 @@
|
||||
changeset: 17:59fccec87973
|
||||
user: "Daniel P. Berrange <berrange@redhat.com>"
|
||||
date: Thu Nov 29 15:09:26 2007 -0500
|
||||
summary: Use proper domain name in title bar, rather than VNC server title
|
||||
|
||||
diff -r 97f00b8df38a -r 59fccec87973 AUTHORS
|
||||
--- a/AUTHORS Tue Aug 28 20:33:11 2007 -0400
|
||||
+++ b/AUTHORS Thu Nov 29 15:09:26 2007 -0500
|
||||
@@ -3,9 +3,11 @@
|
||||
|
||||
The Virt Viewer application is written by
|
||||
|
||||
- Daniel P. Berrange <berrange@redhat.com>
|
||||
+ Daniel P. Berrange <berrange-at-redhat-dot-com>
|
||||
|
||||
With additional patches from:
|
||||
+
|
||||
+ Chris Lalancette <clalance-at-redhat-dot-com>
|
||||
|
||||
...send patches to get your name here...
|
||||
|
||||
diff -r 97f00b8df38a -r 59fccec87973 src/main.c
|
||||
--- a/src/main.c Tue Aug 28 20:33:11 2007 -0400
|
||||
+++ b/src/main.c Thu Nov 29 15:09:26 2007 -0500
|
||||
@@ -42,6 +42,7 @@
|
||||
#define DEBUG_LOG(s, ...) do {} while (0)
|
||||
#endif
|
||||
|
||||
+static char *domname = NULL;
|
||||
static int verbose = 0;
|
||||
#define MAX_KEY_COMBO 3
|
||||
struct keyComboDef {
|
||||
@@ -66,10 +67,8 @@ static const struct keyComboDef keyCombo
|
||||
{ { GDK_Print }, 1, "_PrintScreen"},
|
||||
};
|
||||
|
||||
-
|
||||
static void viewer_set_title(VncDisplay *vnc, GtkWidget *window, gboolean grabbed)
|
||||
{
|
||||
- const char *name;
|
||||
char title[1024];
|
||||
const char *subtitle;
|
||||
|
||||
@@ -78,9 +77,8 @@ static void viewer_set_title(VncDisplay
|
||||
else
|
||||
subtitle = "";
|
||||
|
||||
- name = vnc_display_get_name(VNC_DISPLAY(vnc));
|
||||
snprintf(title, sizeof(title), "%s%s - Virt Viewer",
|
||||
- subtitle, name);
|
||||
+ subtitle, domname);
|
||||
|
||||
gtk_window_set_title(GTK_WINDOW(window), title);
|
||||
}
|
||||
@@ -708,6 +706,7 @@ int main(int argc, char **argv)
|
||||
char *vncport = NULL;
|
||||
char *transport = NULL;
|
||||
char *user = NULL;
|
||||
+ const char *tmpname = NULL;
|
||||
int port = 0;
|
||||
int fd = -1;
|
||||
int direct = 0;
|
||||
@@ -772,6 +771,10 @@ int main(int argc, char **argv)
|
||||
if (!vncport)
|
||||
usleep(300*1000);
|
||||
} while (!vncport);
|
||||
+ tmpname = virDomainGetName(dom);
|
||||
+ if (tmpname != NULL) {
|
||||
+ domname = strdup(tmpname);
|
||||
+ }
|
||||
virDomainFree(dom);
|
||||
virConnectClose(conn);
|
||||
|
||||
|
||||
@ -1,55 +1,91 @@
|
||||
# -*- rpm-spec -*-
|
||||
|
||||
Name: virt-viewer
|
||||
Version: 0.0.2
|
||||
Release: 4%{?dist}
|
||||
Summary: Virtual Machine Viewer
|
||||
# Plugin isn't ready for real world use yet - it needs
|
||||
# a security audit at very least
|
||||
%define _with_plugin %{?with_plugin:1}%{!?with_plugin:0}
|
||||
|
||||
Name: virt-viewer
|
||||
Version: 0.0.3
|
||||
Release: 1%{?dist}
|
||||
Summary: Virtual Machine Viewer
|
||||
Group: Applications/System
|
||||
License: GPLv2+
|
||||
URL: http://virt-manager.org/
|
||||
Source0: http://virt-manager.org/download/sources/%{name}/%{name}-%{version}.tar.gz
|
||||
Patch1: %{name}-%{version}-vnc-credential-name.patch
|
||||
Patch2: %{name}-%{version}-hide-passwd.patch
|
||||
Patch3: %{name}-%{version}-window-title.patch
|
||||
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
|
||||
Requires: openssh-clients
|
||||
|
||||
BuildRequires: gtk2-devel
|
||||
BuildRequires: libvirt-devel >= 0.3.1-4.fc8
|
||||
BuildRequires: libxml2-devel
|
||||
BuildRequires: gtk-vnc-devel >= 0.1.0
|
||||
BuildRequires: gtk-vnc-devel >= 0.3.4
|
||||
BuildRequires: /usr/bin/pod2man
|
||||
%if %{_with_plugin}
|
||||
%if "%{fedora}" > "8"
|
||||
BuildRequires: xulrunner-devel
|
||||
%else
|
||||
BuildRequires: firefox-devel
|
||||
%endif
|
||||
%endif
|
||||
|
||||
%description
|
||||
Virtual Machine Viewer provides a graphical console client for connecting
|
||||
to virtual machines. It uses the GTK-VNC widget to provide the display,
|
||||
and libvirt for looking up VNC server details.
|
||||
|
||||
%if %{_with_plugin}
|
||||
%package plugin
|
||||
Summary: Mozilla plugin for the gtk-vnc library
|
||||
Group: Development/Libraries
|
||||
Requires: %{name} = %{version}
|
||||
|
||||
%description plugin
|
||||
gtk-vnc is a VNC viewer widget for GTK. It is built using coroutines
|
||||
allowing it to be completely asynchronous while remaining single threaded.
|
||||
|
||||
This package provides a web browser plugin for Mozilla compatible
|
||||
browsers.
|
||||
%endif
|
||||
|
||||
%prep
|
||||
%setup -q
|
||||
%patch1 -p1
|
||||
%patch2 -p1
|
||||
%patch3 -p1
|
||||
|
||||
%build
|
||||
%if %{_with_plugin}
|
||||
%configure --enable-plugin=yes
|
||||
%else
|
||||
%configure
|
||||
make %{?_smp_mflags}
|
||||
%endif
|
||||
%__make %{?_smp_mflags}
|
||||
|
||||
|
||||
%install
|
||||
rm -rf $RPM_BUILD_ROOT
|
||||
make install DESTDIR=$RPM_BUILD_ROOT
|
||||
%__make install DESTDIR=$RPM_BUILD_ROOT
|
||||
%if %{_with_plugin}
|
||||
rm -f %{buildroot}%{_libdir}/mozilla/plugins/%{name}-plugin.a
|
||||
rm -f %{buildroot}%{_libdir}/mozilla/plugins/%{name}-plugin.la
|
||||
%endif
|
||||
|
||||
%clean
|
||||
rm -rf $RPM_BUILD_ROOT
|
||||
|
||||
%files
|
||||
%defattr(-,root,root,-)
|
||||
%doc README COPYING AUTHORS NEWS
|
||||
%doc README COPYING AUTHORS ChangeLog NEWS
|
||||
%{_bindir}/%{name}
|
||||
%{_mandir}/man1/%{name}*
|
||||
|
||||
%if %{_with_plugin}
|
||||
%files plugin
|
||||
%defattr(-, root, root)
|
||||
%{_libdir}/mozilla/plugins/%{name}-plugin.so
|
||||
%endif
|
||||
|
||||
%changelog
|
||||
* Mon Mar 10 2008 Daniel P. Berrange <berrange@redhat.com> - 0.0.3-1.fc9
|
||||
- Updated to 0.0.3 release
|
||||
|
||||
* Mon Feb 18 2008 Fedora Release Engineering <rel-eng@fedoraproject.org> - 0.0.2-4
|
||||
- Autorebuild for GCC 4.3
|
||||
|
||||
|
||||
Loading…
Reference in New Issue
Block a user