public inbox for git-commits@fedoraproject.org
help / color / mirror / Atom feed
* [rpms/python-rtslib] rawhide: Use github release tarball until upstream doc fix
@ 2026-07-22 12:14 Martin Hoyer
  0 siblings, 0 replies; only message in thread
From: Martin Hoyer @ 2026-07-22 12:14 UTC (permalink / raw)
  To: git-commits

            A new commit has been pushed.

            Repo   : rpms/python-rtslib
            Branch : rawhide
            Commit : b156c8b6b9b3a99a012d304a21403fd8d3d6ad2c
            Author : Martin Hoyer <mhoyer@redhat.com>
            Date   : 2026-07-22T14:13:33+02:00
            Stats  : +24/-59 in 3 file(s)
            URL    : https://src.fedoraproject.org/rpms/python-rtslib/c/b156c8b6b9b3a99a012d304a21403fd8d3d6ad2c?branch=rawhide

            Log:
            Use github release tarball until upstream doc fix

The pypi wheel currently doesn't include a manpage

---
diff --git a/.gitignore b/.gitignore
index 657d2fe..fff84fd 100644
--- a/.gitignore
+++ b/.gitignore
@@ -62,3 +62,4 @@
 /rtslib-fb-2.1.76.tar.gz
 /rtslib-fb-2.2.3.tar.gz
 /rtslib_fb-2.2.4.tar.gz
+/rtslib-fb-2.2.4.tar.gz

diff --git a/python-rtslib.spec b/python-rtslib.spec
index 24c892e..57b7dfd 100644
--- a/python-rtslib.spec
+++ b/python-rtslib.spec
@@ -1,83 +1,52 @@
 %global pypi_name rtslib_fb
 %global upstream_name rtslib-fb
 
-# epydoc is gone, so disable for now
-%bcond_with apidocs
-
-Name:             python-rtslib
-License:          Apache-2.0
-Summary:          API for Linux kernel LIO SCSI target
-Version:          2.2.4
-Release:          %autorelease
-URL:              https://github.com/open-iscsi/%{upstream_name}
-Source:           %{pypi_source %{pypi_name}}
-Patch0:           0001-disable-xen_pvscsi.patch
-BuildArch:        noarch
-%if %{with apidocs}
-BuildRequires:    epydoc
-%endif
-BuildRequires:    systemd
-
-
-%global _description\
-API for generic Linux SCSI kernel target. Includes the 'target'\
-service and targetctl tool for restoring configuration.
-
-%description %_description
+Name:           python-rtslib
+Version:        2.2.4
+Release:        %autorelease
+Summary:        API for Linux kernel LIO SCSI target
+License:        Apache-2.0
+URL:            https://github.com/open-iscsi/%{upstream_name}
+# TODO, use pypi_source once upstream gitignore fix is resolved
+Source:         %{url}/archive/v%{version}/%{upstream_name}-%{version}.tar.gz
+Patch0:         0001-disable-xen_pvscsi.patch
 
+BuildArch:      noarch
+BuildRequires:  python3-devel
+BuildRequires:  systemd-rpm-macros
 
-%if %{with apidocs}
-%package doc
-Summary:        Documentation for python-rtslib
-Requires:       python3-rtslib = %{version}-%{release}
+%global _description %{expand:
+API for generic Linux SCSI kernel target. Includes the 'target'
+service and targetctl tool for restoring configuration.}
 
-%description doc
-API documentation for rtslib, to configure the generic Linux SCSI
-multiprotocol kernel target.
-%endif
+%description %_description
 
 %package -n python3-rtslib
-Summary:        API for Linux kernel LIO SCSI target
-
-BuildRequires:  python3-devel
-# Optional dependency, not declared in pyproject.toml
-BuildRequires:  python3-kmod
-
+Summary:        %{summary}
 Requires:       python3-kmod
-%if ! %{with apidocs}
-Obsoletes:      %{name}-doc < %{version}-%{release}
-%endif
-
-%description -n python3-rtslib
-API for generic Linux SCSI kernel target.
 
+%description -n python3-rtslib %_description
 
 %package -n target-restore
 Summary:          Systemd service for targetcli/rtslib
 Requires:         python3-rtslib = %{version}-%{release}
-Requires(post):   systemd
-Requires(preun):  systemd
-Requires(postun): systemd
+Requires:         systemd
 
 %description -n target-restore
 Systemd service to restore the LIO kernel target settings
 on system restart.
 
-
 %prep
-%autosetup -p1 -n %{pypi_name}-%{version}
+%autosetup -p1 -n %{upstream_name}-%{version}
 
 %generate_buildrequires
+export SETUPTOOLS_SCM_PRETEND_VERSION=%{version}
 %pyproject_buildrequires
 
 %build
+export SETUPTOOLS_SCM_PRETEND_VERSION=%{version}
 %pyproject_wheel
 
-%if %{with apidocs}
-mkdir -p doc/html
-epydoc --no-sourcecode --html -n rtslib -o doc/html rtslib/*.py
-%endif
-
 %install
 %pyproject_install
 %pyproject_save_files -l 'rtslib*'
@@ -119,10 +88,5 @@ install -m 644 doc/saveconfig.json.5 %{buildroot}%{_mandir}/man5/
 %{_mandir}/man8/targetctl.8*
 %{_mandir}/man5/saveconfig.json.5*
 
-%if %{with apidocs}
-%files doc
-%doc doc/html
-%endif
-
 %changelog
 %autochangelog

diff --git a/sources b/sources
index 2ea14f9..cc2aa36 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (rtslib_fb-2.2.4.tar.gz) = 5801f4785f54db0c21a05dc07b83eba8987e84b6fb7f83fb6b614e0595556c330f911d8eedfddf7c22654a50b0df4afb6c1b5fe66f8d0445c3f0db68423b4100
+SHA512 (rtslib-fb-2.2.4.tar.gz) = 233b4d392f0bde95634cc2cf8ebfcc5f4decdb3e8821f511cfd6207d55c57b4f0e403f123224215e952833b031d5aab7ba2191b84ae23e1749f0a70a2e0388f0

^ permalink raw reply related	[flat|nested] only message in thread

only message in thread, other threads:[~2026-07-22 12:14 UTC | newest]

Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2026-07-22 12:14 [rpms/python-rtslib] rawhide: Use github release tarball until upstream doc fix Martin Hoyer

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox