Script 'mail_helper' called by obssrc
Hello community,

here is the log from the commit of package YODA for openSUSE:Factory checked in 
at 2022-07-08 14:01:52
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/YODA (Old)
 and      /work/SRC/openSUSE:Factory/.YODA.new.1523 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Package is "YODA"

Fri Jul  8 14:01:52 2022 rev:23 rq:987454 version:1.9.5

Changes:
--------
--- /work/SRC/openSUSE:Factory/YODA/YODA.changes        2022-06-03 
14:17:14.829361769 +0200
+++ /work/SRC/openSUSE:Factory/.YODA.new.1523/YODA.changes      2022-07-08 
14:01:59.714452044 +0200
@@ -1,0 +2,7 @@
+Thu Jul  7 09:17:21 UTC 2022 - Christophe Giboudeaux <christo...@krop.fr>
+
+- Add patch to fix build with python 3.10:
+  * 0001-fix-cython-rebuild-after-configure.patch
+- Spec cleanup
+
+-------------------------------------------------------------------

New:
----
  0001-fix-cython-rebuild-after-configure.patch

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ YODA.spec ++++++
--- /var/tmp/diff_new_pack.auWsB2/_old  2022-07-08 14:02:00.174452537 +0200
+++ /var/tmp/diff_new_pack.auWsB2/_new  2022-07-08 14:02:00.178452541 +0200
@@ -18,20 +18,21 @@
 
 %define ver 1.9.5
 %define so_name lib%{name}-%(echo %{ver} | tr '.' '_')
-
 Name:           YODA
 Version:        %{ver}
 Release:        0
 Summary:        A small set of data analysis classes for MC event generator 
validation analyses
 License:        GPL-2.0-only
 Group:          Development/Libraries/C and C++
-URL:            http://yoda.hepforge.org/
+URL:            https://yoda.hepforge.org/
 Source:         http://www.hepforge.org/archive/yoda/%{name}-%{version}.tar.bz2
-Patch1:         sover.diff
+Patch0:         sover.diff
+# PATCH-FIX-UPSTREAM -- python 3.10 fix
+Patch1:         0001-fix-cython-rebuild-after-configure.patch
 BuildRequires:  bash-completion
 BuildRequires:  gcc-c++
 BuildRequires:  libtool
-BuildRequires:  pkg-config
+BuildRequires:  pkgconfig
 BuildRequires:  python3-Cython
 BuildRequires:  python3-devel
 BuildRequires:  python3-setuptools
@@ -40,7 +41,6 @@
 BuildRequires:  python3-numpy
 # /SECTION
 BuildRequires:  pkgconfig(zlib)
-BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 
 %description
 YODA is a small set of data analysis (specifically histogramming)
@@ -106,8 +106,7 @@
 This package provides the python binidings for %{name}.
 
 %prep
-%setup -q
-%patch -P 1 -p1
+%autosetup -p1
 
 # USE PYTHON3 FOR HASHBANGS
 sed -Ei "1{s|/usr/bin/python|/usr/bin/python3|}" bin/*
@@ -124,27 +123,25 @@
 export PYTHON_VERSION=%{py3_ver}
 autoreconf -fi
 %configure
-make %{?_smp_mflags}
+%make_build
 
 %install
 %make_install
 
 mkdir -p %{buildroot}%{_datadir}/bash-completion/completions
-mv %{buildroot}/etc/bash_completion.d/* 
%{buildroot}%{_datadir}/bash-completion/completions/
-find %{buildroot}%{_libdir}/ -name "*.la" -delete
+mv %{buildroot}%{_sysconfdir}/bash_completion.d/* 
%{buildroot}%{_datadir}/bash-completion/completions/
+find %{buildroot} -type f -name "*.la" -delete -print
 
 %check
-make %{?_smp_mflags} check
+%make_build check
 
 %post   -n %{so_name} -p /sbin/ldconfig
 %postun -n %{so_name} -p /sbin/ldconfig
 
 %files -n %{so_name}
-%defattr(-,root,root)
 %{_libdir}/libYODA-*.so
 
 %files devel
-%defattr(-,root,root)
 %doc AUTHORS ChangeLog
 %license COPYING
 %{_bindir}/yoda-config
@@ -153,7 +150,6 @@
 %{_includedir}/%{name}/
 
 %files -n python3-%{name}
-%defattr(-,root,root)
 %{python3_sitearch}/yoda/
 %{python3_sitearch}/yoda1/
 %{python3_sitearch}/yoda*.egg-info

++++++ 0001-fix-cython-rebuild-after-configure.patch ++++++
>From 9225f493bc45241f775f1a3f85eee5cd3d7cad2b Mon Sep 17 00:00:00 2001
From: "max.knobbe" <max.kno...@stud.uni-goettingen.de>
Date: Wed, 8 Jun 2022 22:15:30 +0200
Subject: [PATCH] fix cython rebuild after configure

---
 configure.ac | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/configure.ac b/configure.ac
index 3f31cc8..768efd6 100644
--- a/configure.ac
+++ b/configure.ac
@@ -137,7 +137,7 @@ if test x$enable_pyext == xyes; then
     if test x$CYTHON != x; then
         AC_MSG_NOTICE([Cython >= 0.24 found at $CYTHON: Python extension 
source can be rebuilt (for developers)])
         # Force rebuild since we have a sufficient Cython
-        test -f pyext/yoda/core.pyx && touch pyext/yoda/core.pyx
+        test -f pyext/yoda/core.pyx && touch pyext/yoda/*.pyx
     fi
   fi
 
-- 
2.36.1

Reply via email to