public inbox for git-commits@fedoraproject.org
help / color / mirror / Atom feed
* [rpms/python-jnius] rawhide: update to 1.7.0 fixes FTBFS rhbz#2392263 rhbz#2460555
@ 2026-07-25 21:46 Filipe Rosset
  0 siblings, 0 replies; only message in thread
From: Filipe Rosset @ 2026-07-25 21:46 UTC (permalink / raw)
  To: git-commits

            A new commit has been pushed.

            Repo   : rpms/python-jnius
            Branch : rawhide
            Commit : 2564d5944a094054c44cab14e5669471f5006ede
            Author : Filipe Rosset <filiperosset@fedoraproject.org>
            Date   : 2026-07-25T17:42:28-03:00
            Stats  : +32/-22 in 4 file(s)
            URL    : https://src.fedoraproject.org/rpms/python-jnius/c/2564d5944a094054c44cab14e5669471f5006ede?branch=rawhide

            Log:
            update to 1.7.0 fixes FTBFS rhbz#2392263 rhbz#2460555

spec cleanup and modernization fixes rhbz#2377824

Signed-off-by: Filipe Rosset <filiperosset@fedoraproject.org>

---
diff --git a/.gitignore b/.gitignore
index b55b0b7..bba8804 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,3 +3,4 @@
 /pyjnius-1.2.0.tar.gz
 /pyjnius-1.3.0.tar.gz
 /pyjnius-1.6.1.tar.gz
+/pyjnius-1.7.0.tar.gz

diff --git a/pyjnius-safe-setup-remove.patch b/pyjnius-safe-setup-remove.patch
new file mode 100644
index 0000000..fde0bd9
--- /dev/null
+++ b/pyjnius-safe-setup-remove.patch
@@ -0,0 +1,14 @@
+diff -urN pyjnius-1.7.0.orig/setup.py pyjnius-1.7.0/setup.py
+--- pyjnius-1.7.0.orig/setup.py	2024-04-18 12:00:00.000000000 +0200
++++ pyjnius-1.7.0/setup.py	2026-06-29 12:00:00.000000000 +0200
+@@ -89,7 +89,9 @@
+     fd.write('DEF JNIUS_PLATFORM = {0!r}\n\n'.format(PLATFORM))
+ 
+ # pop setup.py from included files in the installed package
+-SETUP_KWARGS['py_modules'].remove('setup')
++for m in ('setup', 'setup_sdist'):
++    if m in SETUP_KWARGS.get('py_modules', []):
++        SETUP_KWARGS['py_modules'].remove(m)
+ 
+ ext_modules = [
+     Extension(

diff --git a/python-jnius.spec b/python-jnius.spec
index ee6419c..3d6c317 100644
--- a/python-jnius.spec
+++ b/python-jnius.spec
@@ -4,7 +4,7 @@
 
 
 Name:           python-%{modname}
-Version:        1.6.1
+Version:        1.7.0
 Release:        %autorelease
 Summary:        %{sum}
 
@@ -15,18 +15,14 @@ ExclusiveArch:  %{java_arches}
 
 Source0:        %{url}/archive/%{version}.tar.gz#/%{srcname}-%{version}.tar.gz
 
-# Fix compatibility with Cython >= 3.1
-# Backported from upstream:
-# https://github.com/kivy/pyjnius/pull/753
-# https://github.com/kivy/pyjnius/pull/756
-Patch:          fix-cython-3.1-build.patch
+Patch:          pyjnius-safe-setup-remove.patch
+
 
 BuildRequires:  make
 # avoid strict pointer checks with gcc 14, https://bugs.gentoo.org/917562
 BuildRequires:  clang
 
 BuildRequires:  python3-devel
-BuildRequires:  python3dist(setuptools)
 BuildRequires:  python3dist(cython)
 BuildRequires:  python3dist(pytest)
 
@@ -36,7 +32,6 @@ BuildRequires:  python3dist(furo)
 BuildRequires:  ant-openjdk25 
 BuildRequires:  java-25-devel
 
-ExclusiveArch:  %{java_arches}
 
 # https://github.com/kivy/pyjnius/issues/307
 #ExcludeArch:    ppc64 s390x
@@ -47,9 +42,7 @@ ExclusiveArch:  %{java_arches}
 %package     -n python3-%{srcname}
 Summary:        %{sum}
 Requires:       java-25-headless
-Requires:       python3-six
-%{?python_provide:%python_provide python3-%{srcname}}
-Provides:       python3-%{modname}
+Provides:       python3-%{modname} = %{version}-%{release}
 
 
 %description -n python3-%{srcname}
@@ -65,10 +58,16 @@ BuildArch:      noarch
 
 %prep
 %autosetup -p1 -n %{srcname}-%{version}
+%pyproject_patch_dependency Cython:drop_upper
+
+
+%generate_buildrequires
+%pyproject_buildrequires
 
 
 %build
-CC=%{_bindir}/clang %py3_build
+export CC=%{_bindir}/clang
+%pyproject_wheel
 
 make %{_smp_mflags} -C docs SPHINXBUILD='sphinx-build-3 %{_smp_mflags}' html
 
@@ -79,7 +78,10 @@ ant all
 
 
 %install
-%py3_install
+%pyproject_install
+%pyproject_save_files jnius jnius_config
+rm -f docs/build/html/.buildinfo
+rm -f docs/build/html/_static/scripts/furo-extensions.js
 
 
 %check
@@ -96,15 +98,8 @@ k='not test_hierharchy_arraylist'
 popd
 
 
-%files -n python3-%{srcname}
-%license LICENSE
+%files -n python3-%{srcname} -f %{pyproject_files}
 %doc *.md
-%{python3_sitearch}/%{modname}/
-%{python3_sitearch}/%{modname}_config.py*
-%{python3_sitearch}/%{srcname}-%{version}-py*.egg-info/
-%{python3_sitearch}/__pycache__/%{modname}_config.cpython-*.pyc
-%exclude %{python3_sitearch}/__pycache__
-%exclude %{python3_sitearch}/setup_sdist.py
 
 %files doc
 %license LICENSE

diff --git a/sources b/sources
index af7c243..19daad6 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (pyjnius-1.6.1.tar.gz) = ec40f22a57a2c1a6cd8d0960f2e97da800f5ba7e461a6094d571f00cc3dd2787fab17362a5e2abb974d78deb50ee8695d9db4182130c3d1854d59055699b844c
+SHA512 (pyjnius-1.7.0.tar.gz) = 60cb57c62e61ffbdcc3205f34125647b99c100a442af2b646989a79047a02b2ace0b15258854abff0e782b07462eb8369a5d2294c6456797de132e812c3d250f

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

only message in thread, other threads:[~2026-07-25 21:46 UTC | newest]

Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2026-07-25 21:46 [rpms/python-jnius] rawhide: update to 1.7.0 fixes FTBFS rhbz#2392263 rhbz#2460555 Filipe Rosset

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