From 06c45ab34727551f9b2cfd547942ed44663f77fe Mon Sep 17 00:00:00 2001 From: OBS User unknown Date: Thu, 1 May 2008 12:06:18 +0000 Subject: [PATCH] OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/virt-manager?expand=0&rev=17 --- virt-manager.changes | 15 ++++++++++++++ virt-manager.spec | 48 +++++++++++++++++++------------------------- virtman-desktop.diff | 38 ++++++++++++++++------------------- virtman-misc.diff | 19 +++++++++++++----- 4 files changed, 67 insertions(+), 53 deletions(-) diff --git a/virt-manager.changes b/virt-manager.changes index 19d183a2..226ed789 100644 --- a/virt-manager.changes +++ b/virt-manager.changes @@ -1,3 +1,18 @@ +------------------------------------------------------------------- +Tue Apr 29 17:52:16 MDT 2008 - dpmerrill@novell.com + +- Corrected gconf calls in spec file to fix build errors + +------------------------------------------------------------------- +Tue Apr 29 11:53:16 MDT 2008 - dpmerrill@novell.com + +- Added needsrootforbuild to spec file to fix build errors + +------------------------------------------------------------------- +Fri Apr 25 16:16:08 MDT 2008 - dpmerrill@novell.com + +- Fixed SendKey "PrintScreen" option + ------------------------------------------------------------------- Thu Apr 24 16:42:16 MDT 2008 - dpmerrill@novell.com diff --git a/virt-manager.spec b/virt-manager.spec index 8395d95e..6b6c100e 100644 --- a/virt-manager.spec +++ b/virt-manager.spec @@ -8,18 +8,19 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # +# needsrootforbuild Name: virt-manager %define _extra_release %{?dist:%{dist}}%{!?dist:%{?extra_release:%{extra_release}}} -%define gsysconfdir /etc/opt/gnome -%define gconftool /opt/gnome/bin/gconftool-2 +%define gsysconfdir /etc +%define gconftool /usr/bin/gconftool-2 %define virtinst_maj 0 %define virtinst_min 300 %define virtinst_rel 2 %define virtinst_name virtinst-%{virtinst_maj}.%{virtinst_min}.%{virtinst_rel} Version: 0.5.3 -Release: 6 +Release: 7 Summary: Virtual Machine Manager Group: System/Monitoring License: GPL v2 or later @@ -65,7 +66,6 @@ Requires: libxml2-python >= 2.6.23 # Required for loading the glade UI # Requires: pygtk2-libglade # Required for our graphics which are currently SVG format -Requires: librsvg2 # Earlier vte had broken python binding module # Requires: vte >= 0.12.2 Requires: vte @@ -74,6 +74,7 @@ Requires: scrollkeeper # For console widget # Requires: gtk-vnc-python Requires: python-gtk-vnc +BuildRequires: python BuildRequires: gtk2-devel BuildRequires: python-devel BuildRequires: gettext @@ -89,10 +90,7 @@ BuildRequires: update-desktop-files BuildRequires: libxml2-python BuildRequires: python-urlgrabber BuildRequires: libvirt-python -Requires(pre): gconf2 -Requires(post): gconf2,desktop-file-utils -Requires(postun): desktop-file-utils -Requires(preun): gconf2 +%gconf_schemas_prereq %description Virtual Machine Manager provides a graphical tool for administering @@ -127,9 +125,10 @@ popd # autoreconf -i %configure --sysconfdir=%{gsysconfdir} make %{?_smp_mflags} -cd $RPM_BUILD_DIR/%{virtinst_name} +pushd $RPM_BUILD_DIR/%{virtinst_name} python setup.py build python setup.py install +popd %install rm -rf $RPM_BUILD_ROOT @@ -141,7 +140,10 @@ rm -f $RPM_BUILD_ROOT%{_libdir}/%{name}/sparkline.a rm -f $RPM_BUILD_ROOT%{_libdir}/%{name}/sparkline.la # Unsupport languages: rm -rf $RPM_BUILD_ROOT/usr/share/locale/or +%find_gconf_schemas %find_lang %{name} +cat %{name}.schemas_list %{name}.lang > %{name}.lst +sed -i '\^/usr/share/gnome/help/^d' %{name}.lst %suse_update_desktop_file %{name} X-SuSE-YaST-Virtualization sed -i -e 's/Categories=.*/Categories=Qt;X-SuSE-YaST;X-SuSE-YaST-Virtualization;/' $RPM_BUILD_ROOT/%{_datadir}/applications/YaST2/%{name}.desktop # Nuking these because old version didnt have any @@ -152,26 +154,12 @@ sed -i '\^/usr/share/gnome/help/^d' %{name}.lang %clean # rm -rf $RPM_BUILD_ROOT -%pre -if [ "$1" -gt 1 ]; then - export GCONF_CONFIG_SOURCE=`%{gconftool} --get-default-source` - %{gconftool} --makefile-uninstall-rule \ - %{gsysconfdir}/gconf/schemas/%{name}.schemas > /dev/null || : -fi +%pre -f %{name}.schemas_pre -%post -export GCONF_CONFIG_SOURCE=`%{gconftool} --get-default-source` -%{gconftool} --makefile-install-rule \ - %{gsysconfdir}/gconf/schemas/%{name}.schemas > /dev/null || : +%preun -f %{name}.schemas_preun +%posttrans -f %{name}.schemas_posttrans -%preun -if [ "$1" -eq 0 ]; then - export GCONF_CONFIG_SOURCE=`%{gconftool} --get-default-source` - %{gconftool} --makefile-uninstall-rule \ - %{gsysconfdir}/gconf/schemas/%{name}.schemas > /dev/null || : -fi - -%files -f %{name}.lang +%files -f %{name}.lst %defattr(-,root,root,-) %doc COPYING AUTHORS ChangeLog # %dir %attr(775,root,root) /etc/gconf @@ -205,6 +193,12 @@ fi %dir %{_datadir}/applications/YaST2 %changelog +* Tue Apr 29 2008 dpmerrill@novell.com +- Corrected gconf calls in spec file to fix build errors +* Tue Apr 29 2008 dpmerrill@novell.com +- Added needsrootforbuild to spec file to fix build errors +* Fri Apr 25 2008 dpmerrill@novell.com +- Fixed SendKey "PrintScreen" option * Thu Apr 24 2008 dpmerrill@novell.com - Added python-gtk-devel and python-gobject2-devel to spec file to reflect changes in OpenSuse11.0 diff --git a/virtman-desktop.diff b/virtman-desktop.diff index 8d83e83e..84b1d464 100644 --- a/virtman-desktop.diff +++ b/virtman-desktop.diff @@ -1,7 +1,6 @@ -Index: virt-manager-0.5.3/src/Makefile.am -=================================================================== +diff -Nuar virt-manager-0.5.3.orig/src/Makefile.am virt-manager-0.5.3/src/Makefile.am --- virt-manager-0.5.3.orig/src/Makefile.am 2008-01-10 18:17:51.000000000 -0700 -+++ virt-manager-0.5.3/src/Makefile.am 2008-01-18 15:38:21.000000000 -0700 ++++ virt-manager-0.5.3/src/Makefile.am 2008-04-29 11:07:08.000000000 -0600 @@ -14,7 +14,7 @@ gladedir = $(pkgdatadir) glade_DATA = $(wildcard $(srcdir)/*.glade) @@ -11,11 +10,22 @@ Index: virt-manager-0.5.3/src/Makefile.am desktop_SOURCES = $(PACKAGE).desktop.in.in desktop_DATA = $(PACKAGE).desktop -Index: virt-manager-0.5.3/src/virt-manager.desktop.in.in -=================================================================== +diff -Nuar virt-manager-0.5.3.orig/src/Makefile.in virt-manager-0.5.3/src/Makefile.in +--- virt-manager-0.5.3.orig/src/Makefile.in 2008-01-10 18:18:06.000000000 -0700 ++++ virt-manager-0.5.3/src/Makefile.in 2008-04-29 11:12:12.000000000 -0600 +@@ -246,7 +246,7 @@ + libexec_SCRIPTS = $(PACKAGE)-launch + gladedir = $(pkgdatadir) + glade_DATA = $(wildcard $(srcdir)/*.glade) +-desktopdir = $(datadir)/applications ++desktopdir = $(datadir)/applications/YaST2/ + desktop_SOURCES = $(PACKAGE).desktop.in.in + desktop_DATA = $(PACKAGE).desktop + dbusdir = $(datadir)/dbus-1/services +diff -Nuar virt-manager-0.5.3.orig/src/virt-manager.desktop.in.in virt-manager-0.5.3/src/virt-manager.desktop.in.in --- virt-manager-0.5.3.orig/src/virt-manager.desktop.in.in 2008-01-10 18:17:51.000000000 -0700 -+++ virt-manager-0.5.3/src/virt-manager.desktop.in.in 2008-01-18 15:37:59.000000000 -0700 -@@ -1,9 +1,17 @@ ++++ virt-manager-0.5.3/src/virt-manager.desktop.in.in 2008-04-29 11:11:24.000000000 -0600 +@@ -1,9 +1,16 @@ [Desktop Entry] +Version=1.0 _Name=Virtual Machine Manager @@ -35,17 +45,3 @@ Index: virt-manager-0.5.3/src/virt-manager.desktop.in.in +X-SuSE-YaST-RootOnly=true +X-SuSE-YaST-Geometry= +X-SuSE-YaST-SortKey= -+X-SuSE-translate=true -Index: virt-manager-0.5.3/src/Makefile.in -=================================================================== ---- virt-manager-0.5.3.orig/src/Makefile.in 2008-01-10 18:18:06.000000000 -0700 -+++ virt-manager-0.5.3/src/Makefile.in 2008-01-18 15:49:25.000000000 -0700 -@@ -246,7 +246,7 @@ - libexec_SCRIPTS = $(PACKAGE)-launch - gladedir = $(pkgdatadir) - glade_DATA = $(wildcard $(srcdir)/*.glade) --desktopdir = $(datadir)/applications -+desktopdir = $(datadir)/applications/YaST2/ - desktop_SOURCES = $(PACKAGE).desktop.in.in - desktop_DATA = $(PACKAGE).desktop - dbusdir = $(datadir)/dbus-1/services diff --git a/virtman-misc.diff b/virtman-misc.diff index db627d40..07bf72f8 100644 --- a/virtman-misc.diff +++ b/virtman-misc.diff @@ -1,6 +1,6 @@ diff -Nuar virt-manager-0.5.3.orig/src/virtManager/addhardware.py virt-manager-0.5.3/src/virtManager/addhardware.py ---- virt-manager-0.5.3.orig/src/virtManager/addhardware.py 2008-04-21 15:48:21.000000000 -0600 -+++ virt-manager-0.5.3/src/virtManager/addhardware.py 2008-04-21 15:49:44.000000000 -0600 +--- virt-manager-0.5.3.orig/src/virtManager/addhardware.py 2008-04-25 16:13:35.000000000 -0600 ++++ virt-manager-0.5.3/src/virtManager/addhardware.py 2008-04-25 16:14:10.000000000 -0600 @@ -704,7 +704,7 @@ device=device) if self._disk.type == virtinst.VirtualDisk.TYPE_FILE and \ @@ -11,8 +11,8 @@ diff -Nuar virt-manager-0.5.3.orig/src/virtManager/addhardware.py virt-manager-0 self._validation_error_box(_("Invalid Storage Parameters"), \ str(e)) diff -Nuar virt-manager-0.5.3.orig/src/virtManager/console.py virt-manager-0.5.3/src/virtManager/console.py ---- virt-manager-0.5.3.orig/src/virtManager/console.py 2008-04-21 15:48:21.000000000 -0600 -+++ virt-manager-0.5.3/src/virtManager/console.py 2008-04-21 15:50:39.000000000 -0600 +--- virt-manager-0.5.3.orig/src/virtManager/console.py 2008-04-25 16:13:35.000000000 -0600 ++++ virt-manager-0.5.3/src/virtManager/console.py 2008-04-25 16:14:54.000000000 -0600 @@ -91,6 +91,7 @@ self.vncViewer.show() @@ -30,6 +30,15 @@ diff -Nuar virt-manager-0.5.3.orig/src/virtManager/console.py virt-manager-0.5.3 elif src.get_name() == "menu-send-cab": keys = ["Control_L", "Alt_L", "BackSpace"] elif src.get_name() == "menu-send-caf1": +@@ -224,7 +225,7 @@ + elif src.get_name() == "menu-send-caf8": + keys = ["Control_L", "Alt_L", "F8"] + elif src.get_name() == "menu-send-printscreen": +- keys = ["PrintScreen"] ++ keys = ["Print"] + + if keys != None: + self.vncViewer.send_keys(keys) @@ -374,7 +375,7 @@ def schedule_retry(self): @@ -69,7 +78,7 @@ diff -Nuar virt-manager-0.5.3.orig/src/virtManager/console.py virt-manager-0.5.3 diff -Nuar virt-manager-0.5.3.orig/src/virtManager/details.py virt-manager-0.5.3/src/virtManager/details.py --- virt-manager-0.5.3.orig/src/virtManager/details.py 2008-01-10 18:17:51.000000000 -0700 -+++ virt-manager-0.5.3/src/virtManager/details.py 2008-04-21 15:50:06.000000000 -0600 ++++ virt-manager-0.5.3/src/virtManager/details.py 2008-04-25 16:14:26.000000000 -0600 @@ -553,7 +553,7 @@ else: vnic = virtinst.VirtualNetworkInterface(type=netinfo[0], macaddr=netinfo[3])