0001-fill-default-value-true-for-guest-manager-multi-thre.patch

@@ -1,26 +0,0 @@
-From 48f8987596642b9a8adf17b307ff658b35c3f779 Mon Sep 17 00:00:00 2001
-From: wangdi <wangdi@kylinos.cn>
-Date: Fri, 24 Mar 2023 16:36:54 +0800
-Subject: [PATCH] fill default value true for guest-manager-multi-thread in
- momd.conf
-
----
- doc/mom-balloon+ksm.conf | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/doc/mom-balloon+ksm.conf b/doc/mom-balloon+ksm.conf
-index 4456da7..23d54eb 100644
---- a/doc/mom-balloon+ksm.conf
-+++ b/doc/mom-balloon+ksm.conf
-@@ -61,7 +61,7 @@ policy-dir:
- # advantage of those guarantees, and do the monitoring using a single thread.
- # If set to false, disable the current behaviour and configure MOM to monitor
- # all the VMs using only one thread.
--guest-manager-multi-thread:
-+guest-manager-multi-thread: true
- 
- [logging]
- # Set the destination for program log messages.  This can be either 'stdio' or
--- 
-2.39.1
-

mom.spec

@@ -1,19 +1,24 @@
+%{!?python_sitelib: %global python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib())")}
 %{!?_pkgdocdir: %global _pkgdocdir %{_docdir}/%{name}-%{version}}
-%{!?with_check: %global with_check 1}
+%{!?with_check: %global with_check 0}
 
-%global		package_version 0.6.2
+%global		package_version 0.5.12
+%global		package_name mom
 
-Name:		mom
+Name:		%{package_name}
-Version:	0.6.2
+Version:	0.5.12
-Release:	3
+Release:	1%{?release_suffix}%{?dist}
 Summary:	Dynamically manage system resources on virtualization hosts
 
+Group:		Applications/System
 License:	GPLv2
-URL:		https://www.ovirt.org
+URL:		http://www.ovirt.org
-Source:		https://resources.ovirt.org/pub/src/mom/mom-0.6.2.tar.gz
+Source:		 %{package_name}-%{package_version}.tar.gz
+BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}
 BuildArch:	noarch
-BuildRequires:	python3-devel
+BuildRequires:	python-devel
-BuildRequires:	python3-six
+BuildRequires:	python-nose
+BuildRequires:	python-mock
 
 Requires(post): systemd
 Requires(preun): systemd
@@ -22,13 +27,14 @@ BuildRequires: systemd
 
 # MOM makes use of libvirt by way of the python bindings to monitor and
 # interact with virtual machines.
+%if 0%{?fedora} >= 18 || 0%{?rhel} >= 7
 Requires:	libvirt-daemon-driver-qemu
-Requires:	python3-libvirt
+%else
-Requires:	python3-six
+Requires:	libvirt
+%endif
+Requires:	libvirt-python
 Requires:	procps
 
-Patch1:		0001-fill-default-value-true-for-guest-manager-multi-thre.patch
-
 
 %description
 MOM is a policy-driven tool that can be used to manage overcommitment on KVM
@@ -44,19 +50,18 @@ MOM supports control of memory ballooning and KSM but the architecture is
 designed to accommodate new mechanisms such as cgroups.
 
 %prep
-%autosetup -p1 -n mom-0.6.2
+%setup -q -n %{package_name}-%{package_version}
 
 %build
-%configure \
+%configure --docdir="%{_pkgdocdir}"
-        PYTHON="%{__python3}" \
-        --docdir="%{_pkgdocdir}"
 make %{?_smp_mflags}
 
 %install
+rm -rf "%{buildroot}"
 make DESTDIR="%{buildroot}" install
 
 install -dm 755 %{buildroot}%{_unitdir}
-install contrib/momd.service %{buildroot}%{_unitdir}
+mv contrib/momd.service %{buildroot}%{_unitdir}
 install -d -m 0755 "%{buildroot}/%{_sysconfdir}"
 install -m 0644 doc/mom-balloon+ksm.conf "%{buildroot}/%{_sysconfdir}/momd.conf"
 
@@ -76,30 +81,11 @@ make check %{?_smp_mflags}
 
 %files
 %config(noreplace) %{_sysconfdir}/momd.conf
-%license COPYING
-%doc README.md
-
-%dir %{_pkgdocdir}/examples
-%{_pkgdocdir}/examples/*
-# COPYING is handled by license macro, avoid to ship duplicates
-%exclude %{_pkgdocdir}/COPYING
-
 %{_unitdir}/momd.service
 %{_sbindir}/momd
-%{python3_sitelib}/mom/
+%{python_sitelib}/mom/
+%{_pkgdocdir}/*
 
 %changelog
-* Fri Mar 24 2023 wangdi <wangdi@kylinos.cn> - 0.6.2-3
-- Set 'guest-manager-multi-thread' to 'true' in default configuration file
-
-* Mon Mar 13 2023 wangdi <wangdi@kylinos.cn> - 0.6.2-2
-- Fix wrong python3 intepreter path
-
-* Tue Mar 15 2022 wangdi <wangdi@kylinos.cn> - 0.6.2-1
-- Bump version to 0.6.2
-
-* Tue Jul 06 2021 wangdi <wangdi@kylinos.cn> - 0.6.1-1
-- Bump version to 0.6.1
-
 * Wed Mar 04 2020 Huihui Fu <huihui.fu@cs2c.com.cn> - 0.5.12-1
 - Initial package

mom.yaml

@@ -1,4 +0,0 @@
-version_control: github
-src_repo: oVirt/mom
-tag_prefix: ^v
-separator: "."