Rebuilt for Python 3.15.0b4 ABI change

Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>

.gitignore

@@ -1 +1,2 @@
-/zinnia-0.06.tar.gz
+zinnia-0.06.tar.gz
+/zinnia-0.07.tar.gz

requirements.txt

@@ -0,0 +1,2 @@
+pip
+setuptools

sources

@@ -1 +1 @@
-SHA512 (zinnia-0.06.tar.gz) = b9a44dc3664302269c4d8481225964a3188c1921f5af7f136fdccdc452917f6ff934884e266436a0f1e0a32af19d3bea5f5e4416e694a653983039a513277b53
+SHA512 (zinnia-0.07.tar.gz) = f214938953be093e37735a24dd5d2e899e02572202f9b316de566ddeb65451b2a13becb84f95c74f6e5ceadb83bbbcfea3434e974393cb569c65896249002280

zinnia-fixes-divide-by-zero.patch

@@ -0,0 +1,15 @@
+Index: zinnia-0.07/feature.cpp
+===================================================================
+--- zinnia-0.07.orig/feature.cpp
++++ zinnia-0.07/feature.cpp
+@@ -42,6 +42,10 @@ float minimum_distance(const Node *first
+ 
+   const float a = last->x - first->x;
+   const float b = last->y - first->y;
++
++  if (a * a + b * b == 0)
++    return 0.0;
++
+   const float c = static_cast<double>(last->y * first->x)
+     - static_cast<double>(last->x * first->y);
+ 

zinnia-fixes-python-setuptools.patch

@@ -0,0 +1,12 @@
+Index: zinnia-0.06/python/setup.py
+===================================================================
+--- zinnia-0.06.orig/python/setup.py
++++ zinnia-0.06/python/setup.py
+@@ -7,5 +7,7 @@ setup(name = "zinnia-python",
+       py_modules=["zinnia"],
+       ext_modules = [Extension("_zinnia",
+                                ["zinnia_wrap.cxx",],
++                               include_dirs=[".."],
++                               library_dirs=["../.libs"],
+                                libraries=["zinnia"])
+                      ])

zinnia.spec

@@ -1,19 +1,20 @@
 Name:		zinnia
-Version:	0.06
-Release:	51%{?dist}
+Version:	0.07
+Release:	13%{?dist}
 Summary:	Online handwriting recognition system with machine learning
 
-License:	BSD
-URL:		http://zinnia.sourceforge.net/
-Source0:	http://downloads.sourceforge.net/zinnia/%{name}-%{version}.tar.gz
-Source1:        http://zinnia.svn.sourceforge.net/viewvc/zinnia/zinnia/tomoe2s.pl
-Source2:        Makefile.tomoe
+License:	BSD-3-Clause
+URL:		https://github.com/silverhikari/zinnia
+Source0:	https://github.com/silverhikari/zinnia/releases/download/%{version}/%{name}-%{version}.tar.gz
+Source1:	https://raw.githubusercontent.com/silverhikari/%{name}/master/%{name}/tomoe2s.pl
+Source2:	Makefile.tomoe
+Source3:	requirements.txt
 Patch0:		zinnia-0.05-bindings.patch
-Patch1:		zinnia-0.06-fixes-ppc-float.patch
 Patch2:		always-store-data-in-little-endian-format.patch
-Patch3:		zinnia-fixes-gcc6-compile.patch
-BuildRequires: make
-BuildRequires:  gcc-c++
+Patch4:		zinnia-fixes-python-setuptools.patch
+Patch5:		zinnia-fixes-divide-by-zero.patch
+BuildRequires:	make
+BuildRequires:	gcc-c++
 BuildRequires:	libdb-devel, python3-devel
 BuildRequires:	swig
 BuildRequires:	perl-devel
@@ -21,6 +22,7 @@ BuildRequires:	perl-generators
 BuildRequires:	perl(ExtUtils::MakeMaker)
 BuildRequires:	tomoe
 BuildRequires:	autoconf
+BuildRequires:	gnome-common
 
 %description
 Zinnia provides a simple, customizable, and portable dynamic OCR
@@ -62,14 +64,12 @@ use %{name}.
 %package  	perl
 Summary:	Perl bindings for %name
 Requires:	%{name} = %{version}-%{release}
-Requires:	perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
 
 
 %description 	perl
 This package contains perl bindings for %{name}.
 
 %package 	-n python3-zinnia
-%{?python_provide:%python_provide python3-zinnia}
 Summary:	Python bindings for %{name}
 Requires:	%{name} = %{version}-%{release}
 
@@ -96,11 +96,11 @@ This package contains Simplified Chinese tomoe model files for %{name}.
 
 %prep
 %setup -q -n %{name}-%{version}
-%patch0 -p1 -b .bindings
-%patch1 -p1 -b .ppc
-%patch2 -p1 -R -b .little-endian
-%patch3 -p1 -b .gcc6
-find . -type f -name ChangeLog -size 0c -exec rm -f {} ';'
+%patch -P0 -p1 -b .bindings
+%patch -P2 -p1 -R -b .little-endian
+%patch -P4 -p1 -b .python
+%patch -P5 -p1 -b .divide-by-zero
+
 find . -type f -name "*.pyc" -exec rm -f {} ';'
 cp %{SOURCE1} .
 cp %{SOURCE2} .
@@ -114,11 +114,12 @@ pushd swig
 make python
 popd
 
+%generate_buildrequires
+%pyproject_buildrequires -N %{SOURCE3}
+
 %build
-autoconf
-%configure --disable-static
-sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool
-sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool
+gnome-autogen.sh
+%configure --disable-static --disable-rpath
 make CFLAGS="%{optflags}" CXXFLAGS="%{optflags}" %{?_smp_mflags}
 make -f Makefile.tomoe build
 
@@ -128,7 +129,7 @@ make %{?_smp_mflags}
 popd
 
 pushd python
-CFLAGS="$RPM_OPT_FLAGS -I../" LDFLAGS="$RPM_LD_FLAGS -L../.libs" python3 setup.py build
+%pyproject_wheel
 popd
 
 %install
@@ -136,15 +137,13 @@ rm -rf $RPM_BUILD_ROOT
 make install DESTDIR=$RPM_BUILD_ROOT
 make -f Makefile.tomoe install DESTDIR=$RPM_BUILD_ROOT
 
-#install -d -m 0755 -p $RPM_BUILD_ROOT%{_docdir}/%{name}
-#cp -pfr doc $RPM_BUILD_ROOT%{_docdir}/%{name}
-
 pushd perl
 make pure_install PERL_INSTALL_ROOT=$RPM_BUILD_ROOT
 popd
 
 pushd python
-python3 setup.py install --root $RPM_BUILD_ROOT
+%pyproject_install
+%pyproject_save_files '%{name}*' _%{name}
 pushd
 
 #remove something unnecessary
@@ -156,8 +155,9 @@ find $RPM_BUILD_ROOT -type f -name .packlist -exec rm -f {} ';'
 chmod 0755 $RPM_BUILD_ROOT%{perl_vendorarch}/auto/%{name}/%{name}.so
 
 
-
-%ldconfig_scriptlets
+%check
+export LD_LIBRARY_PATH=%{buildroot}/%{_libdir}
+%pyproject_check_import
 
 
 %files
@@ -182,10 +182,8 @@ chmod 0755 $RPM_BUILD_ROOT%{perl_vendorarch}/auto/%{name}/%{name}.so
 %{perl_vendorarch}/auto/%{name}/
 %{perl_vendorarch}/%{name}.pm
 
-%files	-n python3-zinnia
-%{python3_sitearch}/_%{name}.*.so
-%{python3_sitearch}/%{name}*
-%{python3_sitearch}/__pycache__/*
+%files	-n python3-zinnia -f %{pyproject_files}
+%exclude %{python3_sitearch}/zinnia_python-0.0.0.dist-info
 
 %files tomoe-ja
 %dir %{_datadir}/zinnia/model/tomoe/
@@ -196,6 +194,110 @@ chmod 0755 $RPM_BUILD_ROOT%{perl_vendorarch}/auto/%{name}/%{name}.so
 %{_datadir}/zinnia/model/tomoe/handwriting-zh_CN.model
 
 %changelog
+* Fri Jul 24 2026 Python Maint <python-maint@redhat.com> - 0.07-13
+- Rebuilt for Python 3.15.0b4 ABI change
+
+* Thu Jul 23 2026 Jitka Plesnikova <jplesnik@redhat.com> - 0.07-12
+- Perl 5.44 rebuild
+
+* Wed Jul 22 2026 Python Maint <python-maint@redhat.com> - 0.07-11
+- Rebuilt for Python 3.15.0b4 ABI change
+
+* Fri Jul 17 2026 Fedora Release Engineering <releng@fedoraproject.org> - 0.07-10
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_45_Mass_Rebuild
+
+* Wed Jun 03 2026 Python Maint <python-maint@redhat.com> - 0.07-9
+- Rebuilt for Python 3.15
+
+* Sat Jan 17 2026 Fedora Release Engineering <releng@fedoraproject.org> - 0.07-8
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild
+
+* Fri Sep 19 2025 Python Maint <python-maint@redhat.com> - 0.07-7
+- Rebuilt for Python 3.14.0rc3 bytecode
+
+* Fri Aug 15 2025 Python Maint <python-maint@redhat.com> - 0.07-6
+- Rebuilt for Python 3.14.0rc2 bytecode
+
+* Fri Jul 25 2025 Peng Wu  <pwu@redhat.com> - 0.07-4
+- Update for https://fedoraproject.org/wiki/Changes/DeprecateSetuppyMacros
+- Resolves: RHBZ#2378641
+
+* Fri Jul 25 2025 Fedora Release Engineering <releng@fedoraproject.org> - 0.07-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild
+
+* Mon Jul 07 2025 Jitka Plesnikova <jplesnik@redhat.com> - 0.07-3
+- Perl 5.42 rebuild
+
+* Mon Jun 02 2025 Python Maint <python-maint@redhat.com> - 0.07-2
+- Rebuilt for Python 3.14
+
+* Mon Apr 14 2025 Peng Wu <pwu@redhat.com> - 0.07-1
+- Update to 0.07
+
+* Sun Jan 19 2025 Fedora Release Engineering <releng@fedoraproject.org> - 0.06-72
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild
+
+* Wed Oct 30 2024 Peng Wu <pwu@redhat.com> - 0.06-71
+- Fix build
+- Resolves: RHBZ#2319752
+
+* Sat Jul 20 2024 Fedora Release Engineering <releng@fedoraproject.org> - 0.06-70
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild
+
+* Wed Jun 12 2024 Jitka Plesnikova <jplesnik@redhat.com> - 0.06-69
+- Perl 5.40 rebuild
+
+* Fri Jun 07 2024 Python Maint <python-maint@redhat.com> - 0.06-68
+- Rebuilt for Python 3.13
+
+* Sat Jan 27 2024 Fedora Release Engineering <releng@fedoraproject.org> - 0.06-67
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
+
+* Sat Jul 22 2023 Fedora Release Engineering <releng@fedoraproject.org> - 0.06-66
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
+
+* Tue Jul 11 2023 Jitka Plesnikova <jplesnik@redhat.com> - 0.06-65
+- Perl 5.38 rebuild
+
+* Wed Jun 14 2023 Python Maint <python-maint@redhat.com> - 0.06-64
+- Rebuilt for Python 3.12
+
+* Sat May  6 2023 Peng Wu <pwu@redhat.com> - 0.06-63
+- Migrate to SPDX license
+
+* Sat Jan 21 2023 Fedora Release Engineering <releng@fedoraproject.org> - 0.06-62
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
+
+* Mon Oct 24 2022 Peng Wu <pwu@redhat.com> - 0.06-61
+- Add BuildRequires python3-setuptools
+
+* Sat Jul 23 2022 Fedora Release Engineering <releng@fedoraproject.org> - 0.06-60
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
+
+* Mon Jun 13 2022 Python Maint <python-maint@redhat.com> - 0.06-59
+- Rebuilt for Python 3.11
+
+* Mon May 30 2022 Jitka Plesnikova <jplesnik@redhat.com> - 0.06-58
+- Perl 5.36 rebuild
+
+* Fri Feb 11 2022 Peng Wu <pwu@redhat.com> - 0.06-57
+- Fix RHBZ#2048104
+
+* Sat Jan 22 2022 Fedora Release Engineering <releng@fedoraproject.org> - 0.06-56
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
+
+* Fri Jul 23 2021 Fedora Release Engineering <releng@fedoraproject.org> - 0.06-55
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
+
+* Fri Jun 04 2021 Python Maint <python-maint@redhat.com> - 0.06-54
+- Rebuilt for Python 3.10
+
+* Fri Jun  4 2021 Peng Wu <pwu@redhat.com> - 0.06-53
+- Disable rpath
+
+* Fri May 21 2021 Jitka Plesnikova <jplesnik@redhat.com> - 0.06-52
+- Perl 5.34 rebuild
+
 * Thu Jan 28 2021 Fedora Release Engineering <releng@fedoraproject.org> - 0.06-51
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild