From 661ea856c89909173741e0f8957d37c46469caec Mon Sep 17 00:00:00 2001 From: Liang Suilong Date: Thu, 11 Mar 2010 01:46:30 +0000 Subject: [PATCH 01/99] import Liang's update --- .cvsignore | 1 + import.log | 1 + sources | 1 + zinnia-0.05-bindings.patch | 36 ++++++++ zinnia.spec | 181 +++++++++++++++++++++++++++++++++++++ 5 files changed, 220 insertions(+) create mode 100644 import.log create mode 100644 zinnia-0.05-bindings.patch create mode 100644 zinnia.spec diff --git a/.cvsignore b/.cvsignore index e69de29..ed6d9ea 100644 --- a/.cvsignore +++ b/.cvsignore @@ -0,0 +1 @@ +zinnia-0.05.tar.gz diff --git a/import.log b/import.log new file mode 100644 index 0000000..5d63cc1 --- /dev/null +++ b/import.log @@ -0,0 +1 @@ +zinnia-0_05-4_fc12:HEAD:zinnia-0.05-4.fc12.src.rpm:1268271996 diff --git a/sources b/sources index e69de29..24db053 100644 --- a/sources +++ b/sources @@ -0,0 +1 @@ +78462a619ad63772683666e3eefc092e zinnia-0.05.tar.gz diff --git a/zinnia-0.05-bindings.patch b/zinnia-0.05-bindings.patch new file mode 100644 index 0000000..eb125ee --- /dev/null +++ b/zinnia-0.05-bindings.patch @@ -0,0 +1,36 @@ +diff -p -up zinnia-0.05/perl/Makefile.PL.bindings zinnia-0.05/perl/Makefile.PL +--- zinnia-0.05/perl/Makefile.PL.bindings 2008-09-13 18:59:36.000000000 +0200 ++++ zinnia-0.05/perl/Makefile.PL 2009-11-19 14:17:39.000000000 +0100 +@@ -3,8 +3,8 @@ WriteMakefile( + 'NAME' => 'zinnia', + 'CC' => 'c++', + 'LD' => 'c++', +- 'INC' => '', +- 'LIBS' => '-lzinnia', ++ 'INC' => '-I../', ++ 'LIBS' => '-L../.libs -lzinnia', + # 'VERSION' => '0.1', + 'OBJECT' => 'zinnia_wrap.o' + ); +diff -p -up zinnia-0.05/perl/zinnia_wrap.cxx.bindings zinnia-0.05/perl/zinnia_wrap.cxx +--- zinnia-0.05/perl/zinnia_wrap.cxx.bindings 2009-05-31 06:39:39.000000000 +0200 ++++ zinnia-0.05/perl/zinnia_wrap.cxx 2009-11-19 14:18:46.000000000 +0100 +@@ -11,6 +11,7 @@ + #define SWIGPERL + #define SWIG_CASTRANK_MODE + ++#include + + #ifdef __cplusplus + /* SwigValueWrapper is described in swig.swg */ +diff -p -up zinnia-0.05/python/zinnia_wrap.cxx.bindings zinnia-0.05/python/zinnia_wrap.cxx +--- zinnia-0.05/python/zinnia_wrap.cxx.bindings 2009-05-31 06:39:41.000000000 +0200 ++++ zinnia-0.05/python/zinnia_wrap.cxx 2009-11-19 14:19:10.000000000 +0100 +@@ -11,6 +11,7 @@ + #define SWIGPYTHON + #define SWIG_PYTHON_DIRECTOR_NO_VTABLE + ++#include + + #ifdef __cplusplus + /* SwigValueWrapper is described in swig.swg */ diff --git a/zinnia.spec b/zinnia.spec new file mode 100644 index 0000000..0e89919 --- /dev/null +++ b/zinnia.spec @@ -0,0 +1,181 @@ +%if ! (0%{?fedora} > 12 || 0%{?rhel} > 5) +%{!?python_sitelib: %global python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib())")} +%{!?python_sitearch: %global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib(1))")} +%endif + +Name: zinnia +Version: 0.05 +Release: 4%{?dist} +Summary: Online handwriting recognition system with machine learning + +Group: System Environment/Libraries +License: BSD +URL: http://zinnia.sourceforge.net/ +Source0: http://downloads.sourceforge.net/zinnia/%{name}-%{version}.tar.gz +Patch0: zinnia-0.05-bindings.patch +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) +BuildRequires: db4-devel, python2-devel +BuildRequires: perl(ExtUtils::MakeMaker) + +%description +Zinnia provides a simple, customizable, and portable dynamic OCR +system for hand-written input, based on Support Vector Machines. + +Zinnia simply receives user pen strokes as coordinate data and outputs +the best matching characters sorted by SVM confidence. To maintain +portability, it has no rendering functionality. In addition to +recognition, Zinnia provides a training module capable of creating +highly efficient handwriting recognition models. + +This package contains the shared libraries. + +%package devel +Summary: Development files for %{name} +Group: Development/Libraries +Requires: %{name} = %{version}-%{release} + +%description devel +The %{name}-devel package contains libraries and header files for +developing applications that use %{name}. + +%package utils +Summary: Utils for the zinnia library +Group: Applications/System +Requires: %{name} = %{version}-%{release} + +%description utils +The %{name}-utils package provides utilities for zinnia library that +use %{name}. + +%package doc +Summary: Documents for the zinnia library +Group: Development/Libraries +Requires: %{name} = %{version}-%{release} +BuildArch: noarch + +%description doc +The %{name}-doc package provide documents for zinnia library that +use %{name}. + +%package perl +Summary: Perl bindings for %name +Group: Development/Libraries +Requires: %{name} = %{version}-%{release} +Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) + + +%description perl +This package contains perl bindings for %{name}. + +%package python +Summary: Python bindings for %{name} +Group: Development/Libraries +Requires: %{name} = %{version}-%{release} + +%description python +This package contains python bindings for %{name}. + +%prep +%setup -q -n %{name}-%{version} +%patch0 -p1 -b .bindings +find . -type f -name ChangeLog -size 0c -exec rm -f {} ';' +find . -type f -name "*.pyc" -exec rm -f {} ';' +pushd doc +iconv -f latin1 -t utf8 zinnia.css > zinnia.css.bak +mv -f zinnia.css.bak zinnia.css +popd + +%build +%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 +make %{?_smp_mflags} + +pushd perl +perl Makefile.PL INSTALLDIRS=vendor OPTIMIZE="$RPM_OPT_FLAGS" +make %{?_smp_mflags} +popd + +pushd python +CFLAGS="$RPM_OPT_FLAGS -I../" LDFLAGS="-L../.libs" python setup.py build +popd + +%install +rm -rf $RPM_BUILD_ROOT +make 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 +python setup.py install --root $RPM_BUILD_ROOT +pushd + +#remove something unnecessary +find $RPM_BUILD_ROOT -type f -name "*.la" -exec rm -f {} ';' +find $RPM_BUILD_ROOT -type f -name "*.bs" -size 0c -exec rm -f {} ';' +find $RPM_BUILD_ROOT -type f -name .packlist -exec rm -f {} ';' + +#change the privilege of some files +chmod 0755 $RPM_BUILD_ROOT%{perl_vendorarch}/auto/%{name}/%{name}.so + + +%clean +rm -rf $RPM_BUILD_ROOT + + +%post -p /sbin/ldconfig + +%postun -p /sbin/ldconfig + + +%files +%defattr(-,root,root,-) +%doc README COPYING +%{_libdir}/*.so.* + +%files devel +%defattr(-,root,root,-) +%{_includedir}/* +%{_libdir}/lib%{name}.so + +%{_libdir}/pkgconfig/%{name}.pc + +%files utils +%defattr(-,root,root,-) +%{_bindir}/zinnia +%{_bindir}/zinnia_convert +%{_bindir}/zinnia_learn + +%files doc +%defattr(-,root,root,-) +%doc doc/* + + +%files perl +%defattr(-,root,root,-) +%{perl_vendorarch}/auto/%{name}/ +%{perl_vendorarch}/%{name}.pm + +%files python +%defattr(-,root,root,-) +%{python_sitearch}/_%{name}.so +%{python_sitearch}/%{name}* + + +%changelog +* Wed Mar 10 2010 Liang Suilong - 0.05-4 +- Fix the bugs of SPEC file + +* Fri Mar 04 2010 Liang Suilong - 0.05-3 +- Fix something wrong of spec file + +* Wed Mar 02 2010 Liang Suilong - 0.05-2 +- Rename Subpackage for perl and python + +* Tue Feb 02 2010 Liang Suilong - 0.05-1 +- Initial Package From 6a0c73452676df3c958debcd26e6a0e9059610d4 Mon Sep 17 00:00:00 2001 From: Peng Wu Date: Thu, 20 May 2010 08:22:30 +0000 Subject: [PATCH 02/99] - Auto generate zinnia tomoe model files, and includes all model files in zinnia-tomoe noarch sub-package. Thu May 20 2010 Peng Wu - 0.06-1 - Update to version 0.06. --- .cvsignore | 2 +- Makefile.tomoe | 20 ++++++++++++++++++++ sources | 2 +- tomoe2s.pl | 35 +++++++++++++++++++++++++++++++++++ zinnia.spec | 32 ++++++++++++++++++++++++++++++-- 5 files changed, 87 insertions(+), 4 deletions(-) create mode 100644 Makefile.tomoe create mode 100644 tomoe2s.pl diff --git a/.cvsignore b/.cvsignore index ed6d9ea..32f1f0e 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -zinnia-0.05.tar.gz +zinnia-0.06.tar.gz diff --git a/Makefile.tomoe b/Makefile.tomoe new file mode 100644 index 0000000..b5a9728 --- /dev/null +++ b/Makefile.tomoe @@ -0,0 +1,20 @@ +TOMOE_MODEL_PATH = /usr/share/tomoe/recognizer/ + +build: handwriting-ja.model handwriting-zh_CN.model tomoe2s.pl + +handwriting-ja.model: $(TOMOE_MODEL_PATH)/handwriting-ja.xml + perl tomoe2s.pl $(TOMOE_MODEL_PATH)/handwriting-ja.xml > handwriting-ja.s + LD_LIBRARY_PATH=.libs/ ./zinnia_learn handwriting-ja.s handwriting-ja.model + LD_LIBRARY_PATH=.libs/ ./zinnia_convert handwriting-ja.model.txt handwriting-ja.model + +handwriting-zh_CN.model: $(TOMOE_MODEL_PATH)/handwriting-zh_CN.xml + perl tomoe2s.pl $(TOMOE_MODEL_PATH)/handwriting-zh_CN.xml > handwriting-zh_CN.s + LD_LIBRARY_PATH=.libs/ ./zinnia_learn handwriting-zh_CN.s handwriting-zh_CN.model + LD_LIBRARY_PATH=.libs/ ./zinnia_convert handwriting-zh_CN.model.txt handwriting-zh_CN.model + + +install: build + install -d $(DESTDIR)/usr/share/zinnia//model/tomoe + install -m 0644 -p handwriting-ja.model handwriting-zh_CN.model $(DESTDIR)/usr/share/zinnia//model/tomoe + + diff --git a/sources b/sources index 24db053..971e994 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -78462a619ad63772683666e3eefc092e zinnia-0.05.tar.gz +5ed6213e2b879465783087a0cf6d5fa0 zinnia-0.06.tar.gz diff --git a/tomoe2s.pl b/tomoe2s.pl new file mode 100644 index 0000000..2400cc8 --- /dev/null +++ b/tomoe2s.pl @@ -0,0 +1,35 @@ +#!/usr/bin/perl + +use utf8; +my $value; +my $stroke; +my $strokes; + +while (<>) { + if (//) { + while (<>) { + if (/([^<]+)<\/utf8>/) { + $value = $1; + $value =~ s/^&#x//; + $value = pack("U", hex($value)); + utf8::encode($value); + $stroke = ""; + $strokes = ""; + } elsif (//) { + $strokes .= "($stroke)"; + $stroke = ""; + } elsif (/<\/character>/) { + if ($value !~ /[\(\)]/) { + print "(character (value $value)(width 1000)(height 1000)(strokes $strokes))\n"; + } + $value = ""; + last; + } + } + } +} diff --git a/zinnia.spec b/zinnia.spec index 0e89919..a77e038 100644 --- a/zinnia.spec +++ b/zinnia.spec @@ -4,18 +4,21 @@ %endif Name: zinnia -Version: 0.05 -Release: 4%{?dist} +Version: 0.06 +Release: 2%{?dist} Summary: Online handwriting recognition system with machine learning Group: System Environment/Libraries 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 Patch0: zinnia-0.05-bindings.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: db4-devel, python2-devel BuildRequires: perl(ExtUtils::MakeMaker) +BuildRequires: tomoe %description Zinnia provides a simple, customizable, and portable dynamic OCR @@ -75,11 +78,22 @@ Requires: %{name} = %{version}-%{release} %description python This package contains python bindings for %{name}. +%package tomoe +Summary: Tomoe model file for %{name} +Group: System Environment/Libraries +Requires: %{name} = %{version}-%{release} +BuildArch: noarch + +%description tomoe +This package contains tomoe model files for %{name}. + %prep %setup -q -n %{name}-%{version} %patch0 -p1 -b .bindings find . -type f -name ChangeLog -size 0c -exec rm -f {} ';' find . -type f -name "*.pyc" -exec rm -f {} ';' +cp %{SOURCE1} . +cp %{SOURCE2} . pushd doc iconv -f latin1 -t utf8 zinnia.css > zinnia.css.bak mv -f zinnia.css.bak zinnia.css @@ -90,6 +104,7 @@ popd 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 make %{?_smp_mflags} +make -f Makefile.tomoe build pushd perl perl Makefile.PL INSTALLDIRS=vendor OPTIMIZE="$RPM_OPT_FLAGS" @@ -103,6 +118,7 @@ popd %install 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} @@ -166,8 +182,20 @@ rm -rf $RPM_BUILD_ROOT %{python_sitearch}/_%{name}.so %{python_sitearch}/%{name}* +%files tomoe +%defattr(-,root,root,-) +%dir %{_datadir}/zinnia/model/tomoe/ +%{_datadir}/zinnia/model/tomoe/handwriting-ja.model +%{_datadir}/zinnia/model/tomoe/handwriting-zh_CN.model %changelog +* Thu May 20 2010 Peng Wu - 0.06-2 +- Auto generate zinnia tomoe model files, + and includes all model files in zinnia-tomoe noarch sub-package. + +* Thu May 20 2010 Peng Wu - 0.06-1 +- Update to version 0.06. + * Wed Mar 10 2010 Liang Suilong - 0.05-4 - Fix the bugs of SPEC file From 7fdb536ce2a2fc1cc4b89ae17c217a82177c591a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marcela=20Ma=C5=A1l=C3=A1=C5=88ov=C3=A1?= Date: Wed, 2 Jun 2010 09:53:21 +0000 Subject: [PATCH 03/99] - Mass rebuild with perl-5.12.0 --- zinnia.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/zinnia.spec b/zinnia.spec index a77e038..d024456 100644 --- a/zinnia.spec +++ b/zinnia.spec @@ -5,7 +5,7 @@ Name: zinnia Version: 0.06 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Online handwriting recognition system with machine learning Group: System Environment/Libraries @@ -189,6 +189,9 @@ rm -rf $RPM_BUILD_ROOT %{_datadir}/zinnia/model/tomoe/handwriting-zh_CN.model %changelog +* Wed Jun 02 2010 Marcela Maslanova - 0.06-3 +- Mass rebuild with perl-5.12.0 + * Thu May 20 2010 Peng Wu - 0.06-2 - Auto generate zinnia tomoe model files, and includes all model files in zinnia-tomoe noarch sub-package. From f5aa559ceae2b7ce2f92266fa3966ae02da97b82 Mon Sep 17 00:00:00 2001 From: Peng Wu Date: Fri, 4 Jun 2010 05:47:58 +0000 Subject: [PATCH 04/99] - Add a patch(zinnia-0.06-fixes-ppc-float.patch), to fixes ppc/ppc64 zinnia tomoe model generating error. --- zinnia-0.06-fixes-ppc-float.patch | 13 +++++++++++++ zinnia.spec | 8 +++++++- 2 files changed, 20 insertions(+), 1 deletion(-) create mode 100644 zinnia-0.06-fixes-ppc-float.patch diff --git a/zinnia-0.06-fixes-ppc-float.patch b/zinnia-0.06-fixes-ppc-float.patch new file mode 100644 index 0000000..5deb7fb --- /dev/null +++ b/zinnia-0.06-fixes-ppc-float.patch @@ -0,0 +1,13 @@ +Index: zinnia-0.06/feature.cpp +=================================================================== +--- zinnia-0.06.orig/feature.cpp ++++ zinnia-0.06/feature.cpp +@@ -42,7 +42,7 @@ float minimum_distance(const Node *first + + const float a = last->x - first->x; + const float b = last->y - first->y; +- const float c = last->y * first->x - last->x * first->y; ++ const float c = (double)last->y * first->x - (double)last->x * first->y; + + float max = -1.0; + for (const Node *n = first; n != last; ++n) { diff --git a/zinnia.spec b/zinnia.spec index d024456..0d4172d 100644 --- a/zinnia.spec +++ b/zinnia.spec @@ -5,7 +5,7 @@ Name: zinnia Version: 0.06 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Online handwriting recognition system with machine learning Group: System Environment/Libraries @@ -15,6 +15,7 @@ Source0: http://downloads.sourceforge.net/zinnia/%{name}-%{version}.tar.gz Source1: http://zinnia.svn.sourceforge.net/viewvc/zinnia/zinnia/tomoe2s.pl Source2: Makefile.tomoe Patch0: zinnia-0.05-bindings.patch +Patch1: zinnia-0.06-fixes-ppc-float.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: db4-devel, python2-devel BuildRequires: perl(ExtUtils::MakeMaker) @@ -90,6 +91,7 @@ This package contains tomoe model files for %{name}. %prep %setup -q -n %{name}-%{version} %patch0 -p1 -b .bindings +%patch1 -p1 -b .ppc find . -type f -name ChangeLog -size 0c -exec rm -f {} ';' find . -type f -name "*.pyc" -exec rm -f {} ';' cp %{SOURCE1} . @@ -189,6 +191,10 @@ rm -rf $RPM_BUILD_ROOT %{_datadir}/zinnia/model/tomoe/handwriting-zh_CN.model %changelog +* Fri Jun 04 2010 Peng Wu - 0.06-4 +- Add a patch(zinnia-0.06-fixes-ppc-float.patch), + to fixes ppc/ppc64 zinnia tomoe model generating error. + * Wed Jun 02 2010 Marcela Maslanova - 0.06-3 - Mass rebuild with perl-5.12.0 From 5ae7e82f13c81c0f6a846e7e427332720ee78f8f Mon Sep 17 00:00:00 2001 From: Liang Suilong Date: Tue, 8 Jun 2010 07:39:21 +0000 Subject: [PATCH 05/99] *** empty log message *** --- zinnia.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/zinnia.spec b/zinnia.spec index 0d4172d..aee00f6 100644 --- a/zinnia.spec +++ b/zinnia.spec @@ -5,7 +5,7 @@ Name: zinnia Version: 0.06 -Release: 4%{?dist} +Release: 5%{?dist} Summary: Online handwriting recognition system with machine learning Group: System Environment/Libraries @@ -105,7 +105,7 @@ popd %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 -make %{?_smp_mflags} +make CFLAGS="%{optflags}" CXXFLAGS="%{optflags}" %{?_smp_mflags} make -f Makefile.tomoe build pushd perl @@ -191,6 +191,9 @@ rm -rf $RPM_BUILD_ROOT %{_datadir}/zinnia/model/tomoe/handwriting-zh_CN.model %changelog +* Tue Jun 08 2010 Liang Suilong - 0.06-5 +- Force to use default compiling macro + * Fri Jun 04 2010 Peng Wu - 0.06-4 - Add a patch(zinnia-0.06-fixes-ppc-float.patch), to fixes ppc/ppc64 zinnia tomoe model generating error. From d5cf6030492ff9f4c3c207ad8c2c8a1b5f13ea24 Mon Sep 17 00:00:00 2001 From: Peng Wu Date: Fri, 16 Jul 2010 08:18:25 +0000 Subject: [PATCH 06/99] - revert patch always-store-data-in-little-endian-format.patch for ppc build. --- ...s-store-data-in-little-endian-format.patch | 163 ++++++++++++++++++ zinnia.spec | 7 +- 2 files changed, 169 insertions(+), 1 deletion(-) create mode 100644 always-store-data-in-little-endian-format.patch diff --git a/always-store-data-in-little-endian-format.patch b/always-store-data-in-little-endian-format.patch new file mode 100644 index 0000000..0005354 --- /dev/null +++ b/always-store-data-in-little-endian-format.patch @@ -0,0 +1,163 @@ +From 09f01b0afcb4408af2e1af0294425eac420cd7a5 Mon Sep 17 00:00:00 2001 +From: Peng Huang +Date: Fri, 23 Apr 2010 16:09:07 +0800 +Subject: [PATCH] Always store data in little endian format + +--- + configure.in | 5 +++++ + recognizer.cpp | 24 ++++++++++++++++++++++-- + trainer.cpp | 48 +++++++++++++++++++++++++++++++++++++----------- + 3 files changed, 64 insertions(+), 13 deletions(-) + +diff --git a/configure.in b/configure.in +index 2731d36..f25c83a 100644 +--- a/configure.in ++++ b/configure.in +@@ -14,6 +14,11 @@ AC_PROG_LIBTOOL + + dnl Checks for libraries. + ++dnl Checks endian ++AC_C_BIGENDIAN([], [ ++ AC_DEFINE(WORDS_LITENDIAN, 1, [Define if target is little endian]) ++]) ++ + dnl Checks for header files. + AC_HEADER_STDC + AC_CHECK_HEADERS(string.h stdlib.h unistd.h fcntl.h \ +diff --git a/recognizer.cpp b/recognizer.cpp +index b4d292a..b231607 100644 +--- a/recognizer.cpp ++++ b/recognizer.cpp +@@ -5,6 +5,9 @@ + // + // Copyright(C) 2008 Taku Kudo + // ++#ifdef HAVE_CONFIG_H ++# include "config.h" ++#endif + #include + #include + #include +@@ -23,11 +26,28 @@ static inline char *read_ptr(char **ptr, size_t size) { + return r; + } + +-template +-static inline void read_static(char **ptr, T *value) { ++template ++inline void read_static(char **ptr, T *value) { + char *r = read_ptr(ptr, sizeof(T)); + memcpy(value, r, sizeof(T)); + } ++ ++#ifndef WORDS_LITENDIAN ++template <> ++inline void read_static(char **ptr, unsigned int *value) { ++ unsigned char *buf = reinterpret_cast(*ptr); ++ *value = (buf[0]) | (buf[1] << 8) | (buf[2] << 16) | (buf[3] << 24); ++ *ptr += 4; ++} ++ ++template <> ++inline void read_static(char **ptr, float *value) { ++ unsigned int x; ++ read_static(ptr, &x); ++ memcpy(value, &x, sizeof(x)); ++} ++#endif ++ + } + + namespace zinnia { +diff --git a/trainer.cpp b/trainer.cpp +index 287a882..e150760 100644 +--- a/trainer.cpp ++++ b/trainer.cpp +@@ -243,6 +243,31 @@ bool Trainer::makeHeader(const char *text_filename, + return true; + } + ++template ++inline void write_static(std::ofstream & bofs, const T value) ++{ ++ bofs.write(reinterpret_cast(&value), sizeof(T)); ++} ++ ++#ifndef WORDS_LITENDIAN ++template<> ++inline void write_static(std::ofstream & bofs, const unsigned int value) ++{ ++ bofs.put ((value) & 0xff); ++ bofs.put ((value >> 8) & 0xff); ++ bofs.put ((value >> 16) & 0xff); ++ bofs.put ((value >> 24) & 0xff); ++} ++ ++template<> ++inline void write_static(std::ofstream & bofs, const float value) ++{ ++ unsigned int x; ++ memcpy(&x, &value, sizeof(x)); ++ write_static(bofs, x); ++} ++#endif ++ + bool Trainer::convert(const char *text_filename, + const char *binary_filename, + double compression_threshold) { +@@ -261,9 +286,9 @@ bool Trainer::convert(const char *text_filename, + unsigned int magic = 0; + const unsigned int version = DIC_VERSION; + unsigned int msize = 0; +- bofs.write(reinterpret_cast(&magic), sizeof(magic)); +- bofs.write(reinterpret_cast(&version), sizeof(version)); +- bofs.write(reinterpret_cast(&msize), sizeof(msize)); ++ write_static (bofs, magic); ++ write_static (bofs, version); ++ write_static (bofs, msize); + + std::string line; + const size_t array_size = 8192 * 16; +@@ -277,19 +302,19 @@ bool Trainer::convert(const char *text_filename, + char character[16]; + std::strncpy(character, col[0], sizeof(character)); + bofs.write(character, sizeof(character)); +- bofs.write(reinterpret_cast(&bias), sizeof(bias)); ++ write_static (bofs, bias); + for (size_t i = 2; i < size; i += 2) { + const int index = std::atoi(col[i]); + const float value = std::atof(col[i + 1]); + if (fabs(value) > compression_threshold) { +- bofs.write(reinterpret_cast(&index), sizeof(index)); +- bofs.write(reinterpret_cast(&value), sizeof(value)); ++ write_static (bofs, index); ++ write_static (bofs, value); + } + } + const int index = -1; + const float value = 0.0; +- bofs.write(reinterpret_cast(&index), sizeof(index)); +- bofs.write(reinterpret_cast(&value), sizeof(value)); ++ write_static (bofs, index); ++ write_static (bofs, value); + ++msize; + } + +@@ -297,9 +322,10 @@ bool Trainer::convert(const char *text_filename, + bofs.seekp(0); + magic ^= DIC_MAGIC_ID; + bofs.seekp(0); +- bofs.write(reinterpret_cast(&magic), sizeof(magic)); +- bofs.write(reinterpret_cast(&version), sizeof(version)); +- bofs.write(reinterpret_cast(&msize), sizeof(msize)); ++ ++ write_static (bofs, magic); ++ write_static (bofs, version); ++ write_static (bofs, msize); + + return true; + } +-- +1.7.0.1 + diff --git a/zinnia.spec b/zinnia.spec index aee00f6..384fc64 100644 --- a/zinnia.spec +++ b/zinnia.spec @@ -5,7 +5,7 @@ Name: zinnia Version: 0.06 -Release: 5%{?dist} +Release: 6%{?dist} Summary: Online handwriting recognition system with machine learning Group: System Environment/Libraries @@ -16,6 +16,7 @@ Source1: http://zinnia.svn.sourceforge.net/viewvc/zinnia/zinnia/tomoe2s.p Source2: Makefile.tomoe Patch0: zinnia-0.05-bindings.patch Patch1: zinnia-0.06-fixes-ppc-float.patch +Patch2: always-store-data-in-little-endian-format.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: db4-devel, python2-devel BuildRequires: perl(ExtUtils::MakeMaker) @@ -92,6 +93,7 @@ This package contains tomoe model files for %{name}. %setup -q -n %{name}-%{version} %patch0 -p1 -b .bindings %patch1 -p1 -b .ppc +%patch2 -p1 -R -b .little-endian find . -type f -name ChangeLog -size 0c -exec rm -f {} ';' find . -type f -name "*.pyc" -exec rm -f {} ';' cp %{SOURCE1} . @@ -191,6 +193,9 @@ rm -rf $RPM_BUILD_ROOT %{_datadir}/zinnia/model/tomoe/handwriting-zh_CN.model %changelog +* Fri Jul 16 2010 Peng Wu - 0.06-6 +- revert patch always-store-data-in-little-endian-format.patch for ppc build. + * Tue Jun 08 2010 Liang Suilong - 0.06-5 - Force to use default compiling macro From 9b466b729373cc895ab1cc42d5da9ab6e959c851 Mon Sep 17 00:00:00 2001 From: dmalcolm Date: Thu, 22 Jul 2010 07:24:45 +0000 Subject: [PATCH 07/99] - Rebuilt for https://fedoraproject.org/wiki/Features/Python_2.7/MassRebuild --- zinnia.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/zinnia.spec b/zinnia.spec index 384fc64..6fd5f89 100644 --- a/zinnia.spec +++ b/zinnia.spec @@ -5,7 +5,7 @@ Name: zinnia Version: 0.06 -Release: 6%{?dist} +Release: 7%{?dist} Summary: Online handwriting recognition system with machine learning Group: System Environment/Libraries @@ -193,6 +193,9 @@ rm -rf $RPM_BUILD_ROOT %{_datadir}/zinnia/model/tomoe/handwriting-zh_CN.model %changelog +* Thu Jul 22 2010 David Malcolm - 0.06-7 +- Rebuilt for https://fedoraproject.org/wiki/Features/Python_2.7/MassRebuild + * Fri Jul 16 2010 Peng Wu - 0.06-6 - revert patch always-store-data-in-little-endian-format.patch for ppc build. From e7dc0e86edcd3bac06bea1f9a1ca0a2a11abf119 Mon Sep 17 00:00:00 2001 From: Peng Wu Date: Mon, 26 Jul 2010 08:18:25 +0000 Subject: [PATCH 08/99] - Remove noarch from zinnia-tomoe sub-package for Fedora 12 ppc build. --- zinnia.spec | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/zinnia.spec b/zinnia.spec index 6fd5f89..204f4a8 100644 --- a/zinnia.spec +++ b/zinnia.spec @@ -5,7 +5,7 @@ Name: zinnia Version: 0.06 -Release: 7%{?dist} +Release: 8%{?dist} Summary: Online handwriting recognition system with machine learning Group: System Environment/Libraries @@ -84,7 +84,6 @@ This package contains python bindings for %{name}. Summary: Tomoe model file for %{name} Group: System Environment/Libraries Requires: %{name} = %{version}-%{release} -BuildArch: noarch %description tomoe This package contains tomoe model files for %{name}. @@ -193,6 +192,9 @@ rm -rf $RPM_BUILD_ROOT %{_datadir}/zinnia/model/tomoe/handwriting-zh_CN.model %changelog +* Mon Jul 26 2010 Peng Wu - 0.06-8 +- Remove noarch from zinnia-tomoe sub-package for Fedora 12 ppc build. + * Thu Jul 22 2010 David Malcolm - 0.06-7 - Rebuilt for https://fedoraproject.org/wiki/Features/Python_2.7/MassRebuild From d25cf3d2c62c1e49d6513e55d4aeddfe8a48a852 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 29 Jul 2010 16:31:14 +0000 Subject: [PATCH 09/99] dist-git conversion --- .cvsignore => .gitignore | 0 Makefile | 21 --------------------- import.log | 1 - 3 files changed, 22 deletions(-) rename .cvsignore => .gitignore (100%) delete mode 100644 Makefile delete mode 100644 import.log diff --git a/.cvsignore b/.gitignore similarity index 100% rename from .cvsignore rename to .gitignore diff --git a/Makefile b/Makefile deleted file mode 100644 index 3b2b012..0000000 --- a/Makefile +++ /dev/null @@ -1,21 +0,0 @@ -# Makefile for source rpm: zinnia -# $Id$ -NAME := zinnia -SPECFILE = $(firstword $(wildcard *.spec)) - -define find-makefile-common -for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done -endef - -MAKEFILE_COMMON := $(shell $(find-makefile-common)) - -ifeq ($(MAKEFILE_COMMON),) -# attept a checkout -define checkout-makefile-common -test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2 -endef - -MAKEFILE_COMMON := $(shell $(checkout-makefile-common)) -endif - -include $(MAKEFILE_COMMON) diff --git a/import.log b/import.log deleted file mode 100644 index 5d63cc1..0000000 --- a/import.log +++ /dev/null @@ -1 +0,0 @@ -zinnia-0_05-4_fc12:HEAD:zinnia-0.05-4.fc12.src.rpm:1268271996 From 11c102c321759d0c785796076370d35b37cdbefd Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Tue, 8 Feb 2011 03:03:36 -0600 Subject: [PATCH 10/99] - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild --- zinnia.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/zinnia.spec b/zinnia.spec index 204f4a8..95b6da1 100644 --- a/zinnia.spec +++ b/zinnia.spec @@ -5,7 +5,7 @@ Name: zinnia Version: 0.06 -Release: 8%{?dist} +Release: 9%{?dist} Summary: Online handwriting recognition system with machine learning Group: System Environment/Libraries @@ -192,6 +192,9 @@ rm -rf $RPM_BUILD_ROOT %{_datadir}/zinnia/model/tomoe/handwriting-zh_CN.model %changelog +* Tue Feb 08 2011 Fedora Release Engineering - 0.06-9 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild + * Mon Jul 26 2010 Peng Wu - 0.06-8 - Remove noarch from zinnia-tomoe sub-package for Fedora 12 ppc build. From dee0ea73160baed85623a80a08c9d853140bc386 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marcela=20Ma=C5=A1l=C3=A1=C5=88ov=C3=A1?= Date: Fri, 17 Jun 2011 18:08:43 +0200 Subject: [PATCH 11/99] Perl mass rebuild --- zinnia.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/zinnia.spec b/zinnia.spec index 95b6da1..280a969 100644 --- a/zinnia.spec +++ b/zinnia.spec @@ -5,7 +5,7 @@ Name: zinnia Version: 0.06 -Release: 9%{?dist} +Release: 10%{?dist} Summary: Online handwriting recognition system with machine learning Group: System Environment/Libraries @@ -192,6 +192,9 @@ rm -rf $RPM_BUILD_ROOT %{_datadir}/zinnia/model/tomoe/handwriting-zh_CN.model %changelog +* Fri Jun 17 2011 Marcela Mašláňová - 0.06-10 +- Perl mass rebuild + * Tue Feb 08 2011 Fedora Release Engineering - 0.06-9 - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild From ebb0ab84b838faadfff7c4faecf4c5573bfd7597 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Sat, 14 Jan 2012 03:37:40 -0600 Subject: [PATCH 12/99] - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild --- zinnia.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/zinnia.spec b/zinnia.spec index 280a969..b5ed9df 100644 --- a/zinnia.spec +++ b/zinnia.spec @@ -5,7 +5,7 @@ Name: zinnia Version: 0.06 -Release: 10%{?dist} +Release: 11%{?dist} Summary: Online handwriting recognition system with machine learning Group: System Environment/Libraries @@ -192,6 +192,9 @@ rm -rf $RPM_BUILD_ROOT %{_datadir}/zinnia/model/tomoe/handwriting-zh_CN.model %changelog +* Sat Jan 14 2012 Fedora Release Engineering - 0.06-11 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild + * Fri Jun 17 2011 Marcela Mašláňová - 0.06-10 - Perl mass rebuild From ffd70453e474858c088d8573096d87e1cc2fc5ef Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Tue, 28 Feb 2012 14:42:40 -0600 Subject: [PATCH 13/99] - Rebuilt for c++ ABI breakage --- zinnia.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/zinnia.spec b/zinnia.spec index b5ed9df..4f53d93 100644 --- a/zinnia.spec +++ b/zinnia.spec @@ -5,7 +5,7 @@ Name: zinnia Version: 0.06 -Release: 11%{?dist} +Release: 12%{?dist} Summary: Online handwriting recognition system with machine learning Group: System Environment/Libraries @@ -192,6 +192,9 @@ rm -rf $RPM_BUILD_ROOT %{_datadir}/zinnia/model/tomoe/handwriting-zh_CN.model %changelog +* Tue Feb 28 2012 Fedora Release Engineering - 0.06-12 +- Rebuilt for c++ ABI breakage + * Sat Jan 14 2012 Fedora Release Engineering - 0.06-11 - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild From 2b51e113ad8b35093227f604c77f8f4014617047 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Petr=20P=C3=ADsa=C5=99?= Date: Mon, 11 Jun 2012 15:14:42 +0200 Subject: [PATCH 14/99] Perl 5.16 rebuild --- zinnia.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/zinnia.spec b/zinnia.spec index 4f53d93..ddeff3d 100644 --- a/zinnia.spec +++ b/zinnia.spec @@ -5,7 +5,7 @@ Name: zinnia Version: 0.06 -Release: 12%{?dist} +Release: 13%{?dist} Summary: Online handwriting recognition system with machine learning Group: System Environment/Libraries @@ -192,6 +192,9 @@ rm -rf $RPM_BUILD_ROOT %{_datadir}/zinnia/model/tomoe/handwriting-zh_CN.model %changelog +* Mon Jun 11 2012 Petr Pisar - 0.06-13 +- Perl 5.16 rebuild + * Tue Feb 28 2012 Fedora Release Engineering - 0.06-12 - Rebuilt for c++ ABI breakage From 322e904a57b9215b5f6f416542c785c5b2e1968b Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Sun, 22 Jul 2012 03:21:34 -0500 Subject: [PATCH 15/99] - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild --- zinnia.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/zinnia.spec b/zinnia.spec index ddeff3d..2c7d468 100644 --- a/zinnia.spec +++ b/zinnia.spec @@ -5,7 +5,7 @@ Name: zinnia Version: 0.06 -Release: 13%{?dist} +Release: 14%{?dist} Summary: Online handwriting recognition system with machine learning Group: System Environment/Libraries @@ -192,6 +192,9 @@ rm -rf $RPM_BUILD_ROOT %{_datadir}/zinnia/model/tomoe/handwriting-zh_CN.model %changelog +* Sun Jul 22 2012 Fedora Release Engineering - 0.06-14 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild + * Mon Jun 11 2012 Petr Pisar - 0.06-13 - Perl 5.16 rebuild From cd8ac4940788ca895ce8c6bac075b31ade86517b Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Thu, 14 Feb 2013 22:21:18 -0600 Subject: [PATCH 16/99] - Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild --- zinnia.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/zinnia.spec b/zinnia.spec index 2c7d468..3c9bf83 100644 --- a/zinnia.spec +++ b/zinnia.spec @@ -5,7 +5,7 @@ Name: zinnia Version: 0.06 -Release: 14%{?dist} +Release: 15%{?dist} Summary: Online handwriting recognition system with machine learning Group: System Environment/Libraries @@ -192,6 +192,9 @@ rm -rf $RPM_BUILD_ROOT %{_datadir}/zinnia/model/tomoe/handwriting-zh_CN.model %changelog +* Fri Feb 15 2013 Fedora Release Engineering - 0.06-15 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild + * Sun Jul 22 2012 Fedora Release Engineering - 0.06-14 - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild From e767592e87968ea1b6c161e6ae34931158ee685a Mon Sep 17 00:00:00 2001 From: Peng Wu Date: Tue, 26 Mar 2013 12:29:33 +0800 Subject: [PATCH 17/99] Fixes aarch64 build --- zinnia.spec | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/zinnia.spec b/zinnia.spec index 3c9bf83..c5b833b 100644 --- a/zinnia.spec +++ b/zinnia.spec @@ -5,7 +5,7 @@ Name: zinnia Version: 0.06 -Release: 15%{?dist} +Release: 16%{?dist} Summary: Online handwriting recognition system with machine learning Group: System Environment/Libraries @@ -18,9 +18,10 @@ Patch0: zinnia-0.05-bindings.patch Patch1: zinnia-0.06-fixes-ppc-float.patch Patch2: always-store-data-in-little-endian-format.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -BuildRequires: db4-devel, python2-devel +BuildRequires: libdb-devel, python2-devel BuildRequires: perl(ExtUtils::MakeMaker) -BuildRequires: tomoe +BuildRequires: tomoe +BuildRequires: autoconf %description Zinnia provides a simple, customizable, and portable dynamic OCR @@ -103,6 +104,7 @@ mv -f zinnia.css.bak zinnia.css popd %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 @@ -192,6 +194,9 @@ rm -rf $RPM_BUILD_ROOT %{_datadir}/zinnia/model/tomoe/handwriting-zh_CN.model %changelog +* Tue Mar 26 2013 Peng Wu - 0.06-16 +- Fixes aarch64 build + * Fri Feb 15 2013 Fedora Release Engineering - 0.06-15 - Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild From 44bd9ade7ad88453809dce40d970507893ff9589 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Petr=20P=C3=ADsa=C5=99?= Date: Thu, 18 Jul 2013 02:35:03 +0200 Subject: [PATCH 18/99] Perl 5.18 rebuild --- zinnia.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/zinnia.spec b/zinnia.spec index c5b833b..fd06673 100644 --- a/zinnia.spec +++ b/zinnia.spec @@ -5,7 +5,7 @@ Name: zinnia Version: 0.06 -Release: 16%{?dist} +Release: 17%{?dist} Summary: Online handwriting recognition system with machine learning Group: System Environment/Libraries @@ -194,6 +194,9 @@ rm -rf $RPM_BUILD_ROOT %{_datadir}/zinnia/model/tomoe/handwriting-zh_CN.model %changelog +* Thu Jul 18 2013 Petr Pisar - 0.06-17 +- Perl 5.18 rebuild + * Tue Mar 26 2013 Peng Wu - 0.06-16 - Fixes aarch64 build From fbbbdf40f761e0fd727210220c0acf6621ba9fab Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Sun, 4 Aug 2013 04:54:02 -0500 Subject: [PATCH 19/99] - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild --- zinnia.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/zinnia.spec b/zinnia.spec index fd06673..d691535 100644 --- a/zinnia.spec +++ b/zinnia.spec @@ -5,7 +5,7 @@ Name: zinnia Version: 0.06 -Release: 17%{?dist} +Release: 18%{?dist} Summary: Online handwriting recognition system with machine learning Group: System Environment/Libraries @@ -194,6 +194,9 @@ rm -rf $RPM_BUILD_ROOT %{_datadir}/zinnia/model/tomoe/handwriting-zh_CN.model %changelog +* Sun Aug 04 2013 Fedora Release Engineering - 0.06-18 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild + * Thu Jul 18 2013 Petr Pisar - 0.06-17 - Perl 5.18 rebuild From d78364d25bea5bd796d8e1108f698e20e991d37c Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Sat, 7 Jun 2014 13:11:15 -0500 Subject: [PATCH 20/99] - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild --- zinnia.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/zinnia.spec b/zinnia.spec index d691535..cd633fe 100644 --- a/zinnia.spec +++ b/zinnia.spec @@ -5,7 +5,7 @@ Name: zinnia Version: 0.06 -Release: 18%{?dist} +Release: 19%{?dist} Summary: Online handwriting recognition system with machine learning Group: System Environment/Libraries @@ -194,6 +194,9 @@ rm -rf $RPM_BUILD_ROOT %{_datadir}/zinnia/model/tomoe/handwriting-zh_CN.model %changelog +* Sat Jun 07 2014 Fedora Release Engineering - 0.06-19 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild + * Sun Aug 04 2013 Fedora Release Engineering - 0.06-18 - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild From d2cd6dedfd6c43fe39f6eb1517efceb24202e521 Mon Sep 17 00:00:00 2001 From: Peng Wu Date: Wed, 30 Jul 2014 10:34:37 +0800 Subject: [PATCH 21/99] Split zinnia-tomoe sub-package for ibus-handwrite --- zinnia.spec | 27 +++++++++++++++++++++------ 1 file changed, 21 insertions(+), 6 deletions(-) diff --git a/zinnia.spec b/zinnia.spec index cd633fe..6b31b2f 100644 --- a/zinnia.spec +++ b/zinnia.spec @@ -5,7 +5,7 @@ Name: zinnia Version: 0.06 -Release: 19%{?dist} +Release: 20%{?dist} Summary: Online handwriting recognition system with machine learning Group: System Environment/Libraries @@ -81,13 +81,21 @@ Requires: %{name} = %{version}-%{release} %description python This package contains python bindings for %{name}. -%package tomoe -Summary: Tomoe model file for %{name} +%package tomoe-ja +Summary: Japanese tomoe model file for %{name} Group: System Environment/Libraries Requires: %{name} = %{version}-%{release} -%description tomoe -This package contains tomoe model files for %{name}. +%description tomoe-ja +This package contains Japanese tomoe model files for %{name}. + +%package tomoe-zh_CN +Summary: Simplified Chinese tomoe model file for %{name} +Group: System Environment/Libraries +Requires: %{name} = %{version}-%{release} + +%description tomoe-zh_CN +This package contains Simplified Chinese tomoe model files for %{name}. %prep %setup -q -n %{name}-%{version} @@ -187,13 +195,20 @@ rm -rf $RPM_BUILD_ROOT %{python_sitearch}/_%{name}.so %{python_sitearch}/%{name}* -%files tomoe +%files tomoe-ja %defattr(-,root,root,-) %dir %{_datadir}/zinnia/model/tomoe/ %{_datadir}/zinnia/model/tomoe/handwriting-ja.model + +%files tomoe-zh_CN +%defattr(-,root,root,-) +%dir %{_datadir}/zinnia/model/tomoe/ %{_datadir}/zinnia/model/tomoe/handwriting-zh_CN.model %changelog +* Tue Jul 29 2014 Peng Wu - 0.06-20 +- Split zinnia-tomoe sub-package for ibus-handwrite + * Sat Jun 07 2014 Fedora Release Engineering - 0.06-19 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild From 17525d5a5c38dc6330219183da25df945d7bc2e5 Mon Sep 17 00:00:00 2001 From: Peter Robinson Date: Mon, 18 Aug 2014 11:40:50 +0000 Subject: [PATCH 22/99] - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild --- zinnia.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/zinnia.spec b/zinnia.spec index 6b31b2f..52e170f 100644 --- a/zinnia.spec +++ b/zinnia.spec @@ -5,7 +5,7 @@ Name: zinnia Version: 0.06 -Release: 20%{?dist} +Release: 21%{?dist} Summary: Online handwriting recognition system with machine learning Group: System Environment/Libraries @@ -206,6 +206,9 @@ rm -rf $RPM_BUILD_ROOT %{_datadir}/zinnia/model/tomoe/handwriting-zh_CN.model %changelog +* Mon Aug 18 2014 Fedora Release Engineering - 0.06-21 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild + * Tue Jul 29 2014 Peng Wu - 0.06-20 - Split zinnia-tomoe sub-package for ibus-handwrite From b8dd455ff09ed6563170262367c3435f8ce6da28 Mon Sep 17 00:00:00 2001 From: Jitka Plesnikova Date: Wed, 27 Aug 2014 13:38:48 +0200 Subject: [PATCH 23/99] Perl 5.20 rebuild --- zinnia.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/zinnia.spec b/zinnia.spec index 52e170f..0630659 100644 --- a/zinnia.spec +++ b/zinnia.spec @@ -5,7 +5,7 @@ Name: zinnia Version: 0.06 -Release: 21%{?dist} +Release: 22%{?dist} Summary: Online handwriting recognition system with machine learning Group: System Environment/Libraries @@ -206,6 +206,9 @@ rm -rf $RPM_BUILD_ROOT %{_datadir}/zinnia/model/tomoe/handwriting-zh_CN.model %changelog +* Wed Aug 27 2014 Jitka Plesnikova - 0.06-22 +- Perl 5.20 rebuild + * Mon Aug 18 2014 Fedora Release Engineering - 0.06-21 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild From af3840ced43c1c0c9e956d71d85b3182e1b2e318 Mon Sep 17 00:00:00 2001 From: Peng Wu Date: Thu, 11 Dec 2014 13:16:31 +0800 Subject: [PATCH 24/99] Fixes renaming issues --- zinnia.spec | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/zinnia.spec b/zinnia.spec index 0630659..eb02679 100644 --- a/zinnia.spec +++ b/zinnia.spec @@ -5,7 +5,7 @@ Name: zinnia Version: 0.06 -Release: 22%{?dist} +Release: 23%{?dist} Summary: Online handwriting recognition system with machine learning Group: System Environment/Libraries @@ -85,6 +85,8 @@ This package contains python bindings for %{name}. Summary: Japanese tomoe model file for %{name} Group: System Environment/Libraries Requires: %{name} = %{version}-%{release} +Provides: zinnia-tomoe = %{version}-%{release} +Obsoletes: zinnia-tomoe < 0.06-19 %description tomoe-ja This package contains Japanese tomoe model files for %{name}. @@ -93,6 +95,8 @@ This package contains Japanese tomoe model files for %{name}. Summary: Simplified Chinese tomoe model file for %{name} Group: System Environment/Libraries Requires: %{name} = %{version}-%{release} +Provides: zinnia-tomoe = %{version}-%{release} +Obsoletes: zinnia-tomoe < 0.06-19 %description tomoe-zh_CN This package contains Simplified Chinese tomoe model files for %{name}. @@ -206,6 +210,9 @@ rm -rf $RPM_BUILD_ROOT %{_datadir}/zinnia/model/tomoe/handwriting-zh_CN.model %changelog +* Thu Dec 11 2014 Peng Wu - 0.06-23 +- Fixes renaming issues + * Wed Aug 27 2014 Jitka Plesnikova - 0.06-22 - Perl 5.20 rebuild From 9045656b979eaca5ea2e8980334e13c0598674ff Mon Sep 17 00:00:00 2001 From: Peng Wu Date: Thu, 11 Dec 2014 13:20:40 +0800 Subject: [PATCH 25/99] Fixes a typo --- zinnia.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/zinnia.spec b/zinnia.spec index eb02679..3a1c857 100644 --- a/zinnia.spec +++ b/zinnia.spec @@ -211,7 +211,7 @@ rm -rf $RPM_BUILD_ROOT %changelog * Thu Dec 11 2014 Peng Wu - 0.06-23 -- Fixes renaming issues +- Fixes split issues * Wed Aug 27 2014 Jitka Plesnikova - 0.06-22 - Perl 5.20 rebuild From c4c0985194104d67655a5e57ca74b06c8e7ae6f3 Mon Sep 17 00:00:00 2001 From: Kalev Lember Date: Sat, 2 May 2015 18:53:39 +0200 Subject: [PATCH 26/99] Rebuilt for GCC 5 C++11 ABI change --- zinnia.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/zinnia.spec b/zinnia.spec index 3a1c857..2383616 100644 --- a/zinnia.spec +++ b/zinnia.spec @@ -5,7 +5,7 @@ Name: zinnia Version: 0.06 -Release: 23%{?dist} +Release: 24%{?dist} Summary: Online handwriting recognition system with machine learning Group: System Environment/Libraries @@ -210,6 +210,9 @@ rm -rf $RPM_BUILD_ROOT %{_datadir}/zinnia/model/tomoe/handwriting-zh_CN.model %changelog +* Sat May 02 2015 Kalev Lember - 0.06-24 +- Rebuilt for GCC 5 C++11 ABI change + * Thu Dec 11 2014 Peng Wu - 0.06-23 - Fixes split issues From 95802ca20f0b678e588a736c7710e4f86c0c098c Mon Sep 17 00:00:00 2001 From: Jitka Plesnikova Date: Wed, 3 Jun 2015 18:15:39 +0200 Subject: [PATCH 27/99] Perl 5.22 rebuild --- zinnia.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/zinnia.spec b/zinnia.spec index 2383616..8640b96 100644 --- a/zinnia.spec +++ b/zinnia.spec @@ -5,7 +5,7 @@ Name: zinnia Version: 0.06 -Release: 24%{?dist} +Release: 25%{?dist} Summary: Online handwriting recognition system with machine learning Group: System Environment/Libraries @@ -210,6 +210,9 @@ rm -rf $RPM_BUILD_ROOT %{_datadir}/zinnia/model/tomoe/handwriting-zh_CN.model %changelog +* Wed Jun 03 2015 Jitka Plesnikova - 0.06-25 +- Perl 5.22 rebuild + * Sat May 02 2015 Kalev Lember - 0.06-24 - Rebuilt for GCC 5 C++11 ABI change From 4e8edd9237ebb699e342a163815c957bd500191b Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Fri, 19 Jun 2015 04:47:43 +0000 Subject: [PATCH 28/99] - Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild --- zinnia.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/zinnia.spec b/zinnia.spec index 8640b96..dabffbb 100644 --- a/zinnia.spec +++ b/zinnia.spec @@ -5,7 +5,7 @@ Name: zinnia Version: 0.06 -Release: 25%{?dist} +Release: 26%{?dist} Summary: Online handwriting recognition system with machine learning Group: System Environment/Libraries @@ -210,6 +210,9 @@ rm -rf $RPM_BUILD_ROOT %{_datadir}/zinnia/model/tomoe/handwriting-zh_CN.model %changelog +* Fri Jun 19 2015 Fedora Release Engineering - 0.06-26 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild + * Wed Jun 03 2015 Jitka Plesnikova - 0.06-25 - Perl 5.22 rebuild From 84cc27428709c5d3b44331e3ee35188261675f21 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 5 Feb 2016 04:06:49 +0000 Subject: [PATCH 29/99] - Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild --- zinnia.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/zinnia.spec b/zinnia.spec index dabffbb..de72f0e 100644 --- a/zinnia.spec +++ b/zinnia.spec @@ -5,7 +5,7 @@ Name: zinnia Version: 0.06 -Release: 26%{?dist} +Release: 27%{?dist} Summary: Online handwriting recognition system with machine learning Group: System Environment/Libraries @@ -210,6 +210,9 @@ rm -rf $RPM_BUILD_ROOT %{_datadir}/zinnia/model/tomoe/handwriting-zh_CN.model %changelog +* Fri Feb 05 2016 Fedora Release Engineering - 0.06-27 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild + * Fri Jun 19 2015 Fedora Release Engineering - 0.06-26 - Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild From acea733c0b1f3cc162c5a2fe7c51edc2d0629a1d Mon Sep 17 00:00:00 2001 From: Peng Wu Date: Wed, 17 Feb 2016 12:25:30 +0800 Subject: [PATCH 30/99] Fixes compile with gcc 6.0 --- zinnia-fixes-gcc6-compile.patch | 22 ++++++++++++++++++++++ zinnia.spec | 7 ++++++- 2 files changed, 28 insertions(+), 1 deletion(-) create mode 100644 zinnia-fixes-gcc6-compile.patch diff --git a/zinnia-fixes-gcc6-compile.patch b/zinnia-fixes-gcc6-compile.patch new file mode 100644 index 0000000..848f306 --- /dev/null +++ b/zinnia-fixes-gcc6-compile.patch @@ -0,0 +1,22 @@ +Index: zinnia-0.06/trainer.cpp +=================================================================== +--- zinnia-0.06.orig/trainer.cpp ++++ zinnia-0.06/trainer.cpp +@@ -93,7 +93,7 @@ class TrainerImpl: public Trainer { + + public: + bool add(const Character &character) { +- const std::string y = character.value(); ++ std::string y = character.value(); + CHECK_FALSE(!y.empty()) << "input character is empty"; + Features features; + CHECK_FALSE(features.read(character)) << "cannot read character: " << y; +@@ -103,7 +103,7 @@ class TrainerImpl: public Trainer { + if (!fn) { + return false; + } +- x_.push_back(std::make_pair(y, fn)); ++ x_.push_back(std::make_pair(y, fn)); + return true; + } + diff --git a/zinnia.spec b/zinnia.spec index de72f0e..7029ab8 100644 --- a/zinnia.spec +++ b/zinnia.spec @@ -5,7 +5,7 @@ Name: zinnia Version: 0.06 -Release: 27%{?dist} +Release: 28%{?dist} Summary: Online handwriting recognition system with machine learning Group: System Environment/Libraries @@ -17,6 +17,7 @@ Source2: Makefile.tomoe 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 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: libdb-devel, python2-devel BuildRequires: perl(ExtUtils::MakeMaker) @@ -106,6 +107,7 @@ This package contains Simplified Chinese tomoe model files for %{name}. %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 {} ';' find . -type f -name "*.pyc" -exec rm -f {} ';' cp %{SOURCE1} . @@ -210,6 +212,9 @@ rm -rf $RPM_BUILD_ROOT %{_datadir}/zinnia/model/tomoe/handwriting-zh_CN.model %changelog +* Wed Feb 17 2016 Peng Wu - 0.06-28 +- Fixes compile with gcc 6.0 + * Fri Feb 05 2016 Fedora Release Engineering - 0.06-27 - Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild From af725ef8388f05f1850ec65893e61dd086db02ce Mon Sep 17 00:00:00 2001 From: Jitka Plesnikova Date: Sun, 15 May 2016 02:59:04 +0200 Subject: [PATCH 31/99] Perl 5.24 rebuild --- zinnia.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/zinnia.spec b/zinnia.spec index 7029ab8..7655361 100644 --- a/zinnia.spec +++ b/zinnia.spec @@ -5,7 +5,7 @@ Name: zinnia Version: 0.06 -Release: 28%{?dist} +Release: 29%{?dist} Summary: Online handwriting recognition system with machine learning Group: System Environment/Libraries @@ -212,6 +212,9 @@ rm -rf $RPM_BUILD_ROOT %{_datadir}/zinnia/model/tomoe/handwriting-zh_CN.model %changelog +* Sun May 15 2016 Jitka Plesnikova - 0.06-29 +- Perl 5.24 rebuild + * Wed Feb 17 2016 Peng Wu - 0.06-28 - Fixes compile with gcc 6.0 From 512292e624598e4af1d10aefc780da0d5a9dd059 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Petr=20P=C3=ADsa=C5=99?= Date: Fri, 24 Jun 2016 09:19:47 +0200 Subject: [PATCH 32/99] Mandatory Perl build-requires added --- zinnia.spec | 2 ++ 1 file changed, 2 insertions(+) diff --git a/zinnia.spec b/zinnia.spec index 7655361..73c3132 100644 --- a/zinnia.spec +++ b/zinnia.spec @@ -20,6 +20,8 @@ Patch2: always-store-data-in-little-endian-format.patch Patch3: zinnia-fixes-gcc6-compile.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: libdb-devel, python2-devel +BuildRequires: perl-devel +BuildRequires: perl-generators BuildRequires: perl(ExtUtils::MakeMaker) BuildRequires: tomoe BuildRequires: autoconf From ff035e92c1921cc50c2eb3821bc0f63a69bcb987 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Tue, 19 Jul 2016 13:16:00 +0000 Subject: [PATCH 33/99] - https://fedoraproject.org/wiki/Changes/Automatic_Provides_for_Python_RPM_Packages --- zinnia.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/zinnia.spec b/zinnia.spec index 73c3132..8b07f45 100644 --- a/zinnia.spec +++ b/zinnia.spec @@ -5,7 +5,7 @@ Name: zinnia Version: 0.06 -Release: 29%{?dist} +Release: 30%{?dist} Summary: Online handwriting recognition system with machine learning Group: System Environment/Libraries @@ -214,6 +214,9 @@ rm -rf $RPM_BUILD_ROOT %{_datadir}/zinnia/model/tomoe/handwriting-zh_CN.model %changelog +* Tue Jul 19 2016 Fedora Release Engineering - 0.06-30 +- https://fedoraproject.org/wiki/Changes/Automatic_Provides_for_Python_RPM_Packages + * Sun May 15 2016 Jitka Plesnikova - 0.06-29 - Perl 5.24 rebuild From 115b084cacd50d013f54c9e483fefd5fc95b2efa Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 11 Feb 2017 18:24:46 +0000 Subject: [PATCH 34/99] - Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild --- zinnia.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/zinnia.spec b/zinnia.spec index 8b07f45..6d69cc8 100644 --- a/zinnia.spec +++ b/zinnia.spec @@ -5,7 +5,7 @@ Name: zinnia Version: 0.06 -Release: 30%{?dist} +Release: 31%{?dist} Summary: Online handwriting recognition system with machine learning Group: System Environment/Libraries @@ -214,6 +214,9 @@ rm -rf $RPM_BUILD_ROOT %{_datadir}/zinnia/model/tomoe/handwriting-zh_CN.model %changelog +* Sat Feb 11 2017 Fedora Release Engineering - 0.06-31 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild + * Tue Jul 19 2016 Fedora Release Engineering - 0.06-30 - https://fedoraproject.org/wiki/Changes/Automatic_Provides_for_Python_RPM_Packages From 992d7cf7b90aca2b7349023f6c516362b94a4be0 Mon Sep 17 00:00:00 2001 From: Jitka Plesnikova Date: Sun, 4 Jun 2017 09:10:38 +0200 Subject: [PATCH 35/99] Perl 5.26 rebuild --- zinnia.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/zinnia.spec b/zinnia.spec index 6d69cc8..5ba68f1 100644 --- a/zinnia.spec +++ b/zinnia.spec @@ -5,7 +5,7 @@ Name: zinnia Version: 0.06 -Release: 31%{?dist} +Release: 32%{?dist} Summary: Online handwriting recognition system with machine learning Group: System Environment/Libraries @@ -214,6 +214,9 @@ rm -rf $RPM_BUILD_ROOT %{_datadir}/zinnia/model/tomoe/handwriting-zh_CN.model %changelog +* Sun Jun 04 2017 Jitka Plesnikova - 0.06-32 +- Perl 5.26 rebuild + * Sat Feb 11 2017 Fedora Release Engineering - 0.06-31 - Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild From 7b76445d08fda72ba31c2df21f41d3952dfbd99b Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 27 Jul 2017 22:43:20 +0000 Subject: [PATCH 36/99] - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild --- zinnia.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/zinnia.spec b/zinnia.spec index 5ba68f1..e1821cb 100644 --- a/zinnia.spec +++ b/zinnia.spec @@ -5,7 +5,7 @@ Name: zinnia Version: 0.06 -Release: 32%{?dist} +Release: 33%{?dist} Summary: Online handwriting recognition system with machine learning Group: System Environment/Libraries @@ -214,6 +214,9 @@ rm -rf $RPM_BUILD_ROOT %{_datadir}/zinnia/model/tomoe/handwriting-zh_CN.model %changelog +* Thu Jul 27 2017 Fedora Release Engineering - 0.06-33 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild + * Sun Jun 04 2017 Jitka Plesnikova - 0.06-32 - Perl 5.26 rebuild From fbc6c8f6fb51efa56554b7356745a84e2995dfe9 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 3 Aug 2017 11:11:26 +0000 Subject: [PATCH 37/99] - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild --- zinnia.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/zinnia.spec b/zinnia.spec index e1821cb..017fe4f 100644 --- a/zinnia.spec +++ b/zinnia.spec @@ -5,7 +5,7 @@ Name: zinnia Version: 0.06 -Release: 33%{?dist} +Release: 34%{?dist} Summary: Online handwriting recognition system with machine learning Group: System Environment/Libraries @@ -214,6 +214,9 @@ rm -rf $RPM_BUILD_ROOT %{_datadir}/zinnia/model/tomoe/handwriting-zh_CN.model %changelog +* Thu Aug 03 2017 Fedora Release Engineering - 0.06-34 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild + * Thu Jul 27 2017 Fedora Release Engineering - 0.06-33 - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild From 37213c4d1f073372550079a9021c5e4d6d870cb2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= Date: Sat, 19 Aug 2017 09:44:28 -0400 Subject: [PATCH 38/99] Python 2 binary package renamed to python2-zinnia --- zinnia.spec | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/zinnia.spec b/zinnia.spec index 017fe4f..4d6f86c 100644 --- a/zinnia.spec +++ b/zinnia.spec @@ -5,7 +5,7 @@ Name: zinnia Version: 0.06 -Release: 34%{?dist} +Release: 35%{?dist} Summary: Online handwriting recognition system with machine learning Group: System Environment/Libraries @@ -76,12 +76,16 @@ Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) %description perl This package contains perl bindings for %{name}. -%package python +%package -n python2-zinnia +%{?python_provide:%python_provide python2-zinnia} +# Remove before F30 +Provides: %{name}-python%{?_isa} = %{version}-%{release} +Obsoletes: %{name}-python < %{version}-%{release} Summary: Python bindings for %{name} Group: Development/Libraries Requires: %{name} = %{version}-%{release} -%description python +%description -n python2-zinnia This package contains python bindings for %{name}. %package tomoe-ja @@ -198,7 +202,7 @@ rm -rf $RPM_BUILD_ROOT %{perl_vendorarch}/auto/%{name}/ %{perl_vendorarch}/%{name}.pm -%files python +%files -n python2-zinnia %defattr(-,root,root,-) %{python_sitearch}/_%{name}.so %{python_sitearch}/%{name}* @@ -214,6 +218,10 @@ rm -rf $RPM_BUILD_ROOT %{_datadir}/zinnia/model/tomoe/handwriting-zh_CN.model %changelog +* Sat Aug 19 2017 Zbigniew Jędrzejewski-Szmek - 0.06-35 +- Python 2 binary package renamed to python2-zinnia + See https://fedoraproject.org/wiki/FinalizingFedoraSwitchtoPython3 + * Thu Aug 03 2017 Fedora Release Engineering - 0.06-34 - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild From 65e7475ba22eaa1328387058742c0611c53825ef Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= Date: Sun, 20 Aug 2017 10:44:52 -0400 Subject: [PATCH 39/99] Add Provides for the old name without %_isa --- zinnia.spec | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/zinnia.spec b/zinnia.spec index 4d6f86c..42b4649 100644 --- a/zinnia.spec +++ b/zinnia.spec @@ -5,7 +5,7 @@ Name: zinnia Version: 0.06 -Release: 35%{?dist} +Release: 36%{?dist} Summary: Online handwriting recognition system with machine learning Group: System Environment/Libraries @@ -79,6 +79,7 @@ This package contains perl bindings for %{name}. %package -n python2-zinnia %{?python_provide:%python_provide python2-zinnia} # Remove before F30 +Provides: %{name}-python = %{version}-%{release} Provides: %{name}-python%{?_isa} = %{version}-%{release} Obsoletes: %{name}-python < %{version}-%{release} Summary: Python bindings for %{name} @@ -218,6 +219,9 @@ rm -rf $RPM_BUILD_ROOT %{_datadir}/zinnia/model/tomoe/handwriting-zh_CN.model %changelog +* Sun Aug 20 2017 Zbigniew Jędrzejewski-Szmek - 0.06-36 +- Add Provides for the old name without %%_isa + * Sat Aug 19 2017 Zbigniew Jędrzejewski-Szmek - 0.06-35 - Python 2 binary package renamed to python2-zinnia See https://fedoraproject.org/wiki/FinalizingFedoraSwitchtoPython3 From 156a0eef6e3de6cc7235da90027c6b50242398b4 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 9 Feb 2018 22:28:20 +0000 Subject: [PATCH 40/99] - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- zinnia.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/zinnia.spec b/zinnia.spec index 42b4649..77ddbe1 100644 --- a/zinnia.spec +++ b/zinnia.spec @@ -5,7 +5,7 @@ Name: zinnia Version: 0.06 -Release: 36%{?dist} +Release: 37%{?dist} Summary: Online handwriting recognition system with machine learning Group: System Environment/Libraries @@ -219,6 +219,9 @@ rm -rf $RPM_BUILD_ROOT %{_datadir}/zinnia/model/tomoe/handwriting-zh_CN.model %changelog +* Fri Feb 09 2018 Fedora Release Engineering - 0.06-37 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild + * Sun Aug 20 2017 Zbigniew Jędrzejewski-Szmek - 0.06-36 - Add Provides for the old name without %%_isa From 930e8fa5453b6c7070e082f572932f0fedcaa5c4 Mon Sep 17 00:00:00 2001 From: Igor Gnatenko Date: Wed, 14 Feb 2018 00:52:49 +0100 Subject: [PATCH 41/99] Remove BuildRoot definition None of currently supported distributions need that. It was needed last for EL5 which is EOL now Signed-off-by: Igor Gnatenko --- zinnia.spec | 1 - 1 file changed, 1 deletion(-) diff --git a/zinnia.spec b/zinnia.spec index 77ddbe1..deafe9b 100644 --- a/zinnia.spec +++ b/zinnia.spec @@ -18,7 +18,6 @@ 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 -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: libdb-devel, python2-devel BuildRequires: perl-devel BuildRequires: perl-generators From 33a414150719676c5a708ec5ea53c7f4f040c34e Mon Sep 17 00:00:00 2001 From: Igor Gnatenko Date: Wed, 14 Feb 2018 09:03:00 +0100 Subject: [PATCH 42/99] Remove %clean section None of currently supported distributions need that. Last one was EL5 which is EOL for a while. Signed-off-by: Igor Gnatenko --- zinnia.spec | 3 --- 1 file changed, 3 deletions(-) diff --git a/zinnia.spec b/zinnia.spec index deafe9b..90b8fdd 100644 --- a/zinnia.spec +++ b/zinnia.spec @@ -165,9 +165,6 @@ find $RPM_BUILD_ROOT -type f -name .packlist -exec rm -f {} ';' chmod 0755 $RPM_BUILD_ROOT%{perl_vendorarch}/auto/%{name}/%{name}.so -%clean -rm -rf $RPM_BUILD_ROOT - %post -p /sbin/ldconfig From 543c2c68cd4ac01b96a182fc7c693b058cedcb90 Mon Sep 17 00:00:00 2001 From: Peng Wu Date: Mon, 5 Mar 2018 16:20:27 +0800 Subject: [PATCH 43/99] Add BuildRequires gcc-c++ --- zinnia.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/zinnia.spec b/zinnia.spec index 90b8fdd..27cb48e 100644 --- a/zinnia.spec +++ b/zinnia.spec @@ -18,6 +18,7 @@ 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: gcc-c++ BuildRequires: libdb-devel, python2-devel BuildRequires: perl-devel BuildRequires: perl-generators From 1292fde233efadaee191fac88797f7dcf4030150 Mon Sep 17 00:00:00 2001 From: Jitka Plesnikova Date: Wed, 27 Jun 2018 21:58:35 +0200 Subject: [PATCH 44/99] Perl 5.28 rebuild --- zinnia.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/zinnia.spec b/zinnia.spec index 27cb48e..0ee38c8 100644 --- a/zinnia.spec +++ b/zinnia.spec @@ -5,7 +5,7 @@ Name: zinnia Version: 0.06 -Release: 37%{?dist} +Release: 38%{?dist} Summary: Online handwriting recognition system with machine learning Group: System Environment/Libraries @@ -216,6 +216,9 @@ chmod 0755 $RPM_BUILD_ROOT%{perl_vendorarch}/auto/%{name}/%{name}.so %{_datadir}/zinnia/model/tomoe/handwriting-zh_CN.model %changelog +* Wed Jun 27 2018 Jitka Plesnikova - 0.06-38 +- Perl 5.28 rebuild + * Fri Feb 09 2018 Fedora Release Engineering - 0.06-37 - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild From 3fb5fa3fac45d588dfbdf253cb1e3505db027169 Mon Sep 17 00:00:00 2001 From: Jason Tibbitts Date: Mon, 9 Jul 2018 23:14:27 -0500 Subject: [PATCH 45/99] Remove needless use of %defattr --- zinnia.spec | 8 -------- 1 file changed, 8 deletions(-) diff --git a/zinnia.spec b/zinnia.spec index 0ee38c8..0715f37 100644 --- a/zinnia.spec +++ b/zinnia.spec @@ -173,45 +173,37 @@ chmod 0755 $RPM_BUILD_ROOT%{perl_vendorarch}/auto/%{name}/%{name}.so %files -%defattr(-,root,root,-) %doc README COPYING %{_libdir}/*.so.* %files devel -%defattr(-,root,root,-) %{_includedir}/* %{_libdir}/lib%{name}.so %{_libdir}/pkgconfig/%{name}.pc %files utils -%defattr(-,root,root,-) %{_bindir}/zinnia %{_bindir}/zinnia_convert %{_bindir}/zinnia_learn %files doc -%defattr(-,root,root,-) %doc doc/* %files perl -%defattr(-,root,root,-) %{perl_vendorarch}/auto/%{name}/ %{perl_vendorarch}/%{name}.pm %files -n python2-zinnia -%defattr(-,root,root,-) %{python_sitearch}/_%{name}.so %{python_sitearch}/%{name}* %files tomoe-ja -%defattr(-,root,root,-) %dir %{_datadir}/zinnia/model/tomoe/ %{_datadir}/zinnia/model/tomoe/handwriting-ja.model %files tomoe-zh_CN -%defattr(-,root,root,-) %dir %{_datadir}/zinnia/model/tomoe/ %{_datadir}/zinnia/model/tomoe/handwriting-zh_CN.model From bd37a0ade0febe1c3e5e554594588dc8b93a9ec8 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 14 Jul 2018 09:50:36 +0000 Subject: [PATCH 46/99] - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- zinnia.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/zinnia.spec b/zinnia.spec index 0715f37..16a64fc 100644 --- a/zinnia.spec +++ b/zinnia.spec @@ -5,7 +5,7 @@ Name: zinnia Version: 0.06 -Release: 38%{?dist} +Release: 39%{?dist} Summary: Online handwriting recognition system with machine learning Group: System Environment/Libraries @@ -208,6 +208,9 @@ chmod 0755 $RPM_BUILD_ROOT%{perl_vendorarch}/auto/%{name}/%{name}.so %{_datadir}/zinnia/model/tomoe/handwriting-zh_CN.model %changelog +* Sat Jul 14 2018 Fedora Release Engineering - 0.06-39 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild + * Wed Jun 27 2018 Jitka Plesnikova - 0.06-38 - Perl 5.28 rebuild From 055c7aac0b6ad68d89ea2acdd9970e951f9ee6d3 Mon Sep 17 00:00:00 2001 From: Peng Wu Date: Tue, 24 Jul 2018 12:25:28 +0800 Subject: [PATCH 47/99] Use python2 --- zinnia.spec | 18 ++++++++---------- 1 file changed, 8 insertions(+), 10 deletions(-) diff --git a/zinnia.spec b/zinnia.spec index 16a64fc..5f9b828 100644 --- a/zinnia.spec +++ b/zinnia.spec @@ -1,11 +1,6 @@ -%if ! (0%{?fedora} > 12 || 0%{?rhel} > 5) -%{!?python_sitelib: %global python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib())")} -%{!?python_sitearch: %global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib(1))")} -%endif - Name: zinnia Version: 0.06 -Release: 39%{?dist} +Release: 40%{?dist} Summary: Online handwriting recognition system with machine learning Group: System Environment/Libraries @@ -138,7 +133,7 @@ make %{?_smp_mflags} popd pushd python -CFLAGS="$RPM_OPT_FLAGS -I../" LDFLAGS="-L../.libs" python setup.py build +CFLAGS="$RPM_OPT_FLAGS -I../" LDFLAGS="-L../.libs" python2 setup.py build popd %install @@ -154,7 +149,7 @@ make pure_install PERL_INSTALL_ROOT=$RPM_BUILD_ROOT popd pushd python -python setup.py install --root $RPM_BUILD_ROOT +python2 setup.py install --root $RPM_BUILD_ROOT pushd #remove something unnecessary @@ -196,8 +191,8 @@ chmod 0755 $RPM_BUILD_ROOT%{perl_vendorarch}/auto/%{name}/%{name}.so %{perl_vendorarch}/%{name}.pm %files -n python2-zinnia -%{python_sitearch}/_%{name}.so -%{python_sitearch}/%{name}* +%{python2_sitearch}/_%{name}.so +%{python2_sitearch}/%{name}* %files tomoe-ja %dir %{_datadir}/zinnia/model/tomoe/ @@ -208,6 +203,9 @@ chmod 0755 $RPM_BUILD_ROOT%{perl_vendorarch}/auto/%{name}/%{name}.so %{_datadir}/zinnia/model/tomoe/handwriting-zh_CN.model %changelog +* Tue Jul 24 2018 Peng Wu - 0.06-40 +- Use python2 + * Sat Jul 14 2018 Fedora Release Engineering - 0.06-39 - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild From f2a618261379af7c9a2433c4b8bcfa149f02f3bc Mon Sep 17 00:00:00 2001 From: Peng Wu Date: Wed, 10 Oct 2018 15:32:23 +0800 Subject: [PATCH 48/99] Switch from python2 to python3 --- zinnia.spec | 37 +++++++++++++++++++++++-------------- 1 file changed, 23 insertions(+), 14 deletions(-) diff --git a/zinnia.spec b/zinnia.spec index 5f9b828..500a7a7 100644 --- a/zinnia.spec +++ b/zinnia.spec @@ -1,6 +1,6 @@ Name: zinnia Version: 0.06 -Release: 40%{?dist} +Release: 41%{?dist} Summary: Online handwriting recognition system with machine learning Group: System Environment/Libraries @@ -14,7 +14,8 @@ Patch1: zinnia-0.06-fixes-ppc-float.patch Patch2: always-store-data-in-little-endian-format.patch Patch3: zinnia-fixes-gcc6-compile.patch BuildRequires: gcc-c++ -BuildRequires: libdb-devel, python2-devel +BuildRequires: libdb-devel, python3-devel +BuildRequires: swig BuildRequires: perl-devel BuildRequires: perl-generators BuildRequires: perl(ExtUtils::MakeMaker) @@ -71,17 +72,17 @@ Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) %description perl This package contains perl bindings for %{name}. -%package -n python2-zinnia -%{?python_provide:%python_provide python2-zinnia} +%package -n python3-zinnia +%{?python_provide:%python_provide python3-zinnia} # Remove before F30 -Provides: %{name}-python = %{version}-%{release} -Provides: %{name}-python%{?_isa} = %{version}-%{release} -Obsoletes: %{name}-python < %{version}-%{release} +# Provides: %{name}-python = %{version}-%{release} +# Provides: %{name}-python%{?_isa} = %{version}-%{release} +# Obsoletes: %{name}-python < %{version}-%{release} Summary: Python bindings for %{name} Group: Development/Libraries Requires: %{name} = %{version}-%{release} -%description -n python2-zinnia +%description -n python3-zinnia This package contains python bindings for %{name}. %package tomoe-ja @@ -119,6 +120,11 @@ iconv -f latin1 -t utf8 zinnia.css > zinnia.css.bak mv -f zinnia.css.bak zinnia.css popd +# re-generate zinnia.py and zinnia_wrap.cxx for python 3.x +pushd swig +make python +popd + %build autoconf %configure --disable-static @@ -133,7 +139,7 @@ make %{?_smp_mflags} popd pushd python -CFLAGS="$RPM_OPT_FLAGS -I../" LDFLAGS="-L../.libs" python2 setup.py build +CFLAGS="$RPM_OPT_FLAGS -I../" LDFLAGS="-L../.libs" python3 setup.py build popd %install @@ -149,7 +155,7 @@ make pure_install PERL_INSTALL_ROOT=$RPM_BUILD_ROOT popd pushd python -python2 setup.py install --root $RPM_BUILD_ROOT +python3 setup.py install --root $RPM_BUILD_ROOT pushd #remove something unnecessary @@ -185,14 +191,14 @@ chmod 0755 $RPM_BUILD_ROOT%{perl_vendorarch}/auto/%{name}/%{name}.so %files doc %doc doc/* - %files perl %{perl_vendorarch}/auto/%{name}/ %{perl_vendorarch}/%{name}.pm -%files -n python2-zinnia -%{python2_sitearch}/_%{name}.so -%{python2_sitearch}/%{name}* +%files -n python3-zinnia +%{python3_sitearch}/_%{name}.*.so +%{python3_sitearch}/%{name}* +%{python3_sitearch}/__pycache__/* %files tomoe-ja %dir %{_datadir}/zinnia/model/tomoe/ @@ -203,6 +209,9 @@ chmod 0755 $RPM_BUILD_ROOT%{perl_vendorarch}/auto/%{name}/%{name}.so %{_datadir}/zinnia/model/tomoe/handwriting-zh_CN.model %changelog +* Wed Oct 10 2018 Peng Wu - 0.06-41 +- Switch from python2 to python3 + * Tue Jul 24 2018 Peng Wu - 0.06-40 - Use python2 From 452cb03456edda5af0450e7a8d5858111cf98d22 Mon Sep 17 00:00:00 2001 From: Peng Wu Date: Wed, 10 Oct 2018 16:58:21 +0800 Subject: [PATCH 49/99] clean spec --- zinnia.spec | 4 ---- 1 file changed, 4 deletions(-) diff --git a/zinnia.spec b/zinnia.spec index 500a7a7..7e68873 100644 --- a/zinnia.spec +++ b/zinnia.spec @@ -74,10 +74,6 @@ This package contains perl bindings for %{name}. %package -n python3-zinnia %{?python_provide:%python_provide python3-zinnia} -# Remove before F30 -# Provides: %{name}-python = %{version}-%{release} -# Provides: %{name}-python%{?_isa} = %{version}-%{release} -# Obsoletes: %{name}-python < %{version}-%{release} Summary: Python bindings for %{name} Group: Development/Libraries Requires: %{name} = %{version}-%{release} From eb11ffcd51f8efe69e7406813b4f000af8fbf658 Mon Sep 17 00:00:00 2001 From: Igor Gnatenko Date: Tue, 22 Jan 2019 18:41:24 +0100 Subject: [PATCH 50/99] Remove obsolete ldconfig scriptlets References: https://fedoraproject.org/wiki/Changes/RemoveObsoleteScriptlets Signed-off-by: Igor Gnatenko --- zinnia.spec | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/zinnia.spec b/zinnia.spec index 7e68873..23e2f88 100644 --- a/zinnia.spec +++ b/zinnia.spec @@ -164,9 +164,7 @@ chmod 0755 $RPM_BUILD_ROOT%{perl_vendorarch}/auto/%{name}/%{name}.so -%post -p /sbin/ldconfig - -%postun -p /sbin/ldconfig +%ldconfig_scriptlets %files From 35e6d6beec16933b02a6da3079af314f7d9cf30c Mon Sep 17 00:00:00 2001 From: Igor Gnatenko Date: Mon, 28 Jan 2019 20:18:32 +0100 Subject: [PATCH 51/99] Remove obsolete Group tag References: https://fedoraproject.org/wiki/Changes/Remove_Group_Tag --- zinnia.spec | 8 -------- 1 file changed, 8 deletions(-) diff --git a/zinnia.spec b/zinnia.spec index 23e2f88..2db7ed5 100644 --- a/zinnia.spec +++ b/zinnia.spec @@ -3,7 +3,6 @@ Version: 0.06 Release: 41%{?dist} Summary: Online handwriting recognition system with machine learning -Group: System Environment/Libraries License: BSD URL: http://zinnia.sourceforge.net/ Source0: http://downloads.sourceforge.net/zinnia/%{name}-%{version}.tar.gz @@ -36,7 +35,6 @@ This package contains the shared libraries. %package devel Summary: Development files for %{name} -Group: Development/Libraries Requires: %{name} = %{version}-%{release} %description devel @@ -45,7 +43,6 @@ developing applications that use %{name}. %package utils Summary: Utils for the zinnia library -Group: Applications/System Requires: %{name} = %{version}-%{release} %description utils @@ -54,7 +51,6 @@ use %{name}. %package doc Summary: Documents for the zinnia library -Group: Development/Libraries Requires: %{name} = %{version}-%{release} BuildArch: noarch @@ -64,7 +60,6 @@ use %{name}. %package perl Summary: Perl bindings for %name -Group: Development/Libraries Requires: %{name} = %{version}-%{release} Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) @@ -75,7 +70,6 @@ This package contains perl bindings for %{name}. %package -n python3-zinnia %{?python_provide:%python_provide python3-zinnia} Summary: Python bindings for %{name} -Group: Development/Libraries Requires: %{name} = %{version}-%{release} %description -n python3-zinnia @@ -83,7 +77,6 @@ This package contains python bindings for %{name}. %package tomoe-ja Summary: Japanese tomoe model file for %{name} -Group: System Environment/Libraries Requires: %{name} = %{version}-%{release} Provides: zinnia-tomoe = %{version}-%{release} Obsoletes: zinnia-tomoe < 0.06-19 @@ -93,7 +86,6 @@ This package contains Japanese tomoe model files for %{name}. %package tomoe-zh_CN Summary: Simplified Chinese tomoe model file for %{name} -Group: System Environment/Libraries Requires: %{name} = %{version}-%{release} Provides: zinnia-tomoe = %{version}-%{release} Obsoletes: zinnia-tomoe < 0.06-19 From 3aa0c6bf68729004ade4b0bea0111de3f27142e4 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sun, 3 Feb 2019 13:11:26 +0000 Subject: [PATCH 52/99] - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- zinnia.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/zinnia.spec b/zinnia.spec index 2db7ed5..df641d1 100644 --- a/zinnia.spec +++ b/zinnia.spec @@ -1,6 +1,6 @@ Name: zinnia Version: 0.06 -Release: 41%{?dist} +Release: 42%{?dist} Summary: Online handwriting recognition system with machine learning License: BSD @@ -195,6 +195,9 @@ chmod 0755 $RPM_BUILD_ROOT%{perl_vendorarch}/auto/%{name}/%{name}.so %{_datadir}/zinnia/model/tomoe/handwriting-zh_CN.model %changelog +* Sun Feb 03 2019 Fedora Release Engineering - 0.06-42 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild + * Wed Oct 10 2018 Peng Wu - 0.06-41 - Switch from python2 to python3 From 9e9a51625928e0a0635b8abfa33f178842d77949 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= Date: Wed, 13 Feb 2019 01:23:16 +0100 Subject: [PATCH 53/99] https://fedoraproject.org/wiki/Changes/Python_Extension_Flags --- zinnia.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/zinnia.spec b/zinnia.spec index df641d1..aa67660 100644 --- a/zinnia.spec +++ b/zinnia.spec @@ -127,7 +127,7 @@ make %{?_smp_mflags} popd pushd python -CFLAGS="$RPM_OPT_FLAGS -I../" LDFLAGS="-L../.libs" python3 setup.py build +CFLAGS="$RPM_OPT_FLAGS -I../" LDFLAGS="$RPM_LD_FLAGS -L../.libs" python3 setup.py build popd %install From 6bce6c842fcac0e79e1232d17073218c5ab802c8 Mon Sep 17 00:00:00 2001 From: Jitka Plesnikova Date: Thu, 30 May 2019 13:36:55 +0200 Subject: [PATCH 54/99] Perl 5.30 rebuild --- zinnia.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/zinnia.spec b/zinnia.spec index aa67660..386f63d 100644 --- a/zinnia.spec +++ b/zinnia.spec @@ -1,6 +1,6 @@ Name: zinnia Version: 0.06 -Release: 42%{?dist} +Release: 43%{?dist} Summary: Online handwriting recognition system with machine learning License: BSD @@ -195,6 +195,9 @@ chmod 0755 $RPM_BUILD_ROOT%{perl_vendorarch}/auto/%{name}/%{name}.so %{_datadir}/zinnia/model/tomoe/handwriting-zh_CN.model %changelog +* Thu May 30 2019 Jitka Plesnikova - 0.06-43 +- Perl 5.30 rebuild + * Sun Feb 03 2019 Fedora Release Engineering - 0.06-42 - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild From a8794b7d25d66d70e07465438628bfd9877c9b18 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 27 Jul 2019 05:00:55 +0000 Subject: [PATCH 55/99] - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- zinnia.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/zinnia.spec b/zinnia.spec index 386f63d..63577b7 100644 --- a/zinnia.spec +++ b/zinnia.spec @@ -1,6 +1,6 @@ Name: zinnia Version: 0.06 -Release: 43%{?dist} +Release: 44%{?dist} Summary: Online handwriting recognition system with machine learning License: BSD @@ -195,6 +195,9 @@ chmod 0755 $RPM_BUILD_ROOT%{perl_vendorarch}/auto/%{name}/%{name}.so %{_datadir}/zinnia/model/tomoe/handwriting-zh_CN.model %changelog +* Sat Jul 27 2019 Fedora Release Engineering - 0.06-44 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild + * Thu May 30 2019 Jitka Plesnikova - 0.06-43 - Perl 5.30 rebuild From 6d6eba55d8c01c0ee10259e55871c8c8f5bda489 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= Date: Mon, 19 Aug 2019 11:10:06 +0200 Subject: [PATCH 56/99] Rebuilt for Python 3.8 --- zinnia.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/zinnia.spec b/zinnia.spec index 63577b7..92007b1 100644 --- a/zinnia.spec +++ b/zinnia.spec @@ -1,6 +1,6 @@ Name: zinnia Version: 0.06 -Release: 44%{?dist} +Release: 45%{?dist} Summary: Online handwriting recognition system with machine learning License: BSD @@ -195,6 +195,9 @@ chmod 0755 $RPM_BUILD_ROOT%{perl_vendorarch}/auto/%{name}/%{name}.so %{_datadir}/zinnia/model/tomoe/handwriting-zh_CN.model %changelog +* Mon Aug 19 2019 Miro Hrončok - 0.06-45 +- Rebuilt for Python 3.8 + * Sat Jul 27 2019 Fedora Release Engineering - 0.06-44 - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild From 1941d58b0dd327077eb7b17332f97d2a4ead97b5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= Date: Thu, 3 Oct 2019 14:41:59 +0200 Subject: [PATCH 57/99] Rebuilt for Python 3.8.0rc1 (#1748018) --- zinnia.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/zinnia.spec b/zinnia.spec index 92007b1..cd36a90 100644 --- a/zinnia.spec +++ b/zinnia.spec @@ -1,6 +1,6 @@ Name: zinnia Version: 0.06 -Release: 45%{?dist} +Release: 46%{?dist} Summary: Online handwriting recognition system with machine learning License: BSD @@ -195,6 +195,9 @@ chmod 0755 $RPM_BUILD_ROOT%{perl_vendorarch}/auto/%{name}/%{name}.so %{_datadir}/zinnia/model/tomoe/handwriting-zh_CN.model %changelog +* Thu Oct 03 2019 Miro Hrončok - 0.06-46 +- Rebuilt for Python 3.8.0rc1 (#1748018) + * Mon Aug 19 2019 Miro Hrončok - 0.06-45 - Rebuilt for Python 3.8 From 562d753ae8489bef649349f1972814994f6d700d Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 31 Jan 2020 05:19:36 +0000 Subject: [PATCH 58/99] - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- zinnia.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/zinnia.spec b/zinnia.spec index cd36a90..2126d8c 100644 --- a/zinnia.spec +++ b/zinnia.spec @@ -1,6 +1,6 @@ Name: zinnia Version: 0.06 -Release: 46%{?dist} +Release: 47%{?dist} Summary: Online handwriting recognition system with machine learning License: BSD @@ -195,6 +195,9 @@ chmod 0755 $RPM_BUILD_ROOT%{perl_vendorarch}/auto/%{name}/%{name}.so %{_datadir}/zinnia/model/tomoe/handwriting-zh_CN.model %changelog +* Fri Jan 31 2020 Fedora Release Engineering - 0.06-47 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild + * Thu Oct 03 2019 Miro Hrončok - 0.06-46 - Rebuilt for Python 3.8.0rc1 (#1748018) From 9ff84814ea6066b7525a721d8c48aaee6b8a94f2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= Date: Tue, 26 May 2020 03:55:46 +0200 Subject: [PATCH 59/99] Rebuilt for Python 3.9 --- zinnia.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/zinnia.spec b/zinnia.spec index 2126d8c..e2fbb65 100644 --- a/zinnia.spec +++ b/zinnia.spec @@ -1,6 +1,6 @@ Name: zinnia Version: 0.06 -Release: 47%{?dist} +Release: 48%{?dist} Summary: Online handwriting recognition system with machine learning License: BSD @@ -195,6 +195,9 @@ chmod 0755 $RPM_BUILD_ROOT%{perl_vendorarch}/auto/%{name}/%{name}.so %{_datadir}/zinnia/model/tomoe/handwriting-zh_CN.model %changelog +* Tue May 26 2020 Miro Hrončok - 0.06-48 +- Rebuilt for Python 3.9 + * Fri Jan 31 2020 Fedora Release Engineering - 0.06-47 - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild From a36487ce6bf49313995be70c786b939ece26a126 Mon Sep 17 00:00:00 2001 From: Jitka Plesnikova Date: Mon, 22 Jun 2020 19:23:32 +0200 Subject: [PATCH 60/99] Perl 5.32 rebuild --- zinnia.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/zinnia.spec b/zinnia.spec index e2fbb65..853a67c 100644 --- a/zinnia.spec +++ b/zinnia.spec @@ -1,6 +1,6 @@ Name: zinnia Version: 0.06 -Release: 48%{?dist} +Release: 49%{?dist} Summary: Online handwriting recognition system with machine learning License: BSD @@ -195,6 +195,9 @@ chmod 0755 $RPM_BUILD_ROOT%{perl_vendorarch}/auto/%{name}/%{name}.so %{_datadir}/zinnia/model/tomoe/handwriting-zh_CN.model %changelog +* Mon Jun 22 2020 Jitka Plesnikova - 0.06-49 +- Perl 5.32 rebuild + * Tue May 26 2020 Miro Hrončok - 0.06-48 - Rebuilt for Python 3.9 From f62f1b634faead11227547b4b0305ea64785b49c Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 29 Jul 2020 15:23:33 +0000 Subject: [PATCH 61/99] - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- zinnia.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/zinnia.spec b/zinnia.spec index 853a67c..0a47362 100644 --- a/zinnia.spec +++ b/zinnia.spec @@ -1,6 +1,6 @@ Name: zinnia Version: 0.06 -Release: 49%{?dist} +Release: 50%{?dist} Summary: Online handwriting recognition system with machine learning License: BSD @@ -195,6 +195,9 @@ chmod 0755 $RPM_BUILD_ROOT%{perl_vendorarch}/auto/%{name}/%{name}.so %{_datadir}/zinnia/model/tomoe/handwriting-zh_CN.model %changelog +* Wed Jul 29 2020 Fedora Release Engineering - 0.06-50 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + * Mon Jun 22 2020 Jitka Plesnikova - 0.06-49 - Perl 5.32 rebuild From 86ea5f3ccddf63ae1d1b8fa34d473c5d9c3fa6d9 Mon Sep 17 00:00:00 2001 From: Tom Stellard Date: Sat, 9 Jan 2021 01:53:17 +0000 Subject: [PATCH 62/99] Add BuildRequires: make https://fedoraproject.org/wiki/Changes/Remove_make_from_BuildRoot --- zinnia.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/zinnia.spec b/zinnia.spec index 0a47362..42c890e 100644 --- a/zinnia.spec +++ b/zinnia.spec @@ -12,6 +12,7 @@ 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++ BuildRequires: libdb-devel, python3-devel BuildRequires: swig From 7b58bb88c519e359b6bc33dde93e02b41b981e09 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 28 Jan 2021 00:42:23 +0000 Subject: [PATCH 63/99] - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- zinnia.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/zinnia.spec b/zinnia.spec index 42c890e..bafabf8 100644 --- a/zinnia.spec +++ b/zinnia.spec @@ -1,6 +1,6 @@ Name: zinnia Version: 0.06 -Release: 50%{?dist} +Release: 51%{?dist} Summary: Online handwriting recognition system with machine learning License: BSD @@ -196,6 +196,9 @@ chmod 0755 $RPM_BUILD_ROOT%{perl_vendorarch}/auto/%{name}/%{name}.so %{_datadir}/zinnia/model/tomoe/handwriting-zh_CN.model %changelog +* Thu Jan 28 2021 Fedora Release Engineering - 0.06-51 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + * Wed Jul 29 2020 Fedora Release Engineering - 0.06-50 - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild From 804e955e656ed309bb9edc7be33eef2a91028124 Mon Sep 17 00:00:00 2001 From: Jitka Plesnikova Date: Fri, 21 May 2021 12:03:41 +0200 Subject: [PATCH 64/99] Perl 5.34 rebuild --- zinnia.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/zinnia.spec b/zinnia.spec index bafabf8..3df0a85 100644 --- a/zinnia.spec +++ b/zinnia.spec @@ -1,6 +1,6 @@ Name: zinnia Version: 0.06 -Release: 51%{?dist} +Release: 52%{?dist} Summary: Online handwriting recognition system with machine learning License: BSD @@ -196,6 +196,9 @@ chmod 0755 $RPM_BUILD_ROOT%{perl_vendorarch}/auto/%{name}/%{name}.so %{_datadir}/zinnia/model/tomoe/handwriting-zh_CN.model %changelog +* Fri May 21 2021 Jitka Plesnikova - 0.06-52 +- Perl 5.34 rebuild + * Thu Jan 28 2021 Fedora Release Engineering - 0.06-51 - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild From b7b19965c1fe7f2dbe3a4ed7fb9082666d40a45a Mon Sep 17 00:00:00 2001 From: Peng Wu Date: Fri, 4 Jun 2021 14:16:28 +0800 Subject: [PATCH 65/99] Disable rpath --- zinnia.spec | 20 +++++++++----------- 1 file changed, 9 insertions(+), 11 deletions(-) diff --git a/zinnia.spec b/zinnia.spec index 3df0a85..86f312c 100644 --- a/zinnia.spec +++ b/zinnia.spec @@ -1,6 +1,6 @@ Name: zinnia Version: 0.06 -Release: 52%{?dist} +Release: 53%{?dist} Summary: Online handwriting recognition system with machine learning License: BSD @@ -12,8 +12,8 @@ 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++ +BuildRequires: make +BuildRequires: gcc-c++ BuildRequires: libdb-devel, python3-devel BuildRequires: swig BuildRequires: perl-devel @@ -21,6 +21,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 @@ -100,7 +101,6 @@ This package contains Simplified Chinese tomoe model files for %{name}. %patch1 -p1 -b .ppc %patch2 -p1 -R -b .little-endian %patch3 -p1 -b .gcc6 -find . -type f -name ChangeLog -size 0c -exec rm -f {} ';' find . -type f -name "*.pyc" -exec rm -f {} ';' cp %{SOURCE1} . cp %{SOURCE2} . @@ -115,10 +115,8 @@ make python popd %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 @@ -136,9 +134,6 @@ 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 @@ -196,6 +191,9 @@ chmod 0755 $RPM_BUILD_ROOT%{perl_vendorarch}/auto/%{name}/%{name}.so %{_datadir}/zinnia/model/tomoe/handwriting-zh_CN.model %changelog +* Fri Jun 4 2021 Peng Wu - 0.06-53 +- Disable rpath + * Fri May 21 2021 Jitka Plesnikova - 0.06-52 - Perl 5.34 rebuild From e692ccbc656dfbcf1ef7ccbe0fabd8528da872fd Mon Sep 17 00:00:00 2001 From: Python Maint Date: Fri, 4 Jun 2021 21:20:50 +0200 Subject: [PATCH 66/99] Rebuilt for Python 3.10 --- zinnia.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/zinnia.spec b/zinnia.spec index 86f312c..91d9e7f 100644 --- a/zinnia.spec +++ b/zinnia.spec @@ -1,6 +1,6 @@ Name: zinnia Version: 0.06 -Release: 53%{?dist} +Release: 54%{?dist} Summary: Online handwriting recognition system with machine learning License: BSD @@ -191,6 +191,9 @@ chmod 0755 $RPM_BUILD_ROOT%{perl_vendorarch}/auto/%{name}/%{name}.so %{_datadir}/zinnia/model/tomoe/handwriting-zh_CN.model %changelog +* Fri Jun 04 2021 Python Maint - 0.06-54 +- Rebuilt for Python 3.10 + * Fri Jun 4 2021 Peng Wu - 0.06-53 - Disable rpath From badeeaa84728e08d35d5a1ca06f2f8085233d3ef Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 23 Jul 2021 22:18:21 +0000 Subject: [PATCH 67/99] - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- zinnia.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/zinnia.spec b/zinnia.spec index 91d9e7f..7342b1a 100644 --- a/zinnia.spec +++ b/zinnia.spec @@ -1,6 +1,6 @@ Name: zinnia Version: 0.06 -Release: 54%{?dist} +Release: 55%{?dist} Summary: Online handwriting recognition system with machine learning License: BSD @@ -191,6 +191,9 @@ chmod 0755 $RPM_BUILD_ROOT%{perl_vendorarch}/auto/%{name}/%{name}.so %{_datadir}/zinnia/model/tomoe/handwriting-zh_CN.model %changelog +* Fri Jul 23 2021 Fedora Release Engineering - 0.06-55 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + * Fri Jun 04 2021 Python Maint - 0.06-54 - Rebuilt for Python 3.10 From 51a6f0a9a4a37dadb6fac687adbfb763a2e3d6ce Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 22 Jan 2022 05:51:59 +0000 Subject: [PATCH 68/99] - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- zinnia.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/zinnia.spec b/zinnia.spec index 7342b1a..f0dcbc4 100644 --- a/zinnia.spec +++ b/zinnia.spec @@ -1,6 +1,6 @@ Name: zinnia Version: 0.06 -Release: 55%{?dist} +Release: 56%{?dist} Summary: Online handwriting recognition system with machine learning License: BSD @@ -191,6 +191,9 @@ chmod 0755 $RPM_BUILD_ROOT%{perl_vendorarch}/auto/%{name}/%{name}.so %{_datadir}/zinnia/model/tomoe/handwriting-zh_CN.model %changelog +* Sat Jan 22 2022 Fedora Release Engineering - 0.06-56 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + * Fri Jul 23 2021 Fedora Release Engineering - 0.06-55 - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild From b8b8136da460f829e9435e7aa9d5880ebaecc09b Mon Sep 17 00:00:00 2001 From: Troy Dawson Date: Mon, 31 Jan 2022 18:18:23 -0800 Subject: [PATCH 69/99] epel8-playground decommissioned : https://pagure.io/epel/issue/136 --- .cvsignore | 0 Makefile | 21 --------------------- dead.package | 1 + sources | 0 4 files changed, 1 insertion(+), 21 deletions(-) delete mode 100644 .cvsignore delete mode 100644 Makefile create mode 100644 dead.package delete mode 100644 sources diff --git a/.cvsignore b/.cvsignore deleted file mode 100644 index e69de29..0000000 diff --git a/Makefile b/Makefile deleted file mode 100644 index 3b2b012..0000000 --- a/Makefile +++ /dev/null @@ -1,21 +0,0 @@ -# Makefile for source rpm: zinnia -# $Id$ -NAME := zinnia -SPECFILE = $(firstword $(wildcard *.spec)) - -define find-makefile-common -for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done -endef - -MAKEFILE_COMMON := $(shell $(find-makefile-common)) - -ifeq ($(MAKEFILE_COMMON),) -# attept a checkout -define checkout-makefile-common -test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2 -endef - -MAKEFILE_COMMON := $(shell $(checkout-makefile-common)) -endif - -include $(MAKEFILE_COMMON) diff --git a/dead.package b/dead.package new file mode 100644 index 0000000..a72aec0 --- /dev/null +++ b/dead.package @@ -0,0 +1 @@ +epel8-playground decommissioned : https://pagure.io/epel/issue/136 diff --git a/sources b/sources deleted file mode 100644 index e69de29..0000000 From b2fc2c7d0b896efb27ea4f57ce136fcd7b5db063 Mon Sep 17 00:00:00 2001 From: Peng Wu Date: Fri, 11 Feb 2022 10:43:26 +0800 Subject: [PATCH 70/99] Fix RHBZ#2048104 --- zinnia.spec | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/zinnia.spec b/zinnia.spec index f0dcbc4..6ee3bc1 100644 --- a/zinnia.spec +++ b/zinnia.spec @@ -1,6 +1,6 @@ Name: zinnia Version: 0.06 -Release: 56%{?dist} +Release: 57%{?dist} Summary: Online handwriting recognition system with machine learning License: BSD @@ -140,6 +140,9 @@ popd pushd python python3 setup.py install --root $RPM_BUILD_ROOT + +#the following line fixes RHBZ#2048104 +rm $RPM_BUILD_ROOT%{python3_sitearch}/zinnia_python-0.0.0-py%{python3_version}.egg-info pushd #remove something unnecessary @@ -191,6 +194,9 @@ chmod 0755 $RPM_BUILD_ROOT%{perl_vendorarch}/auto/%{name}/%{name}.so %{_datadir}/zinnia/model/tomoe/handwriting-zh_CN.model %changelog +* Fri Feb 11 2022 Peng Wu - 0.06-57 +- Fix RHBZ#2048104 + * Sat Jan 22 2022 Fedora Release Engineering - 0.06-56 - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild From b1635fc0703e9d8ded232cba19dc3abf3ed65574 Mon Sep 17 00:00:00 2001 From: Jitka Plesnikova Date: Mon, 30 May 2022 19:41:32 +0200 Subject: [PATCH 71/99] Perl 5.36 rebuild --- zinnia.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/zinnia.spec b/zinnia.spec index 6ee3bc1..c507e0a 100644 --- a/zinnia.spec +++ b/zinnia.spec @@ -1,6 +1,6 @@ Name: zinnia Version: 0.06 -Release: 57%{?dist} +Release: 58%{?dist} Summary: Online handwriting recognition system with machine learning License: BSD @@ -194,6 +194,9 @@ chmod 0755 $RPM_BUILD_ROOT%{perl_vendorarch}/auto/%{name}/%{name}.so %{_datadir}/zinnia/model/tomoe/handwriting-zh_CN.model %changelog +* Mon May 30 2022 Jitka Plesnikova - 0.06-58 +- Perl 5.36 rebuild + * Fri Feb 11 2022 Peng Wu - 0.06-57 - Fix RHBZ#2048104 From f5f3915c7246be9a389fe89d5ccbbff1f76a383e Mon Sep 17 00:00:00 2001 From: Python Maint Date: Mon, 13 Jun 2022 16:54:30 +0200 Subject: [PATCH 72/99] Rebuilt for Python 3.11 --- zinnia.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/zinnia.spec b/zinnia.spec index c507e0a..1aad53f 100644 --- a/zinnia.spec +++ b/zinnia.spec @@ -1,6 +1,6 @@ Name: zinnia Version: 0.06 -Release: 58%{?dist} +Release: 59%{?dist} Summary: Online handwriting recognition system with machine learning License: BSD @@ -194,6 +194,9 @@ chmod 0755 $RPM_BUILD_ROOT%{perl_vendorarch}/auto/%{name}/%{name}.so %{_datadir}/zinnia/model/tomoe/handwriting-zh_CN.model %changelog +* Mon Jun 13 2022 Python Maint - 0.06-59 +- Rebuilt for Python 3.11 + * Mon May 30 2022 Jitka Plesnikova - 0.06-58 - Perl 5.36 rebuild From f75094d8e0675a0efa0a51e1210a47cb3a540dd5 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 23 Jul 2022 13:55:44 +0000 Subject: [PATCH 73/99] Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- zinnia.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/zinnia.spec b/zinnia.spec index 1aad53f..7b592f4 100644 --- a/zinnia.spec +++ b/zinnia.spec @@ -1,6 +1,6 @@ Name: zinnia Version: 0.06 -Release: 59%{?dist} +Release: 60%{?dist} Summary: Online handwriting recognition system with machine learning License: BSD @@ -194,6 +194,9 @@ chmod 0755 $RPM_BUILD_ROOT%{perl_vendorarch}/auto/%{name}/%{name}.so %{_datadir}/zinnia/model/tomoe/handwriting-zh_CN.model %changelog +* Sat Jul 23 2022 Fedora Release Engineering - 0.06-60 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild + * Mon Jun 13 2022 Python Maint - 0.06-59 - Rebuilt for Python 3.11 From 296b0c823278ff77685ad1ab3a4e35011ee98759 Mon Sep 17 00:00:00 2001 From: Peng Wu Date: Mon, 24 Oct 2022 10:48:35 +0800 Subject: [PATCH 74/99] Add BuildRequires python3-setuptools --- zinnia.spec | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/zinnia.spec b/zinnia.spec index 7b592f4..0d9ab70 100644 --- a/zinnia.spec +++ b/zinnia.spec @@ -1,6 +1,6 @@ Name: zinnia Version: 0.06 -Release: 60%{?dist} +Release: 61%{?dist} Summary: Online handwriting recognition system with machine learning License: BSD @@ -22,6 +22,7 @@ BuildRequires: perl(ExtUtils::MakeMaker) BuildRequires: tomoe BuildRequires: autoconf BuildRequires: gnome-common +BuildRequires: python3-setuptools %description Zinnia provides a simple, customizable, and portable dynamic OCR @@ -142,7 +143,7 @@ pushd python python3 setup.py install --root $RPM_BUILD_ROOT #the following line fixes RHBZ#2048104 -rm $RPM_BUILD_ROOT%{python3_sitearch}/zinnia_python-0.0.0-py%{python3_version}.egg-info +rm -rf $RPM_BUILD_ROOT%{python3_sitearch}/zinnia_python-0.0.0-py%{python3_version}.egg-info pushd #remove something unnecessary @@ -194,6 +195,9 @@ chmod 0755 $RPM_BUILD_ROOT%{perl_vendorarch}/auto/%{name}/%{name}.so %{_datadir}/zinnia/model/tomoe/handwriting-zh_CN.model %changelog +* Mon Oct 24 2022 Peng Wu - 0.06-61 +- Add BuildRequires python3-setuptools + * Sat Jul 23 2022 Fedora Release Engineering - 0.06-60 - Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild From 23fc9170cac16dcce7133f73d74bcb4e8e86d9fc Mon Sep 17 00:00:00 2001 From: Jitka Plesnikova Date: Fri, 13 Jan 2023 21:19:14 +0100 Subject: [PATCH 75/99] Remove perl(MODULE_COMPAT), it will be replaced by generators --- zinnia.spec | 1 - 1 file changed, 1 deletion(-) diff --git a/zinnia.spec b/zinnia.spec index 0d9ab70..ed6f314 100644 --- a/zinnia.spec +++ b/zinnia.spec @@ -64,7 +64,6 @@ 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 From 5bb9fa0b964100f67ddf0569104ce446209a4595 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 21 Jan 2023 08:16:20 +0000 Subject: [PATCH 76/99] Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- zinnia.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/zinnia.spec b/zinnia.spec index ed6f314..892d507 100644 --- a/zinnia.spec +++ b/zinnia.spec @@ -1,6 +1,6 @@ Name: zinnia Version: 0.06 -Release: 61%{?dist} +Release: 62%{?dist} Summary: Online handwriting recognition system with machine learning License: BSD @@ -194,6 +194,9 @@ chmod 0755 $RPM_BUILD_ROOT%{perl_vendorarch}/auto/%{name}/%{name}.so %{_datadir}/zinnia/model/tomoe/handwriting-zh_CN.model %changelog +* Sat Jan 21 2023 Fedora Release Engineering - 0.06-62 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild + * Mon Oct 24 2022 Peng Wu - 0.06-61 - Add BuildRequires python3-setuptools From be51a72dcf367c97e579c91dac15f93dfee06aa4 Mon Sep 17 00:00:00 2001 From: Peng Wu Date: Sat, 6 May 2023 13:53:01 +0800 Subject: [PATCH 77/99] Migrate to SPDX license --- sources | 2 +- zinnia.spec | 20 ++++++++++++-------- 2 files changed, 13 insertions(+), 9 deletions(-) diff --git a/sources b/sources index 971e994..6e6cd13 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -5ed6213e2b879465783087a0cf6d5fa0 zinnia-0.06.tar.gz +SHA512 (zinnia-0.06.tar.gz) = b9a44dc3664302269c4d8481225964a3188c1921f5af7f136fdccdc452917f6ff934884e266436a0f1e0a32af19d3bea5f5e4416e694a653983039a513277b53 diff --git a/zinnia.spec b/zinnia.spec index 892d507..172ecfb 100644 --- a/zinnia.spec +++ b/zinnia.spec @@ -1,13 +1,13 @@ Name: zinnia Version: 0.06 -Release: 62%{?dist} +Release: 63%{?dist} Summary: Online handwriting recognition system with machine learning -License: BSD +License: BSD-3-Clause 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 +Source1: http://zinnia.svn.sourceforge.net/viewvc/zinnia/zinnia/tomoe2s.pl +Source2: Makefile.tomoe Patch0: zinnia-0.05-bindings.patch Patch1: zinnia-0.06-fixes-ppc-float.patch Patch2: always-store-data-in-little-endian-format.patch @@ -97,10 +97,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 +%patch -P0 -p1 -b .bindings +%patch -P1 -p1 -b .ppc +%patch -P2 -p1 -R -b .little-endian +%patch -P3 -p1 -b .gcc6 + find . -type f -name "*.pyc" -exec rm -f {} ';' cp %{SOURCE1} . cp %{SOURCE2} . @@ -194,6 +195,9 @@ chmod 0755 $RPM_BUILD_ROOT%{perl_vendorarch}/auto/%{name}/%{name}.so %{_datadir}/zinnia/model/tomoe/handwriting-zh_CN.model %changelog +* Sat May 6 2023 Peng Wu - 0.06-63 +- Migrate to SPDX license + * Sat Jan 21 2023 Fedora Release Engineering - 0.06-62 - Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild From ebb9c76b09f84cb53f38991386bef808fbe57af3 Mon Sep 17 00:00:00 2001 From: Python Maint Date: Wed, 14 Jun 2023 20:23:53 +0200 Subject: [PATCH 78/99] Rebuilt for Python 3.12 --- zinnia.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/zinnia.spec b/zinnia.spec index 172ecfb..44be3d7 100644 --- a/zinnia.spec +++ b/zinnia.spec @@ -1,6 +1,6 @@ Name: zinnia Version: 0.06 -Release: 63%{?dist} +Release: 64%{?dist} Summary: Online handwriting recognition system with machine learning License: BSD-3-Clause @@ -195,6 +195,9 @@ chmod 0755 $RPM_BUILD_ROOT%{perl_vendorarch}/auto/%{name}/%{name}.so %{_datadir}/zinnia/model/tomoe/handwriting-zh_CN.model %changelog +* Wed Jun 14 2023 Python Maint - 0.06-64 +- Rebuilt for Python 3.12 + * Sat May 6 2023 Peng Wu - 0.06-63 - Migrate to SPDX license From 91036e0fd19cd783c2c3fd38747677aa7e5b5ef0 Mon Sep 17 00:00:00 2001 From: Jitka Plesnikova Date: Tue, 11 Jul 2023 15:06:35 +0200 Subject: [PATCH 79/99] Perl 5.38 rebuild --- zinnia.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/zinnia.spec b/zinnia.spec index 44be3d7..7b018cd 100644 --- a/zinnia.spec +++ b/zinnia.spec @@ -1,6 +1,6 @@ Name: zinnia Version: 0.06 -Release: 64%{?dist} +Release: 65%{?dist} Summary: Online handwriting recognition system with machine learning License: BSD-3-Clause @@ -195,6 +195,9 @@ chmod 0755 $RPM_BUILD_ROOT%{perl_vendorarch}/auto/%{name}/%{name}.so %{_datadir}/zinnia/model/tomoe/handwriting-zh_CN.model %changelog +* Tue Jul 11 2023 Jitka Plesnikova - 0.06-65 +- Perl 5.38 rebuild + * Wed Jun 14 2023 Python Maint - 0.06-64 - Rebuilt for Python 3.12 From 5a5a4a0924804c192d440b62686d2fac3af98d03 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 22 Jul 2023 19:42:34 +0000 Subject: [PATCH 80/99] Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- zinnia.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/zinnia.spec b/zinnia.spec index 7b018cd..f1d86d4 100644 --- a/zinnia.spec +++ b/zinnia.spec @@ -1,6 +1,6 @@ Name: zinnia Version: 0.06 -Release: 65%{?dist} +Release: 66%{?dist} Summary: Online handwriting recognition system with machine learning License: BSD-3-Clause @@ -195,6 +195,9 @@ chmod 0755 $RPM_BUILD_ROOT%{perl_vendorarch}/auto/%{name}/%{name}.so %{_datadir}/zinnia/model/tomoe/handwriting-zh_CN.model %changelog +* Sat Jul 22 2023 Fedora Release Engineering - 0.06-66 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild + * Tue Jul 11 2023 Jitka Plesnikova - 0.06-65 - Perl 5.38 rebuild From ff2121e637b2bd4e9d27fe8db28e360017b12b10 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 27 Jan 2024 11:07:38 +0000 Subject: [PATCH 81/99] Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild --- zinnia.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/zinnia.spec b/zinnia.spec index f1d86d4..077e197 100644 --- a/zinnia.spec +++ b/zinnia.spec @@ -1,6 +1,6 @@ Name: zinnia Version: 0.06 -Release: 66%{?dist} +Release: 67%{?dist} Summary: Online handwriting recognition system with machine learning License: BSD-3-Clause @@ -195,6 +195,9 @@ chmod 0755 $RPM_BUILD_ROOT%{perl_vendorarch}/auto/%{name}/%{name}.so %{_datadir}/zinnia/model/tomoe/handwriting-zh_CN.model %changelog +* Sat Jan 27 2024 Fedora Release Engineering - 0.06-67 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + * Sat Jul 22 2023 Fedora Release Engineering - 0.06-66 - Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild From 00134ca92377da80f74f0e075d87574ea15060dc Mon Sep 17 00:00:00 2001 From: Python Maint Date: Fri, 7 Jun 2024 10:33:12 +0200 Subject: [PATCH 82/99] Rebuilt for Python 3.13 --- zinnia.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/zinnia.spec b/zinnia.spec index 077e197..5be5177 100644 --- a/zinnia.spec +++ b/zinnia.spec @@ -1,6 +1,6 @@ Name: zinnia Version: 0.06 -Release: 67%{?dist} +Release: 68%{?dist} Summary: Online handwriting recognition system with machine learning License: BSD-3-Clause @@ -195,6 +195,9 @@ chmod 0755 $RPM_BUILD_ROOT%{perl_vendorarch}/auto/%{name}/%{name}.so %{_datadir}/zinnia/model/tomoe/handwriting-zh_CN.model %changelog +* Fri Jun 07 2024 Python Maint - 0.06-68 +- Rebuilt for Python 3.13 + * Sat Jan 27 2024 Fedora Release Engineering - 0.06-67 - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild From c8bccd87247206e14aec77855c0f49601bd0cd5c Mon Sep 17 00:00:00 2001 From: Jitka Plesnikova Date: Wed, 12 Jun 2024 13:05:40 +0200 Subject: [PATCH 83/99] Perl 5.40 rebuild --- zinnia.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/zinnia.spec b/zinnia.spec index 5be5177..f56cdfe 100644 --- a/zinnia.spec +++ b/zinnia.spec @@ -1,6 +1,6 @@ Name: zinnia Version: 0.06 -Release: 68%{?dist} +Release: 69%{?dist} Summary: Online handwriting recognition system with machine learning License: BSD-3-Clause @@ -195,6 +195,9 @@ chmod 0755 $RPM_BUILD_ROOT%{perl_vendorarch}/auto/%{name}/%{name}.so %{_datadir}/zinnia/model/tomoe/handwriting-zh_CN.model %changelog +* Wed Jun 12 2024 Jitka Plesnikova - 0.06-69 +- Perl 5.40 rebuild + * Fri Jun 07 2024 Python Maint - 0.06-68 - Rebuilt for Python 3.13 From 4fa4945f1f1054885d7e5cb2788922f5bcf27b85 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 20 Jul 2024 10:52:50 +0000 Subject: [PATCH 84/99] Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild --- zinnia.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/zinnia.spec b/zinnia.spec index f56cdfe..92dea88 100644 --- a/zinnia.spec +++ b/zinnia.spec @@ -1,6 +1,6 @@ Name: zinnia Version: 0.06 -Release: 69%{?dist} +Release: 70%{?dist} Summary: Online handwriting recognition system with machine learning License: BSD-3-Clause @@ -195,6 +195,9 @@ chmod 0755 $RPM_BUILD_ROOT%{perl_vendorarch}/auto/%{name}/%{name}.so %{_datadir}/zinnia/model/tomoe/handwriting-zh_CN.model %changelog +* Sat Jul 20 2024 Fedora Release Engineering - 0.06-70 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild + * Wed Jun 12 2024 Jitka Plesnikova - 0.06-69 - Perl 5.40 rebuild From 41022e56808601e39620989917604915eb8c9d97 Mon Sep 17 00:00:00 2001 From: Peng Wu Date: Wed, 30 Oct 2024 13:31:57 +0800 Subject: [PATCH 85/99] Fix build --- zinnia-fixes-python-setuptools.patch | 12 ++++++++++++ zinnia.spec | 10 ++++++++-- 2 files changed, 20 insertions(+), 2 deletions(-) create mode 100644 zinnia-fixes-python-setuptools.patch diff --git a/zinnia-fixes-python-setuptools.patch b/zinnia-fixes-python-setuptools.patch new file mode 100644 index 0000000..4a9e69e --- /dev/null +++ b/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"]) + ]) diff --git a/zinnia.spec b/zinnia.spec index 92dea88..060a964 100644 --- a/zinnia.spec +++ b/zinnia.spec @@ -1,6 +1,6 @@ Name: zinnia Version: 0.06 -Release: 70%{?dist} +Release: 71%{?dist} Summary: Online handwriting recognition system with machine learning License: BSD-3-Clause @@ -12,6 +12,7 @@ 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 +Patch4: zinnia-fixes-python-setuptools.patch BuildRequires: make BuildRequires: gcc-c++ BuildRequires: libdb-devel, python3-devel @@ -101,6 +102,7 @@ This package contains Simplified Chinese tomoe model files for %{name}. %patch -P1 -p1 -b .ppc %patch -P2 -p1 -R -b .little-endian %patch -P3 -p1 -b .gcc6 +%patch -P4 -p1 -b .python find . -type f -name "*.pyc" -exec rm -f {} ';' cp %{SOURCE1} . @@ -127,7 +129,7 @@ make %{?_smp_mflags} popd pushd python -CFLAGS="$RPM_OPT_FLAGS -I../" LDFLAGS="$RPM_LD_FLAGS -L../.libs" python3 setup.py build +python3 setup.py build popd %install @@ -195,6 +197,10 @@ chmod 0755 $RPM_BUILD_ROOT%{perl_vendorarch}/auto/%{name}/%{name}.so %{_datadir}/zinnia/model/tomoe/handwriting-zh_CN.model %changelog +* Wed Oct 30 2024 Peng Wu - 0.06-71 +- Fix build +- Resolves: RHBZ#2319752 + * Sat Jul 20 2024 Fedora Release Engineering - 0.06-70 - Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild From 1f5de8ba5e52e2c0ef55baf3f47e929c6d3cc0fe Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sun, 19 Jan 2025 16:47:01 +0000 Subject: [PATCH 86/99] Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild --- zinnia.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/zinnia.spec b/zinnia.spec index 060a964..025a322 100644 --- a/zinnia.spec +++ b/zinnia.spec @@ -1,6 +1,6 @@ Name: zinnia Version: 0.06 -Release: 71%{?dist} +Release: 72%{?dist} Summary: Online handwriting recognition system with machine learning License: BSD-3-Clause @@ -197,6 +197,9 @@ chmod 0755 $RPM_BUILD_ROOT%{perl_vendorarch}/auto/%{name}/%{name}.so %{_datadir}/zinnia/model/tomoe/handwriting-zh_CN.model %changelog +* Sun Jan 19 2025 Fedora Release Engineering - 0.06-72 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild + * Wed Oct 30 2024 Peng Wu - 0.06-71 - Fix build - Resolves: RHBZ#2319752 From 2c1e5be786f8fa7d2752e1132d6138ffcac7ba1e Mon Sep 17 00:00:00 2001 From: Peng Wu Date: Wed, 3 Nov 2021 15:04:42 +0800 Subject: [PATCH 87/99] Update to 0.07 --- .gitignore | 1 + sources | 2 +- zinnia-fixes-divide-by-zero.patch | 15 +++++++++++++++ zinnia.spec | 19 ++++++++++--------- 4 files changed, 27 insertions(+), 10 deletions(-) create mode 100644 zinnia-fixes-divide-by-zero.patch diff --git a/.gitignore b/.gitignore index 32f1f0e..732f5f7 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ zinnia-0.06.tar.gz +/zinnia-0.07.tar.gz diff --git a/sources b/sources index 6e6cd13..9a5678d 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (zinnia-0.06.tar.gz) = b9a44dc3664302269c4d8481225964a3188c1921f5af7f136fdccdc452917f6ff934884e266436a0f1e0a32af19d3bea5f5e4416e694a653983039a513277b53 +SHA512 (zinnia-0.07.tar.gz) = f214938953be093e37735a24dd5d2e899e02572202f9b316de566ddeb65451b2a13becb84f95c74f6e5ceadb83bbbcfea3434e974393cb569c65896249002280 diff --git a/zinnia-fixes-divide-by-zero.patch b/zinnia-fixes-divide-by-zero.patch new file mode 100644 index 0000000..0950ceb --- /dev/null +++ b/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(last->y * first->x) + - static_cast(last->x * first->y); + diff --git a/zinnia.spec b/zinnia.spec index 025a322..0fa8a61 100644 --- a/zinnia.spec +++ b/zinnia.spec @@ -1,18 +1,17 @@ Name: zinnia -Version: 0.06 -Release: 72%{?dist} +Version: 0.07 +Release: 1%{?dist} Summary: Online handwriting recognition system with machine learning License: BSD-3-Clause -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 +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 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 Patch4: zinnia-fixes-python-setuptools.patch +Patch5: zinnia-fixes-divide-by-zero.patch BuildRequires: make BuildRequires: gcc-c++ BuildRequires: libdb-devel, python3-devel @@ -99,10 +98,9 @@ This package contains Simplified Chinese tomoe model files for %{name}. %prep %setup -q -n %{name}-%{version} %patch -P0 -p1 -b .bindings -%patch -P1 -p1 -b .ppc %patch -P2 -p1 -R -b .little-endian -%patch -P3 -p1 -b .gcc6 %patch -P4 -p1 -b .python +%patch -P5 -p1 -b .divide-by-zero find . -type f -name "*.pyc" -exec rm -f {} ';' cp %{SOURCE1} . @@ -197,6 +195,9 @@ chmod 0755 $RPM_BUILD_ROOT%{perl_vendorarch}/auto/%{name}/%{name}.so %{_datadir}/zinnia/model/tomoe/handwriting-zh_CN.model %changelog +* Mon Apr 14 2025 Peng Wu - 0.07-1 +- Update to 0.07 + * Sun Jan 19 2025 Fedora Release Engineering - 0.06-72 - Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild From 8b2b73de4783861c00730d799b1711e163641662 Mon Sep 17 00:00:00 2001 From: Python Maint Date: Mon, 2 Jun 2025 22:22:44 +0200 Subject: [PATCH 88/99] Rebuilt for Python 3.14 --- zinnia.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/zinnia.spec b/zinnia.spec index 0fa8a61..40cd13b 100644 --- a/zinnia.spec +++ b/zinnia.spec @@ -1,6 +1,6 @@ Name: zinnia Version: 0.07 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Online handwriting recognition system with machine learning License: BSD-3-Clause @@ -195,6 +195,9 @@ chmod 0755 $RPM_BUILD_ROOT%{perl_vendorarch}/auto/%{name}/%{name}.so %{_datadir}/zinnia/model/tomoe/handwriting-zh_CN.model %changelog +* Mon Jun 02 2025 Python Maint - 0.07-2 +- Rebuilt for Python 3.14 + * Mon Apr 14 2025 Peng Wu - 0.07-1 - Update to 0.07 From eca6b38a02058528051a6edebc0acbe14838b68e Mon Sep 17 00:00:00 2001 From: Jitka Plesnikova Date: Mon, 7 Jul 2025 16:07:37 +0200 Subject: [PATCH 89/99] Perl 5.42 rebuild --- zinnia.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/zinnia.spec b/zinnia.spec index 40cd13b..30d6696 100644 --- a/zinnia.spec +++ b/zinnia.spec @@ -1,6 +1,6 @@ Name: zinnia Version: 0.07 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Online handwriting recognition system with machine learning License: BSD-3-Clause @@ -195,6 +195,9 @@ chmod 0755 $RPM_BUILD_ROOT%{perl_vendorarch}/auto/%{name}/%{name}.so %{_datadir}/zinnia/model/tomoe/handwriting-zh_CN.model %changelog +* Mon Jul 07 2025 Jitka Plesnikova - 0.07-3 +- Perl 5.42 rebuild + * Mon Jun 02 2025 Python Maint - 0.07-2 - Rebuilt for Python 3.14 From e7a9129084c027196895064aeef1eb0ae0fff083 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 25 Jul 2025 21:18:40 +0000 Subject: [PATCH 90/99] Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild --- zinnia.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/zinnia.spec b/zinnia.spec index 30d6696..478f59b 100644 --- a/zinnia.spec +++ b/zinnia.spec @@ -1,6 +1,6 @@ Name: zinnia Version: 0.07 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Online handwriting recognition system with machine learning License: BSD-3-Clause @@ -195,6 +195,9 @@ chmod 0755 $RPM_BUILD_ROOT%{perl_vendorarch}/auto/%{name}/%{name}.so %{_datadir}/zinnia/model/tomoe/handwriting-zh_CN.model %changelog +* Fri Jul 25 2025 Fedora Release Engineering - 0.07-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild + * Mon Jul 07 2025 Jitka Plesnikova - 0.07-3 - Perl 5.42 rebuild From f1edc79b900eab058b575a4906a696fb4d799022 Mon Sep 17 00:00:00 2001 From: Peng Wu Date: Fri, 25 Jul 2025 14:31:13 +0800 Subject: [PATCH 91/99] Update for https://fedoraproject.org/wiki/Changes/DeprecateSetuppyMacros --- requirements.txt | 2 ++ zinnia.spec | 31 +++++++++++++++++-------------- 2 files changed, 19 insertions(+), 14 deletions(-) create mode 100644 requirements.txt diff --git a/requirements.txt b/requirements.txt new file mode 100644 index 0000000..923f026 --- /dev/null +++ b/requirements.txt @@ -0,0 +1,2 @@ +pip +setuptools diff --git a/zinnia.spec b/zinnia.spec index 478f59b..301d7d8 100644 --- a/zinnia.spec +++ b/zinnia.spec @@ -1,6 +1,6 @@ Name: zinnia Version: 0.07 -Release: 4%{?dist} +Release: 5%{?dist} Summary: Online handwriting recognition system with machine learning License: BSD-3-Clause @@ -8,6 +8,7 @@ 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 Patch2: always-store-data-in-little-endian-format.patch Patch4: zinnia-fixes-python-setuptools.patch @@ -22,7 +23,6 @@ BuildRequires: perl(ExtUtils::MakeMaker) BuildRequires: tomoe BuildRequires: autoconf BuildRequires: gnome-common -BuildRequires: python3-setuptools %description Zinnia provides a simple, customizable, and portable dynamic OCR @@ -70,7 +70,6 @@ Requires: %{name} = %{version}-%{release} 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} @@ -115,6 +114,9 @@ pushd swig make python popd +%generate_buildrequires +%pyproject_buildrequires -N %{SOURCE3} + %build gnome-autogen.sh %configure --disable-static --disable-rpath @@ -127,7 +129,7 @@ make %{?_smp_mflags} popd pushd python -python3 setup.py build +%pyproject_wheel popd %install @@ -140,10 +142,8 @@ make pure_install PERL_INSTALL_ROOT=$RPM_BUILD_ROOT popd pushd python -python3 setup.py install --root $RPM_BUILD_ROOT - -#the following line fixes RHBZ#2048104 -rm -rf $RPM_BUILD_ROOT%{python3_sitearch}/zinnia_python-0.0.0-py%{python3_version}.egg-info +%pyproject_install +%pyproject_save_files '%{name}*' _%{name} pushd #remove something unnecessary @@ -155,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 @@ -181,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/ @@ -195,6 +194,10 @@ chmod 0755 $RPM_BUILD_ROOT%{perl_vendorarch}/auto/%{name}/%{name}.so %{_datadir}/zinnia/model/tomoe/handwriting-zh_CN.model %changelog +* Fri Jul 25 2025 Peng Wu - 0.07-4 +- Update for https://fedoraproject.org/wiki/Changes/DeprecateSetuppyMacros +- Resolves: RHBZ#2378641 + * Fri Jul 25 2025 Fedora Release Engineering - 0.07-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild From ccf48fa15cff48df24c61a21e5475f9a9d4eb3f4 Mon Sep 17 00:00:00 2001 From: Python Maint Date: Fri, 15 Aug 2025 15:23:52 +0200 Subject: [PATCH 92/99] Rebuilt for Python 3.14.0rc2 bytecode --- zinnia.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/zinnia.spec b/zinnia.spec index 301d7d8..430c41c 100644 --- a/zinnia.spec +++ b/zinnia.spec @@ -1,6 +1,6 @@ Name: zinnia Version: 0.07 -Release: 5%{?dist} +Release: 6%{?dist} Summary: Online handwriting recognition system with machine learning License: BSD-3-Clause @@ -194,6 +194,9 @@ export LD_LIBRARY_PATH=%{buildroot}/%{_libdir} %{_datadir}/zinnia/model/tomoe/handwriting-zh_CN.model %changelog +* Fri Aug 15 2025 Python Maint - 0.07-6 +- Rebuilt for Python 3.14.0rc2 bytecode + * Fri Jul 25 2025 Peng Wu - 0.07-4 - Update for https://fedoraproject.org/wiki/Changes/DeprecateSetuppyMacros - Resolves: RHBZ#2378641 From 1251d378e857dac0b8777349087053724939ecd2 Mon Sep 17 00:00:00 2001 From: Python Maint Date: Fri, 19 Sep 2025 15:04:36 +0200 Subject: [PATCH 93/99] Rebuilt for Python 3.14.0rc3 bytecode --- zinnia.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/zinnia.spec b/zinnia.spec index 430c41c..289d3e0 100644 --- a/zinnia.spec +++ b/zinnia.spec @@ -1,6 +1,6 @@ Name: zinnia Version: 0.07 -Release: 6%{?dist} +Release: 7%{?dist} Summary: Online handwriting recognition system with machine learning License: BSD-3-Clause @@ -194,6 +194,9 @@ export LD_LIBRARY_PATH=%{buildroot}/%{_libdir} %{_datadir}/zinnia/model/tomoe/handwriting-zh_CN.model %changelog +* Fri Sep 19 2025 Python Maint - 0.07-7 +- Rebuilt for Python 3.14.0rc3 bytecode + * Fri Aug 15 2025 Python Maint - 0.07-6 - Rebuilt for Python 3.14.0rc2 bytecode From 6dfcea70a3ff6163ca716f0151809a28f2c841a2 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 17 Jan 2026 21:08:35 +0000 Subject: [PATCH 94/99] Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild --- zinnia.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/zinnia.spec b/zinnia.spec index 289d3e0..14be45f 100644 --- a/zinnia.spec +++ b/zinnia.spec @@ -1,6 +1,6 @@ Name: zinnia Version: 0.07 -Release: 7%{?dist} +Release: 8%{?dist} Summary: Online handwriting recognition system with machine learning License: BSD-3-Clause @@ -194,6 +194,9 @@ export LD_LIBRARY_PATH=%{buildroot}/%{_libdir} %{_datadir}/zinnia/model/tomoe/handwriting-zh_CN.model %changelog +* Sat Jan 17 2026 Fedora Release Engineering - 0.07-8 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild + * Fri Sep 19 2025 Python Maint - 0.07-7 - Rebuilt for Python 3.14.0rc3 bytecode From 18d899e64e399f6e9c1701046ae062d07574293e Mon Sep 17 00:00:00 2001 From: Python Maint Date: Wed, 3 Jun 2026 21:57:27 +0200 Subject: [PATCH 95/99] Rebuilt for Python 3.15 --- zinnia.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/zinnia.spec b/zinnia.spec index 14be45f..f094de7 100644 --- a/zinnia.spec +++ b/zinnia.spec @@ -1,6 +1,6 @@ Name: zinnia Version: 0.07 -Release: 8%{?dist} +Release: 9%{?dist} Summary: Online handwriting recognition system with machine learning License: BSD-3-Clause @@ -194,6 +194,9 @@ export LD_LIBRARY_PATH=%{buildroot}/%{_libdir} %{_datadir}/zinnia/model/tomoe/handwriting-zh_CN.model %changelog +* Wed Jun 03 2026 Python Maint - 0.07-9 +- Rebuilt for Python 3.15 + * Sat Jan 17 2026 Fedora Release Engineering - 0.07-8 - Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild From 52dce7dceffd01e1296e609a4a8b80c8b25ba90b Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 17 Jul 2026 09:40:58 +0000 Subject: [PATCH 96/99] Rebuilt for https://fedoraproject.org/wiki/Fedora_45_Mass_Rebuild --- zinnia.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/zinnia.spec b/zinnia.spec index f094de7..8bbd982 100644 --- a/zinnia.spec +++ b/zinnia.spec @@ -1,6 +1,6 @@ Name: zinnia Version: 0.07 -Release: 9%{?dist} +Release: 10%{?dist} Summary: Online handwriting recognition system with machine learning License: BSD-3-Clause @@ -194,6 +194,9 @@ export LD_LIBRARY_PATH=%{buildroot}/%{_libdir} %{_datadir}/zinnia/model/tomoe/handwriting-zh_CN.model %changelog +* Fri Jul 17 2026 Fedora Release Engineering - 0.07-10 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_45_Mass_Rebuild + * Wed Jun 03 2026 Python Maint - 0.07-9 - Rebuilt for Python 3.15 From 89906a5a0a9c30e1bdee454855df01681a71d7f0 Mon Sep 17 00:00:00 2001 From: Python Maint Date: Wed, 22 Jul 2026 10:16:00 +0200 Subject: [PATCH 97/99] Rebuilt for Python 3.15.0b4 ABI change --- zinnia.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/zinnia.spec b/zinnia.spec index 8bbd982..58b3a61 100644 --- a/zinnia.spec +++ b/zinnia.spec @@ -1,6 +1,6 @@ Name: zinnia Version: 0.07 -Release: 10%{?dist} +Release: 11%{?dist} Summary: Online handwriting recognition system with machine learning License: BSD-3-Clause @@ -194,6 +194,9 @@ export LD_LIBRARY_PATH=%{buildroot}/%{_libdir} %{_datadir}/zinnia/model/tomoe/handwriting-zh_CN.model %changelog +* Wed Jul 22 2026 Python Maint - 0.07-11 +- Rebuilt for Python 3.15.0b4 ABI change + * Fri Jul 17 2026 Fedora Release Engineering - 0.07-10 - Rebuilt for https://fedoraproject.org/wiki/Fedora_45_Mass_Rebuild From 6ee4963ab415822ce5224cb1ace907975c6e50ed Mon Sep 17 00:00:00 2001 From: Jitka Plesnikova Date: Thu, 23 Jul 2026 17:32:55 +0200 Subject: [PATCH 98/99] Perl 5.44 rebuild --- zinnia.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/zinnia.spec b/zinnia.spec index 58b3a61..9668d11 100644 --- a/zinnia.spec +++ b/zinnia.spec @@ -1,6 +1,6 @@ Name: zinnia Version: 0.07 -Release: 11%{?dist} +Release: 12%{?dist} Summary: Online handwriting recognition system with machine learning License: BSD-3-Clause @@ -194,6 +194,9 @@ export LD_LIBRARY_PATH=%{buildroot}/%{_libdir} %{_datadir}/zinnia/model/tomoe/handwriting-zh_CN.model %changelog +* Thu Jul 23 2026 Jitka Plesnikova - 0.07-12 +- Perl 5.44 rebuild + * Wed Jul 22 2026 Python Maint - 0.07-11 - Rebuilt for Python 3.15.0b4 ABI change From ff85a7ea9ebc8b39f628e1f41274d98235ddfcbf Mon Sep 17 00:00:00 2001 From: Python Maint Date: Fri, 24 Jul 2026 12:56:59 +0200 Subject: [PATCH 99/99] Rebuilt for Python 3.15.0b4 ABI change --- zinnia.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/zinnia.spec b/zinnia.spec index 9668d11..cc9c4eb 100644 --- a/zinnia.spec +++ b/zinnia.spec @@ -1,6 +1,6 @@ Name: zinnia Version: 0.07 -Release: 12%{?dist} +Release: 13%{?dist} Summary: Online handwriting recognition system with machine learning License: BSD-3-Clause @@ -194,6 +194,9 @@ export LD_LIBRARY_PATH=%{buildroot}/%{_libdir} %{_datadir}/zinnia/model/tomoe/handwriting-zh_CN.model %changelog +* Fri Jul 24 2026 Python Maint - 0.07-13 +- Rebuilt for Python 3.15.0b4 ABI change + * Thu Jul 23 2026 Jitka Plesnikova - 0.07-12 - Perl 5.44 rebuild