From ec2840dbb896337f744346ed8de526e697e51bdda62f13c63246151458b7264d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Chv=C3=A1tal?= Date: Tue, 27 Mar 2018 13:23:35 +0000 Subject: [PATCH 1/2] Accepting request 578920 from home:LPechacek:branches:hardware - Update to 02ef9e09e1da, release v1.6pre1 (bsc#1079868) [added missing bug reference] OBS-URL: https://build.opensuse.org/request/show/578920 OBS-URL: https://build.opensuse.org/package/show/hardware/cpuset?expand=0&rev=34 --- cpuset.changes | 5 +++++ cpuset.spec | 25 +++++++++++++++++++------ v1.5.7.tar.gz | 3 --- v1.6pre1.tar.gz | 3 +++ 4 files changed, 27 insertions(+), 9 deletions(-) delete mode 100644 v1.5.7.tar.gz create mode 100644 v1.6pre1.tar.gz diff --git a/cpuset.changes b/cpuset.changes index f44b7ec..eab0a3b 100644 --- a/cpuset.changes +++ b/cpuset.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Thu Feb 8 07:50:25 UTC 2018 - lpechacek@suse.com + +- Update to 02ef9e09e1da, release v1.6pre1 (bsc#1079868) + ------------------------------------------------------------------- Fri Mar 24 08:11:36 UTC 2017 - lpechacek@suse.com diff --git a/cpuset.spec b/cpuset.spec index 17c71b1..ca88882 100644 --- a/cpuset.spec +++ b/cpuset.spec @@ -1,7 +1,7 @@ # # spec file for package cpuset # -# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany. # Copyright (c) 2008-2011 Novell, Inc. Waltham, MA, USA # # All modifications and additions to the file contributed by third parties @@ -17,23 +17,32 @@ # -%{!?python_sitelib: %define python_sitelib %(python -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")} Name: cpuset -Version: 1.5.7 +Version: 1.6pre1 Release: 0 Summary: Allows manipulation of cpusets on system and provides higher level functions License: GPL-2.0 Group: System/Management Url: https://github.com/lpechacek/cpuset Source: https://github.com/lpechacek/cpuset/archive/v%{version}.tar.gz -BuildRequires: python-devel BuildRoot: %{_tmppath}/%{name}-%{version}-build %if 0%{?sles_version} != 11 BuildArch: noarch %endif +%if 0%{?suse_version} < 1500 +%define __cset_python %{__python} +BuildRequires: python-devel +Requires: python-future +%{!?python_sitelib: %define python_sitelib %(python -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")} + %if 0%{?suse_version} > 0 %py_requires %endif +%else # suse_version >= 1500 +%define __cset_python %{__python3} +BuildRequires: python3-devel +Requires: python3-future +%endif %description @@ -48,12 +57,12 @@ shielding setup. %build CFLAGS="%{optflags}" \ -python setup.py build +%{__cset_python} setup.py build #make doc ->not yet, asciidoc is missing... %install # Install binaries, but do not install docs via setup.py -python setup.py install --root=%{buildroot} --prefix=%{_prefix} --install-data=/eraseme +%{__cset_python} setup.py install --root=%{buildroot} --prefix=%{_prefix} --install-data=/eraseme rm -rf %{buildroot}/eraseme # Install documentation @@ -69,7 +78,11 @@ install -m 0444 doc/*.html %{buildroot}/%{_defaultdocdir}/%{name}/html/ %defattr(-,root,root) %doc %{_docdir}/%{name} %{_bindir}/cset +%if 0%{?suse_version} < 1500 %{python_sitelib}/* +%else +%{python3_sitelib}/* +%endif %{_mandir}/man1/* %changelog diff --git a/v1.5.7.tar.gz b/v1.5.7.tar.gz deleted file mode 100644 index f1d6cd2..0000000 --- a/v1.5.7.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:32334e164415ed5aec83c5ffc3dc01c418406eb02d96d881fdfd495587ff0c01 -size 106516 diff --git a/v1.6pre1.tar.gz b/v1.6pre1.tar.gz new file mode 100644 index 0000000..dc562df --- /dev/null +++ b/v1.6pre1.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:f05baaeef222265e12f6c890d19c841237fdc641ddcd21abf76b2a189d45a6ac +size 114470 From 50ea994cfbbd6386274c83d3308456bda71694a5e06bd16e8856efc4f3dc9608 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Chv=C3=A1tal?= Date: Tue, 27 Mar 2018 19:19:03 +0000 Subject: [PATCH 2/2] - Do not require -devel but use only setuptools module - Use ~ in version as without it the package is newer than release 1.6 - Reduce the compat py2/py3 choicer, SLE12 can be python3 OBS-URL: https://build.opensuse.org/package/show/hardware/cpuset?expand=0&rev=35 --- cpuset.changes | 8 ++++++++ cpuset.spec | 53 ++++++++++++++++++++++---------------------------- 2 files changed, 31 insertions(+), 30 deletions(-) diff --git a/cpuset.changes b/cpuset.changes index eab0a3b..677643d 100644 --- a/cpuset.changes +++ b/cpuset.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +Tue Mar 27 19:15:20 UTC 2018 - tchvatal@suse.com + +- Do not require -devel but use only setuptools module +- Use ~ in version as without it the package is newer than + release 1.6 +- Reduce the compat py2/py3 choicer, SLE12 can be python3 + ------------------------------------------------------------------- Thu Feb 8 07:50:25 UTC 2018 - lpechacek@suse.com diff --git a/cpuset.spec b/cpuset.spec index ca88882..e784dcf 100644 --- a/cpuset.spec +++ b/cpuset.spec @@ -17,35 +17,29 @@ # -Name: cpuset -Version: 1.6pre1 -Release: 0 -Summary: Allows manipulation of cpusets on system and provides higher level functions -License: GPL-2.0 -Group: System/Management -Url: https://github.com/lpechacek/cpuset -Source: https://github.com/lpechacek/cpuset/archive/v%{version}.tar.gz -BuildRoot: %{_tmppath}/%{name}-%{version}-build -%if 0%{?sles_version} != 11 +%define realver 1.6pre1 +%if 0%{?suse_version} < 1315 +%define pyver python +%else +%define pyver python3 +%endif +%if 0%{?suse_version} && 0%{?suse_version} <= 1110 +%{!?python_sitelib: %global python_sitelib %(python -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")} +%else BuildArch: noarch %endif -%if 0%{?suse_version} < 1500 -%define __cset_python %{__python} -BuildRequires: python-devel -Requires: python-future -%{!?python_sitelib: %define python_sitelib %(python -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")} - -%if 0%{?suse_version} > 0 -%py_requires -%endif -%else # suse_version >= 1500 -%define __cset_python %{__python3} -BuildRequires: python3-devel -Requires: python3-future -%endif +Name: cpuset +Version: 1.6~pre1 +Release: 0 +Summary: Allows manipulation of cpusets on system and provides higher level functions +License: GPL-2.0-only +Group: System/Management +URL: https://github.com/lpechacek/cpuset +Source: https://github.com/lpechacek/cpuset/archive/v%{realver}.tar.gz +BuildRequires: %{pyver}-setuptools +Requires: %{pyver}-future %description - Cpuset is a Python application to make using the cpusets facilities in the Linux kernel easier. The actual included command is called cset and it allows manipulation of cpusets on the system and provides higher @@ -53,16 +47,15 @@ level functions such as implementation and control of a basic CPU shielding setup. %prep -%setup -q +%setup -q -n %{name}-%{realver} %build -CFLAGS="%{optflags}" \ -%{__cset_python} setup.py build +%{pyver} setup.py build #make doc ->not yet, asciidoc is missing... %install # Install binaries, but do not install docs via setup.py -%{__cset_python} setup.py install --root=%{buildroot} --prefix=%{_prefix} --install-data=/eraseme +%{pyver} setup.py install --root=%{buildroot} --prefix=%{_prefix} --install-data=/eraseme rm -rf %{buildroot}/eraseme # Install documentation @@ -78,7 +71,7 @@ install -m 0444 doc/*.html %{buildroot}/%{_defaultdocdir}/%{name}/html/ %defattr(-,root,root) %doc %{_docdir}/%{name} %{_bindir}/cset -%if 0%{?suse_version} < 1500 +%if 0%{?suse_version} < 1315 %{python_sitelib}/* %else %{python3_sitelib}/*