Hello community, here is the log from the commit of package vm-install for openSUSE:Factory checked in at 2014-02-20 10:30:33 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/vm-install (Old) and /work/SRC/openSUSE:Factory/.vm-install.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "vm-install" Changes: -------- --- /work/SRC/openSUSE:Factory/vm-install/vm-install.changes 2014-02-06 07:00:38.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.vm-install.new/vm-install.changes 2014-02-20 10:30:34.000000000 +0100 @@ -1,0 +2,19 @@ +Wed Feb 12 13:26:05 MST 2014 - carn...@suse.com + +- Increase default memory for SLE12 to 1024 Meg +- Version 0.8.5 + +------------------------------------------------------------------- +Wed Feb 5 15:31:32 MST 2014 - carn...@suse.com + +- Add support for RedHat Enterprise Linux 7 +- Version 0.8.4 + +------------------------------------------------------------------- +Wed Feb 5 15:31:32 MST 2014 - carn...@suse.com + +- The vm-install.desktop file will only be applied on older systems + that do not support virt-install as the default installer + vm-install.spec + +------------------------------------------------------------------- Old: ---- vm-install-0.8.3.tar.bz2 New: ---- vm-install-0.8.5.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ vm-install.spec ++++++ --- /var/tmp/diff_new_pack.sib2Mx/_old 2014-02-20 10:30:34.000000000 +0100 +++ /var/tmp/diff_new_pack.sib2Mx/_new 2014-02-20 10:30:34.000000000 +0100 @@ -16,17 +16,22 @@ # Name: vm-install +%if %suse_version <= 1230 +%define with_vminstall_as_default_installer 1 +%endif Url: http://developer.novell.com/wiki/index.php/Vm-install BuildRequires: python-devel +%if %{?with_vminstall_as_default_installer}0 BuildRequires: update-desktop-files +%endif # For directory ownership: BuildRequires: yast2 -Version: 0.8.3 +Version: 0.8.5 Release: 0 Summary: Tool to Define a Virtual Machine and Install Its Operating System License: GPL-2.0 Group: System/Emulators/PC -Source0: %{name}-0.8.3.tar.bz2 +Source0: %{name}-0.8.5.tar.bz2 Source1: vm-install.conf BuildRoot: %{_tmppath}/%{name}-%{version}-build ExclusiveArch: %ix86 x86_64 s390x @@ -77,7 +82,11 @@ make install DESTDIR=$RPM_BUILD_ROOT rm -f $RPM_BUILD_ROOT/%pysite/*.egg-info %find_lang xen-vm-install +%if %{?with_vminstall_as_default_installer}0 %suse_update_desktop_file %{name} X-SuSE-YaST-Virtualization +%else +rm -f $RPM_BUILD_ROOT/%{_datadir}/applications/YaST2/vm-install.desktop +%endif mkdir -p $RPM_BUILD_ROOT/etc/default install -m644 %SOURCE1 $RPM_BUILD_ROOT/etc/default/vm-install @@ -95,7 +104,9 @@ %pysite/vminstall %pysite/vmdisks %{_datadir}/YaST2/clients/vm-install.rb +%if %{?with_vminstall_as_default_installer}0 %{_datadir}/applications/YaST2/vm-install.desktop +%endif %config(noreplace) %{_sysconfdir}/default/vm-install %changelog ++++++ vm-install-0.8.3.tar.bz2 -> vm-install-0.8.5.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/vm-install-0.8.3/Makefile new/vm-install-0.8.5/Makefile --- old/vm-install-0.8.3/Makefile 2014-01-28 00:40:55.000000000 +0100 +++ new/vm-install-0.8.5/Makefile 2014-02-12 21:27:10.000000000 +0100 @@ -1,5 +1,5 @@ PACKAGE = vm-install -VER = 0.8.3 +VER = 0.8.5 default: @echo "Run 'make install DESTDIR=$destdir' to install." diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/vm-install-0.8.3/setup.py new/vm-install-0.8.5/setup.py --- old/vm-install-0.8.3/setup.py 2014-01-28 00:40:59.000000000 +0100 +++ new/vm-install-0.8.5/setup.py 2014-02-12 21:27:06.000000000 +0100 @@ -1,7 +1,7 @@ from distutils.core import setup setup(name='vminstall', - version='0.8.3', + version='0.8.5', description='Define a virtual machine and install its operating system', author='Charles Coffing', author_email='ccoff...@novell.com', diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/vm-install-0.8.3/src/vminstall/VMDefaults.py new/vm-install-0.8.5/src/vminstall/VMDefaults.py --- old/vm-install-0.8.3/src/vminstall/VMDefaults.py 2014-01-06 19:57:02.000000000 +0100 +++ new/vm-install-0.8.5/src/vminstall/VMDefaults.py 2014-02-12 21:31:00.000000000 +0100 @@ -217,6 +217,10 @@ else: return [ XenNic(model='para') ] +class RHEL7Defaults(RHEL6Defaults): + def name(self): + return msg.rhel7 + class SUSEDefaults(LinuxDefaults): def group(self): return 'suse' @@ -370,7 +374,7 @@ def min_memory(self): return 256 def default_memory(self): - return 512 + return 1024 def _disk_size(self): return 16 def supports_32nonpae(self): @@ -482,7 +486,7 @@ def name(self): return msg.sles12 def default_memory(self): - return 512 + return 1024 def _disk_size(self): return 8 def num_vcpus(self): @@ -890,6 +894,7 @@ 'rhel4' : RHEL4Defaults(), 'rhel5' : RHEL5Defaults(), 'rhel6' : RHEL6Defaults(), + 'rhel7' : RHEL7Defaults(), 'sled10' : SLED10Defaults(), 'sled11' : SLED11Defaults(), 'sled12' : SLED12Defaults(), diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/vm-install-0.8.3/src/vminstall/msg.py new/vm-install-0.8.5/src/vminstall/msg.py --- old/vm-install-0.8.3/src/vminstall/msg.py 2014-01-22 23:02:14.000000000 +0100 +++ new/vm-install-0.8.5/src/vminstall/msg.py 2014-02-12 21:29:01.000000000 +0100 @@ -139,6 +139,7 @@ rhel4 = _("RedHat Enterprise Linux 4") rhel5 = _("RedHat Enterprise Linux 5") rhel6 = _("RedHat Enterprise Linux 6") +rhel7 = _("RedHat Enterprise Linux 7") sled10 = _("SUSE Linux Enterprise Desktop 10") sled11 = _("SUSE Linux Enterprise Desktop 11") sled12 = _("SUSE Linux Enterprise Desktop 12") -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org
