2 Commits

6 changed files with 66 additions and 56 deletions

View File

@@ -1,16 +1,17 @@
<services>
<service mode="disabled" name="obs_scm">
<param name="url">git://github.com/cobbler/koan.git</param>
<service mode="manual" name="obs_scm">
<param name="url">https://github.com/cobbler/koan.git</param>
<param name="scm">git</param>
<!--
<param name="revision">master</param>
-->
<param name="revision">3.0.2</param>
<param name="extract">koan.spec</param>
<param name="exclude">tests*</param>
<param name="versionformat">3.0.1+git%cd.%h</param>
<param name="versionformat">3.0.1</param>
-->
<param name="revision">main</param>
<param name="versionformat">@PARENT_TAG@+git@TAG_OFFSET@</param>
<param name="versionrewrite-pattern">v(.*?)(\+git0)?$</param>
</service>
<service mode="disabled" name="set_version"/>
<service mode="manual" name="set_version"/>
<service mode="buildtime" name="tar"/>
<service mode="buildtime" name="recompress">
<param name="compression">gz</param>

3
koan-3.0.1+git68.obscpio Normal file
View File

@@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:7c40cbc03275c17656c4786559eb5628639799342cb5fd6905cb3d46d7002192
size 275979

View File

@@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:82308396e783d997234ad5ea47dab21e8515ab414b455a932b2af373aba34962
size 249867

View File

@@ -1,7 +1,8 @@
-------------------------------------------------------------------
Fri Jun 6 11:10:14 UTC 2025 - Max Lin <mlin@suse.com>
Fri Jun 13 10:26:43 UTC 2025 - Nico Krapp <nico.krapp@suse.com>
- Add %python3_fix_shebang and %fdupes
- Update to 3.0.1+git68
* Modernize packaging
-------------------------------------------------------------------
Sat May 28 13:17:46 UTC 2022 - Enno Gotthold <egotthold@suse.com>

View File

@@ -1,5 +1,4 @@
name: koan
version: 3.0.1
mtime: 1627384716
commit: f12a94fd3ec96b3dc6ddbe1715ab19ca165d1f90
version: 3.0.1+git68
mtime: 1754038639
commit: bfbba77e472c972b3d771419da6f49a1e2785e30

View File

@@ -1,7 +1,7 @@
#
# spec file for package koan
#
# Copyright (c) 2022 SUSE LLC
# Copyright (c) 2025 SUSE LLC and contributors
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -15,37 +15,34 @@
# Please submit bugfixes or comments via https://bugs.opensuse.org/
#
# If they aren't provided by a system installed macro, define them
%{!?__python3: %global __python3 %{_bindir}/python3}
%if "%{_vendor}" == "debbuild"
%global pyinstflags --no-compile -O0
%global pytargetflags --install-layout=deb
%global develsuffix dev
%else
%global pyinstflags -O1
%global pytargetflags %{nil}
%global develsuffix devel
%endif
%global __python %{__python3}
%global py_shbang_opts %{py3_shbang_opts}
%if 0%{?suse_version} && 0%{?suse_version} < 1600
%{!?python3_pkgversion: %global python3_pkgversion 311}
%global python3_pkgversion 311
%global pythons python311
%else
%{!?python3_pkgversion: %global python3_pkgversion 3}
%global python_pkgversion %{python3_pkgversion}
%{!?py_build: %global py_build CFLAGS="%{optflags}" %{__python} setup.py build}
%{!?py_install: %global py_install %{__python} setup.py install %{?pyinstflags} --skip-build --root %{buildroot} --prefix=%{_prefix} %{?pytargetflags}}
# Always override this definition to unbreak SUSE distributions
%global python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib())")
%global python3_pkgversion %{python3_pkgversion}
%endif
%if 0%{?suse_version}
%{?single_pythons_311plus}
%endif
%define next_tag 3.0.2
Name: koan
Version: 3.0.1
Release: 1%{?dist}
Version: 3.0.1+git68
Release: 0%{?dist}
Summary: Kickstart over a network
%if "%{_vendor}" == "debbuild"
Packager: Cobbler Developers <cobbler@lists.fedorahosted.org>
Group: admin
%else
Group: Development/Libraries
@@ -56,20 +53,25 @@ URL: https://github.com/cobbler/koan
Source0: %{name}-%{version}.tar.gz
BuildArch: noarch
BuildRequires: python%{python_pkgversion}-%{develsuffix}
BuildRequires: python%{python_pkgversion}-setuptools
BuildRequires: python%{python3_pkgversion}-%{develsuffix}
BuildRequires: python%{python3_pkgversion}-pip
BuildRequires: python%{python3_pkgversion}-setuptools
BuildRequires: python%{python3_pkgversion}-wheel
%if "%{_vendor}" != "debbuild"
BuildRequires: fdupes
BuildRequires: python-rpm-macros
%endif
%if 0%{?rhel}
# We need these to build this properly, and OBS doesn't pull them in by default for EPEL
BuildRequires: epel-rpm-macros
%endif
Requires: python%{python_pkgversion}-distro
Requires: python%{python_pkgversion}-netifaces
Requires: python%{python3_pkgversion}-distro
Requires: python%{python3_pkgversion}-netifaces
%if 0%{?suse_version}
# SUSE distributions have messed up naming of this module
Requires: python%{python_pkgversion}-libvirt-python
Requires: python%{python3_pkgversion}-libvirt-python
%else
Requires: python%{python_pkgversion}-libvirt
Requires: python%{python3_pkgversion}-libvirt
%endif
%if "%{_vendor}" == "debbuild"
Recommends: virtinst
@@ -83,35 +85,42 @@ installation of new virtualized guests and reinstallation of an existing
system. For use with a boot-server configured with Cobbler.
%prep
%setup -q
%autosetup -p1
%if 0%{?fedora}%{?rhel}
pathfix.py -pni "%{__python} %{py_shbang_opts}" bin
%endif
%build
%py_build
%if 0%{?fedora} || 0%{?rhel} || 0%{?suse_version}
%pyproject_wheel
%else
python3 -m pip wheel --verbose --progress-bar off --disable-pip-version-check --use-pep517 --no-build-isolation --no-deps --wheel-dir ./dist .
%endif
%install
%py_install
%python3_fix_shebang
%fdupes -s %{buildroot}%{python3_sitelib}
%if 0%{?fedora} || 0%{?rhel} || 0%{?suse_version}
%pyproject_install
%else
python3 -m pip install --verbose --progress-bar off --disable-pip-version-check --root %{buildroot} --no-compile --ignore-installed --no-deps --no-index .
%endif
%if "%{_vendor}" == "debbuild"
%post
# Do late-stage bytecompilation, per debian policy
py%{python3_pkgversion}compile -p %{name}
%preun
# Ensure all __pycache__ files are deleted, per debian policy
py%{python3_pkgversion}clean -p %{name}
%endif
%files
%license COPYING
%doc README.md
%{_bindir}/koan
%{_bindir}/cobbler-register
%{python_sitelib}/koan*
%if "%{_vendor}" == "debbuild"
%post
# Do late-stage bytecompilation, per debian policy
py%{python_pkgversion}compile -p %{name}
%preun
# Ensure all __pycache__ files are deleted, per debian policy
py%{python_pkgversion}clean -p %{name}
%endif
%{python_sitelib}/koan
%{python_sitelib}/koan-%{next_tag}.dist-info
%changelog