diff --git a/mom-0.5.12.tar.gz b/mom-0.5.12.tar.gz deleted file mode 100644 index 886c03f..0000000 Binary files a/mom-0.5.12.tar.gz and /dev/null differ diff --git a/mom-0.6.1.tar.gz b/mom-0.6.1.tar.gz new file mode 100644 index 0000000..4916cef Binary files /dev/null and b/mom-0.6.1.tar.gz differ diff --git a/mom.spec b/mom.spec index d62f44a..fb0c3be 100644 --- a/mom.spec +++ b/mom.spec @@ -1,24 +1,21 @@ -%{!?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 0} +%{!?with_check: %global with_check 1} -%global package_version 0.5.12 +%global package_version 0.6.1 %global package_name mom Name: %{package_name} -Version: 0.5.12 -Release: 1%{?release_suffix}%{?dist} +Version: 0.6.1 +Release: 1 Summary: Dynamically manage system resources on virtualization hosts -Group: Applications/System License: GPLv2 URL: http://www.ovirt.org -Source: %{package_name}-%{package_version}.tar.gz -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release} +Source: https://resources.ovirt.org/pub/src/%{name}/%{package_name}-%{package_version}.tar.gz BuildArch: noarch -BuildRequires: python-devel -BuildRequires: python-nose -BuildRequires: python-mock +BuildRequires: python3-devel +BuildRequires: python3-nose +BuildRequires: python3-six Requires(post): systemd Requires(preun): systemd @@ -27,12 +24,9 @@ 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 -%else -Requires: libvirt -%endif -Requires: libvirt-python +Requires: python3-libvirt +Requires: python3-six Requires: procps @@ -53,15 +47,16 @@ designed to accommodate new mechanisms such as cgroups. %setup -q -n %{package_name}-%{package_version} %build -%configure --docdir="%{_pkgdocdir}" +%configure \ + PYTHON="/usr/bin/python3" \ + --docdir="%{_pkgdocdir}" make %{?_smp_mflags} %install -rm -rf "%{buildroot}" make DESTDIR="%{buildroot}" install install -dm 755 %{buildroot}%{_unitdir} -mv contrib/momd.service %{buildroot}%{_unitdir} +install contrib/momd.service %{buildroot}%{_unitdir} install -d -m 0755 "%{buildroot}/%{_sysconfdir}" install -m 0644 doc/mom-balloon+ksm.conf "%{buildroot}/%{_sysconfdir}/momd.conf" @@ -81,11 +76,21 @@ make check %{?_smp_mflags} %files %config(noreplace) %{_sysconfdir}/momd.conf +%license COPYING +%doc README + +%dir %{_pkgdocdir}/examples +%{_pkgdocdir}/examples/* +# COPYING is handled by license macro, avoid to ship duplicates +%exclude %{_pkgdocdir}/COPYING + %{_unitdir}/momd.service %{_sbindir}/momd -%{python_sitelib}/mom/ -%{_pkgdocdir}/* +%{python3_sitelib}/mom/ %changelog +* Tue Jul 06 2021 wangdi - 0.6.1-1 +- Bump version to 0.6.1 + * Wed Mar 04 2020 Huihui Fu - 0.5.12-1 - Initial package