public inbox for git-commits@fedoraproject.org
help / color / mirror / Atom feed
To: git-commits@fedoraproject.org
Subject: [rpms/rrdtool] rawhide: Fixed FTBFS, python correctly conditionalized and uses wheel
Date: Mon, 01 Jun 2026 16:31:31 GMT [thread overview]
Message-ID: <178033149108.1.9632872685444476905.rpms-rrdtool-73c37eb7413f@fedoraproject.org> (raw)
A new commit has been pushed.
Repo : rpms/rrdtool
Branch : rawhide
Commit : 73c37eb7413fd15f9329884a91f4f32b5bbd1011
Author : Jaroslav Škarvada <jskarvad@redhat.com>
Date : 2026-06-01T18:30:04+02:00
Stats : +15/-18 in 1 file(s)
URL : https://src.fedoraproject.org/rpms/rrdtool/c/73c37eb7413fd15f9329884a91f4f32b5bbd1011?branch=rawhide
Log:
Fixed FTBFS, python correctly conditionalized and uses wheel
Signed-off-by: Jaroslav Škarvada <jskarvad@redhat.com>
---
diff --git a/rrdtool.spec b/rrdtool.spec
index bc6a155..c8401e6 100644
--- a/rrdtool.spec
+++ b/rrdtool.spec
@@ -180,10 +180,6 @@ The %{name}-lua package includes RRDtool bindings for Lua.
%endif
%patch -P4 -p1 -b .php-ppc-fix
-# Fix to find correct python dir on lib64
-perl -pi -e 's|get_python_lib\(0,0,prefix|get_python_lib\(1,0,prefix|g' \
- configure
-
# Most edits shouldn't be necessary when using --libdir, but
# w/o, some introduce hardcoded rpaths where they shouldn't
perl -pi.orig -e 's|/lib\b|/%{_lib}|g' \
@@ -198,9 +194,11 @@ perl -pi.orig -e 's|1.299907080300|1.29990708|' \
# workaround needed due to https://bugzilla.redhat.com/show_bug.cgi?id=211069
cp -p /usr/lib/rpm/redhat/config.{guess,sub} php4/
+%if %{with_python3}
cd bindings/python
%generate_buildrequires
%pyproject_buildrequires -N
+%endif
%build
./bootstrap
@@ -213,11 +211,6 @@ cd bindings/python
%else
--disable-tcl \
%endif
-%if %{with_python3}
- --enable-python \
-%else
- --disable-python \
-%endif
%if %{with_ruby}
--enable-ruby \
%else
@@ -229,7 +222,8 @@ cd bindings/python
--disable-libdbi \
%endif
--disable-static \
- --with-pic
+ --with-pic \
+ --disable-python
# Fix another rpath issue
perl -pi.orig -e 's|-Wl,--rpath -Wl,\$rp||g' \
@@ -257,12 +251,10 @@ popd
%{__make} install DESTDIR="%{rrdtmp}"
pushd php4/
-export PYTHON=%{__python3}
-
%configure \
--with-rrdtool="%{rrdtmp}%{_prefix}" \
--disable-static
-%{make_build} PYTHON="$PYTHON"
+%{make_build}
popd
rm -rf %{rrdtmp}
%endif
@@ -273,12 +265,14 @@ find examples/ -type f \
find examples/ -name "*.pl" \
-exec perl -pi -e 's|\015||gi' {} \;
+%if %{with_python3}
cd bindings/python
%pyproject_wheel
+%endif
%install
-export PYTHON=%{__python3}
-%{make_install} PYTHON="$PYTHON"
+export
+%{make_install}
# Install the php module
%if %{with_php}
@@ -324,9 +318,11 @@ rm -rf $RPM_BUILD_ROOT%{_docdir}/%{name}-* \
%find_lang %{name}
+%if %{with_python3}
cd bindings/python
%pyproject_install
-%pyproject_save_files %{name}
+%pyproject_save_files %{name} '%{name}*'
+%endif
%check
# minimal load test for the PHP extension
@@ -373,10 +369,10 @@ LD_LIBRARY_PATH=%{buildroot}%{_libdir} php -n \
%{perl_vendorarch}/*.pm
%attr(0755,root,root) %{perl_vendorarch}/auto/RRDs/
-
+%if %{with_python3}
%files -n python3-rrdtool -f %{pyproject_files}
%doc bindings/python/COPYING bindings/python/README.md
-%{python3_sitearch}/rrdtool*.so
+%endif
%if %{with_php}
%files php
@@ -408,6 +404,7 @@ LD_LIBRARY_PATH=%{buildroot}%{_libdir} php -n \
* Mon May 25 2026 Jaroslav Škarvada <jskarvad@redhat.com> - 1.10.3-1
- New version
Resolves: rhbz#2479949
+ Resolves: rhbz#2481409
* Tue May 19 2026 Jaroslav Škarvada <jskarvad@redhat.com> - 1.10.0-1
- New version
reply other threads:[~2026-06-01 16:31 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=178033149108.1.9632872685444476905.rpms-rrdtool-73c37eb7413f@fedoraproject.org \
--to=git-commits@fedoraproject.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox