From 76753c237fabb142eb48ee582d521fd2d30a4853 Mon Sep 17 00:00:00 2001 From: Gwyn Ciesla Date: Wed, 21 Dec 2022 11:15:25 -0600 Subject: [PATCH 01/25] BR setuptools. --- zbar.spec | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/zbar.spec b/zbar.spec index 1041c3d..37b687a 100644 --- a/zbar.spec +++ b/zbar.spec @@ -34,6 +34,7 @@ BuildRequires: xmlto BuildRequires: java-11-openjdk-devel %endif BuildRequires: python3-devel +BuildRequires: python3-setuptools %description ZBar Bar Code Reader is an open source software suite for reading bar @@ -214,6 +215,9 @@ rm -rf $RPM_BUILD_ROOT/usr/share/doc/zbar-%{version}/ %{_docdir}/test_python.py %changelog +* Wed Dec 21 2022 Gwyn Ciesla - 0.23.90-6 +- BR setuptools + * Fri Aug 26 2022 Kalev Lember - 0.23.90-5 - Misc packaging cleanup - Sort BuildRequires and Requires and split them out one per line From 239937f7f08e6883a23db2703ac998de833fb469 Mon Sep 17 00:00:00 2001 From: Gwyn Ciesla Date: Wed, 21 Dec 2022 11:16:10 -0600 Subject: [PATCH 02/25] Bump Release --- zbar.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/zbar.spec b/zbar.spec index 37b687a..f383d86 100644 --- a/zbar.spec +++ b/zbar.spec @@ -6,7 +6,7 @@ Name: zbar Version: 0.23.90 -Release: 5%{?dist} +Release: 6%{?dist} Summary: Bar code reader License: LGPLv2+ From d9ab6bd4650afa858477bf918ea847d83b58f2d0 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 21 Jan 2023 08:12:47 +0000 Subject: [PATCH 03/25] Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- zbar.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/zbar.spec b/zbar.spec index f383d86..75e4174 100644 --- a/zbar.spec +++ b/zbar.spec @@ -6,7 +6,7 @@ Name: zbar Version: 0.23.90 -Release: 6%{?dist} +Release: 7%{?dist} Summary: Bar code reader License: LGPLv2+ @@ -215,6 +215,9 @@ rm -rf $RPM_BUILD_ROOT/usr/share/doc/zbar-%{version}/ %{_docdir}/test_python.py %changelog +* Sat Jan 21 2023 Fedora Release Engineering - 0.23.90-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild + * Wed Dec 21 2022 Gwyn Ciesla - 0.23.90-6 - BR setuptools From ee527c11101bbb9e6689b8af26d65ceed695a1c0 Mon Sep 17 00:00:00 2001 From: Gwyn Ciesla Date: Wed, 1 Mar 2023 12:37:28 -0600 Subject: [PATCH 04/25] migrated to SPDX license --- zbar.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/zbar.spec b/zbar.spec index 75e4174..1f0916f 100644 --- a/zbar.spec +++ b/zbar.spec @@ -6,10 +6,10 @@ Name: zbar Version: 0.23.90 -Release: 7%{?dist} +Release: 8%{?dist} Summary: Bar code reader -License: LGPLv2+ +License: LGPL-2.1-or-later URL: http://zbar.sourceforge.net/ Source0: https://linuxtv.org/downloads/%{name}/%{name}-%{version}.tar.bz2 Patch0: use_python3_on_python_script.patch @@ -215,6 +215,9 @@ rm -rf $RPM_BUILD_ROOT/usr/share/doc/zbar-%{version}/ %{_docdir}/test_python.py %changelog +* Wed Mar 01 2023 Gwyn Ciesla - 0.23.90-8 +- migrated to SPDX license + * Sat Jan 21 2023 Fedora Release Engineering - 0.23.90-7 - Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild From 50012aaeefc846a0b8ec402edd8734ea3f27847d Mon Sep 17 00:00:00 2001 From: Yaakov Selkowitz Date: Sun, 30 Apr 2023 02:54:38 -0400 Subject: [PATCH 05/25] Fix flatpak build Flatpaks are built in /app prefix instead of /usr. --- zbar.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/zbar.spec b/zbar.spec index 1f0916f..8be31b3 100644 --- a/zbar.spec +++ b/zbar.spec @@ -122,7 +122,7 @@ on Java Native Interface (JNI) applications using ZBar. %patch1 -p0 %build -%configure --with-python=python3 --with-gtk=auto --docdir=%{_docdir}/%{name}-%{version} --with-graphicsmagick --without-xshm --without-xv --enable-codes=ean,databar,code128,code93,code39,codabar,i25,qrcode,sqcode,pdf417 +%configure --with-python=python3 --with-gtk=auto --with-dbusconfdir=%{_sysconfdir} --docdir=%{_docdir}/%{name}-%{version} --with-graphicsmagick --without-xshm --without-xv --enable-codes=ean,databar,code128,code93,code39,codabar,i25,qrcode,sqcode,pdf417 # rpath sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool @@ -143,7 +143,7 @@ cp test/test_python.py %{buildroot}%{_docdir} find ${RPM_BUILD_ROOT} -name '*.la' -or -name '*.a' | xargs rm -f # Remove installed doc -rm -rf $RPM_BUILD_ROOT/usr/share/doc/zbar-%{version}/ +rm -rf $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}/ %ldconfig_scriptlets From 267ec547c2ed495c672d5628d7a6eda9359d60cf Mon Sep 17 00:00:00 2001 From: Python Maint Date: Thu, 15 Jun 2023 17:00:48 +0200 Subject: [PATCH 06/25] Rebuilt for Python 3.12 --- zbar.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/zbar.spec b/zbar.spec index 8be31b3..8905f8b 100644 --- a/zbar.spec +++ b/zbar.spec @@ -6,7 +6,7 @@ Name: zbar Version: 0.23.90 -Release: 8%{?dist} +Release: 9%{?dist} Summary: Bar code reader License: LGPL-2.1-or-later @@ -215,6 +215,9 @@ rm -rf $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}/ %{_docdir}/test_python.py %changelog +* Thu Jun 15 2023 Python Maint - 0.23.90-9 +- Rebuilt for Python 3.12 + * Wed Mar 01 2023 Gwyn Ciesla - 0.23.90-8 - migrated to SPDX license From d5b34494c9c59c4855461b2319facc99defebef2 Mon Sep 17 00:00:00 2001 From: Michael J Gruber Date: Fri, 7 Jul 2023 11:37:10 +0200 Subject: [PATCH 07/25] Fix FTBFS with python 3.12 (rhbz#2220630) --- py312.patch | 26 ++++++++++++++++++++++++++ zbar.spec | 11 ++++++++--- 2 files changed, 34 insertions(+), 3 deletions(-) create mode 100644 py312.patch diff --git a/py312.patch b/py312.patch new file mode 100644 index 0000000..77e51fa --- /dev/null +++ b/py312.patch @@ -0,0 +1,26 @@ +--- python/enum.c~ 2023-07-07 11:08:43.137150103 +0200 ++++ python/enum.c 2023-07-07 11:24:06.010655717 +0200 +@@ -59,7 +59,11 @@ + /* we assume the "fast path" for a single-digit ints (see longobject.c) */ + /* this also holds if we get a small_int preallocated long */ + Py_SET_SIZE(&self->val, longval); ++#if PY_MINOR_VERSION >= 12 ++ self->val.long_value.ob_digit[0] = longval->long_value.ob_digit[0]; ++#else + self->val.ob_digit[0] = longval->ob_digit[0]; ++#endif + Py_DECREF(longval); + #else + self->val.ob_ival = val; +@@ -150,7 +154,11 @@ + /* we assume the "fast path" for a single-digit ints (see longobject.c) */ + /* this also holds if we get a small_int preallocated long */ + Py_SET_SIZE(&self->val, longval); ++#if PY_MINOR_VERSION >= 12 ++ self->val.long_value.ob_digit[0] = longval->long_value.ob_digit[0]; ++#else + self->val.ob_digit[0] = longval->ob_digit[0]; ++#endif + Py_DECREF(longval); + + self->name = PyUnicode_FromString(name); diff --git a/zbar.spec b/zbar.spec index 8905f8b..719c8d2 100644 --- a/zbar.spec +++ b/zbar.spec @@ -6,7 +6,7 @@ Name: zbar Version: 0.23.90 -Release: 9%{?dist} +Release: 10%{?dist} Summary: Bar code reader License: LGPL-2.1-or-later @@ -14,6 +14,7 @@ URL: http://zbar.sourceforge.net/ Source0: https://linuxtv.org/downloads/%{name}/%{name}-%{version}.tar.bz2 Patch0: use_python3_on_python_script.patch Patch1: py311.patch +Patch2: py312.patch BuildRequires: autoconf BuildRequires: automake @@ -118,8 +119,9 @@ on Java Native Interface (JNI) applications using ZBar. %prep %setup -q -%patch0 -p1 -%patch1 -p0 +%patch 0 -p1 +%patch 1 -p0 +%patch 2 -p0 %build %configure --with-python=python3 --with-gtk=auto --with-dbusconfdir=%{_sysconfdir} --docdir=%{_docdir}/%{name}-%{version} --with-graphicsmagick --without-xshm --without-xv --enable-codes=ean,databar,code128,code93,code39,codabar,i25,qrcode,sqcode,pdf417 @@ -215,6 +217,9 @@ rm -rf $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}/ %{_docdir}/test_python.py %changelog +* Fri Jul 07 2023 Michael J Gruber - 0.23.90-10 +- Fix FTBFS with python 3.12 (rhbz#2220630) + * Thu Jun 15 2023 Python Maint - 0.23.90-9 - Rebuilt for Python 3.12 From 8304c4ae98a7366ee455fe15987e53b4b566dd13 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 22 Jul 2023 19:38:07 +0000 Subject: [PATCH 08/25] Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- zbar.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/zbar.spec b/zbar.spec index 719c8d2..eda343a 100644 --- a/zbar.spec +++ b/zbar.spec @@ -6,7 +6,7 @@ Name: zbar Version: 0.23.90 -Release: 10%{?dist} +Release: 11%{?dist} Summary: Bar code reader License: LGPL-2.1-or-later @@ -217,6 +217,9 @@ rm -rf $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}/ %{_docdir}/test_python.py %changelog +* Sat Jul 22 2023 Fedora Release Engineering - 0.23.90-11 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild + * Fri Jul 07 2023 Michael J Gruber - 0.23.90-10 - Fix FTBFS with python 3.12 (rhbz#2220630) From 107c91c11fd40f9b0d99f02f2bd767df38f99491 Mon Sep 17 00:00:00 2001 From: Florian Weimer Date: Fri, 5 Jan 2024 12:47:58 +0100 Subject: [PATCH 09/25] Add missing Py_SIZE to py311.patch --- py311.patch | 4 ++-- py312.patch | 4 ++-- zbar.spec | 5 ++++- 3 files changed, 8 insertions(+), 5 deletions(-) diff --git a/py311.patch b/py311.patch index 6977d95..1c047a5 100644 --- a/py311.patch +++ b/py311.patch @@ -20,7 +20,7 @@ /* we assume the "fast path" for a single-digit ints (see longobject.c) */ /* this also holds if we get a small_int preallocated long */ - Py_SIZE(&self->val) = Py_SIZE(longval); -+ Py_SET_SIZE(&self->val, longval); ++ Py_SET_SIZE(&self->val, Py_SIZE(longval)); self->val.ob_digit[0] = longval->ob_digit[0]; Py_DECREF(longval); #else @@ -29,7 +29,7 @@ /* we assume the "fast path" for a single-digit ints (see longobject.c) */ /* this also holds if we get a small_int preallocated long */ - Py_SIZE(&self->val) = Py_SIZE(longval); -+ Py_SET_SIZE(&self->val, longval); ++ Py_SET_SIZE(&self->val, Py_SIZE(longval)); self->val.ob_digit[0] = longval->ob_digit[0]; Py_DECREF(longval); diff --git a/py312.patch b/py312.patch index 77e51fa..9999cb6 100644 --- a/py312.patch +++ b/py312.patch @@ -3,7 +3,7 @@ @@ -59,7 +59,11 @@ /* we assume the "fast path" for a single-digit ints (see longobject.c) */ /* this also holds if we get a small_int preallocated long */ - Py_SET_SIZE(&self->val, longval); + Py_SET_SIZE(&self->val, Py_SIZE(longval)); +#if PY_MINOR_VERSION >= 12 + self->val.long_value.ob_digit[0] = longval->long_value.ob_digit[0]; +#else @@ -15,7 +15,7 @@ @@ -150,7 +154,11 @@ /* we assume the "fast path" for a single-digit ints (see longobject.c) */ /* this also holds if we get a small_int preallocated long */ - Py_SET_SIZE(&self->val, longval); + Py_SET_SIZE(&self->val, Py_SIZE(longval)); +#if PY_MINOR_VERSION >= 12 + self->val.long_value.ob_digit[0] = longval->long_value.ob_digit[0]; +#else diff --git a/zbar.spec b/zbar.spec index eda343a..a6fddc8 100644 --- a/zbar.spec +++ b/zbar.spec @@ -6,7 +6,7 @@ Name: zbar Version: 0.23.90 -Release: 11%{?dist} +Release: 12%{?dist} Summary: Bar code reader License: LGPL-2.1-or-later @@ -217,6 +217,9 @@ rm -rf $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}/ %{_docdir}/test_python.py %changelog +* Fri Jan 05 2024 Florian Weimer - 0.23.90-12 +- Add missing Py_SIZE to py311.patch + * Sat Jul 22 2023 Fedora Release Engineering - 0.23.90-11 - Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild From 23ba05b98dbb29a005ecf5f717b02969c26e30e2 Mon Sep 17 00:00:00 2001 From: Gwyn Ciesla Date: Tue, 9 Jan 2024 10:07:01 -0600 Subject: [PATCH 10/25] 0.23.93 --- .gitignore | 1 + py311.patch | 35 ----------------------------------- py312.patch | 26 -------------------------- sources | 2 +- zbar.spec | 11 +++++------ 5 files changed, 7 insertions(+), 68 deletions(-) delete mode 100644 py311.patch delete mode 100644 py312.patch diff --git a/.gitignore b/.gitignore index 153a457..5a6ac22 100644 --- a/.gitignore +++ b/.gitignore @@ -11,3 +11,4 @@ zbar-0.10.tar.bz2 /zbar-0.22.92.tar.bz2 /zbar-0.23.tar.bz2 /zbar-0.23.90.tar.bz2 +/zbar-0.23.93.tar.bz2 diff --git a/py311.patch b/py311.patch deleted file mode 100644 index 1c047a5..0000000 --- a/py311.patch +++ /dev/null @@ -1,35 +0,0 @@ ---- python/enum.c~ 2022-01-12 10:07:02.151116991 -0600 -+++ python/enum.c 2022-01-12 10:14:04.093001534 -0600 -@@ -23,6 +23,12 @@ - - #include "zbarmodule.h" - -+#if PY_VERSION_HEX < 0x030900A4 && !defined(Py_SET_SIZE) -+static inline void _Py_SET_SIZE(PyVarObject *ob, Py_ssize_t size) -+{ ob->ob_size = size; } -+#define Py_SET_SIZE(ob, size) _Py_SET_SIZE((PyVarObject*)(ob), size) -+#endif -+ - static char enumitem_doc[] = PyDoc_STR( - "simple enumeration item.\n" - "\n" ---- python/enum.c~ 2022-01-12 10:16:29.670271662 -0600 -+++ python/enum.c 2022-01-12 10:52:11.671258442 -0600 -@@ -58,7 +58,7 @@ - - /* we assume the "fast path" for a single-digit ints (see longobject.c) */ - /* this also holds if we get a small_int preallocated long */ -- Py_SIZE(&self->val) = Py_SIZE(longval); -+ Py_SET_SIZE(&self->val, Py_SIZE(longval)); - self->val.ob_digit[0] = longval->ob_digit[0]; - Py_DECREF(longval); - #else -@@ -148,7 +148,7 @@ - - /* we assume the "fast path" for a single-digit ints (see longobject.c) */ - /* this also holds if we get a small_int preallocated long */ -- Py_SIZE(&self->val) = Py_SIZE(longval); -+ Py_SET_SIZE(&self->val, Py_SIZE(longval)); - self->val.ob_digit[0] = longval->ob_digit[0]; - Py_DECREF(longval); - diff --git a/py312.patch b/py312.patch deleted file mode 100644 index 9999cb6..0000000 --- a/py312.patch +++ /dev/null @@ -1,26 +0,0 @@ ---- python/enum.c~ 2023-07-07 11:08:43.137150103 +0200 -+++ python/enum.c 2023-07-07 11:24:06.010655717 +0200 -@@ -59,7 +59,11 @@ - /* we assume the "fast path" for a single-digit ints (see longobject.c) */ - /* this also holds if we get a small_int preallocated long */ - Py_SET_SIZE(&self->val, Py_SIZE(longval)); -+#if PY_MINOR_VERSION >= 12 -+ self->val.long_value.ob_digit[0] = longval->long_value.ob_digit[0]; -+#else - self->val.ob_digit[0] = longval->ob_digit[0]; -+#endif - Py_DECREF(longval); - #else - self->val.ob_ival = val; -@@ -150,7 +154,11 @@ - /* we assume the "fast path" for a single-digit ints (see longobject.c) */ - /* this also holds if we get a small_int preallocated long */ - Py_SET_SIZE(&self->val, Py_SIZE(longval)); -+#if PY_MINOR_VERSION >= 12 -+ self->val.long_value.ob_digit[0] = longval->long_value.ob_digit[0]; -+#else - self->val.ob_digit[0] = longval->ob_digit[0]; -+#endif - Py_DECREF(longval); - - self->name = PyUnicode_FromString(name); diff --git a/sources b/sources index 6fa09be..4eacb18 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (zbar-0.23.90.tar.bz2) = c4ccac8526acab4e28c6145c5cdb95b6a6c5c81b6d2f883053435794f7c351edee20abdc9599cb0de96db546f584c9479896baa87b01ad409d5e75ea8b48118c +SHA512 (zbar-0.23.93.tar.bz2) = 8b1d57557cb1c425109b709f0cbe94830939cb4cd9a0cb505d44ba3c7cfb3522560c3bbf2a8b37985da4577b677ad675491f6ef0e9796749382079c0e844e21e diff --git a/zbar.spec b/zbar.spec index a6fddc8..e3d703c 100644 --- a/zbar.spec +++ b/zbar.spec @@ -5,16 +5,14 @@ %endif Name: zbar -Version: 0.23.90 -Release: 12%{?dist} +Version: 0.23.93 +Release: 1%{?dist} Summary: Bar code reader License: LGPL-2.1-or-later URL: http://zbar.sourceforge.net/ Source0: https://linuxtv.org/downloads/%{name}/%{name}-%{version}.tar.bz2 Patch0: use_python3_on_python_script.patch -Patch1: py311.patch -Patch2: py312.patch BuildRequires: autoconf BuildRequires: automake @@ -120,8 +118,6 @@ on Java Native Interface (JNI) applications using ZBar. %prep %setup -q %patch 0 -p1 -%patch 1 -p0 -%patch 2 -p0 %build %configure --with-python=python3 --with-gtk=auto --with-dbusconfdir=%{_sysconfdir} --docdir=%{_docdir}/%{name}-%{version} --with-graphicsmagick --without-xshm --without-xv --enable-codes=ean,databar,code128,code93,code39,codabar,i25,qrcode,sqcode,pdf417 @@ -217,6 +213,9 @@ rm -rf $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}/ %{_docdir}/test_python.py %changelog +* Tue Jan 09 2024 Gwyn Ciesla - 0.23.93-1 +- 0.23.93 + * Fri Jan 05 2024 Florian Weimer - 0.23.90-12 - Add missing Py_SIZE to py311.patch From dec080b68c19401e37e610acea7f0235b5bb6bd2 Mon Sep 17 00:00:00 2001 From: Yaakov Selkowitz Date: Thu, 11 Jan 2024 23:43:55 -0500 Subject: [PATCH 11/25] Use default java-devel The JNI bindings were introduced with 1.8.0 was still the default JDK, so 11 was intended to select the newer version. The default JDK is now 17, and there is no reason to continue to use what is now an older version. --- zbar.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/zbar.spec b/zbar.spec index e3d703c..5b9679f 100644 --- a/zbar.spec +++ b/zbar.spec @@ -30,7 +30,7 @@ BuildRequires: qt5-qtbase-devel BuildRequires: qt5-qtx11extras-devel BuildRequires: xmlto %if %{JAVA} -BuildRequires: java-11-openjdk-devel +BuildRequires: java-devel %endif BuildRequires: python3-devel BuildRequires: python3-setuptools From 228839a24358e0f9992da271964de80c5e32e373 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 27 Jan 2024 11:00:53 +0000 Subject: [PATCH 12/25] Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild --- zbar.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/zbar.spec b/zbar.spec index 5b9679f..d156b03 100644 --- a/zbar.spec +++ b/zbar.spec @@ -6,7 +6,7 @@ Name: zbar Version: 0.23.93 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Bar code reader License: LGPL-2.1-or-later @@ -213,6 +213,9 @@ rm -rf $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}/ %{_docdir}/test_python.py %changelog +* Sat Jan 27 2024 Fedora Release Engineering - 0.23.93-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + * Tue Jan 09 2024 Gwyn Ciesla - 0.23.93-1 - 0.23.93 From f07fb24c88062f3006f96405b7ea84e20d1cf747 Mon Sep 17 00:00:00 2001 From: Gwyn Ciesla Date: Mon, 15 Apr 2024 15:41:43 -0500 Subject: [PATCH 13/25] Update python3-gobject BuildRequires --- zbar.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/zbar.spec b/zbar.spec index d156b03..fc5e501 100644 --- a/zbar.spec +++ b/zbar.spec @@ -6,7 +6,7 @@ Name: zbar Version: 0.23.93 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Bar code reader License: LGPL-2.1-or-later @@ -25,7 +25,7 @@ BuildRequires: libtool BuildRequires: libv4l-devel BuildRequires: libXv-devel BuildRequires: make -BuildRequires: pygobject3-devel +BuildRequires: python3-gobject-devel BuildRequires: qt5-qtbase-devel BuildRequires: qt5-qtx11extras-devel BuildRequires: xmlto @@ -213,6 +213,9 @@ rm -rf $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}/ %{_docdir}/test_python.py %changelog +* Mon Apr 15 2024 Gwyn Ciesla - 0.23.93-3 +- Update python3-gobject BuildRequires + * Sat Jan 27 2024 Fedora Release Engineering - 0.23.93-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild From 84f4d66df0d1b98e1864d1f51db63b4836b89188 Mon Sep 17 00:00:00 2001 From: Python Maint Date: Fri, 7 Jun 2024 14:12:34 +0200 Subject: [PATCH 14/25] Rebuilt for Python 3.13 --- zbar.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/zbar.spec b/zbar.spec index fc5e501..7a867bd 100644 --- a/zbar.spec +++ b/zbar.spec @@ -6,7 +6,7 @@ Name: zbar Version: 0.23.93 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Bar code reader License: LGPL-2.1-or-later @@ -213,6 +213,9 @@ rm -rf $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}/ %{_docdir}/test_python.py %changelog +* Fri Jun 07 2024 Python Maint - 0.23.93-4 +- Rebuilt for Python 3.13 + * Mon Apr 15 2024 Gwyn Ciesla - 0.23.93-3 - Update python3-gobject BuildRequires From 8b34b042851bcbda05909141c0a7867a37115b9d Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 20 Jul 2024 10:49:18 +0000 Subject: [PATCH 15/25] Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild --- zbar.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/zbar.spec b/zbar.spec index 7a867bd..a9c9c50 100644 --- a/zbar.spec +++ b/zbar.spec @@ -6,7 +6,7 @@ Name: zbar Version: 0.23.93 -Release: 4%{?dist} +Release: 5%{?dist} Summary: Bar code reader License: LGPL-2.1-or-later @@ -213,6 +213,9 @@ rm -rf $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}/ %{_docdir}/test_python.py %changelog +* Sat Jul 20 2024 Fedora Release Engineering - 0.23.93-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild + * Fri Jun 07 2024 Python Maint - 0.23.93-4 - Rebuilt for Python 3.13 From 85f877885cdeadc9795fa9e52c934c09e2bf2b55 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sun, 19 Jan 2025 16:42:27 +0000 Subject: [PATCH 16/25] Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild --- zbar.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/zbar.spec b/zbar.spec index a9c9c50..6a41720 100644 --- a/zbar.spec +++ b/zbar.spec @@ -6,7 +6,7 @@ Name: zbar Version: 0.23.93 -Release: 5%{?dist} +Release: 6%{?dist} Summary: Bar code reader License: LGPL-2.1-or-later @@ -213,6 +213,9 @@ rm -rf $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}/ %{_docdir}/test_python.py %changelog +* Sun Jan 19 2025 Fedora Release Engineering - 0.23.93-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild + * Sat Jul 20 2024 Fedora Release Engineering - 0.23.93-5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild From d99b5096687182d339daf8778b15887d63b00854 Mon Sep 17 00:00:00 2001 From: Python Maint Date: Tue, 3 Jun 2025 14:09:04 +0200 Subject: [PATCH 17/25] Rebuilt for Python 3.14 --- zbar.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/zbar.spec b/zbar.spec index 6a41720..8e6ac62 100644 --- a/zbar.spec +++ b/zbar.spec @@ -6,7 +6,7 @@ Name: zbar Version: 0.23.93 -Release: 6%{?dist} +Release: 7%{?dist} Summary: Bar code reader License: LGPL-2.1-or-later @@ -213,6 +213,9 @@ rm -rf $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}/ %{_docdir}/test_python.py %changelog +* Tue Jun 03 2025 Python Maint - 0.23.93-7 +- Rebuilt for Python 3.14 + * Sun Jan 19 2025 Fedora Release Engineering - 0.23.93-6 - Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild From bb34380f84304f61e14a0ebdf509310d84754c6b Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 25 Jul 2025 21:16:33 +0000 Subject: [PATCH 18/25] Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild --- zbar.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/zbar.spec b/zbar.spec index 8e6ac62..5b7e9d1 100644 --- a/zbar.spec +++ b/zbar.spec @@ -6,7 +6,7 @@ Name: zbar Version: 0.23.93 -Release: 7%{?dist} +Release: 8%{?dist} Summary: Bar code reader License: LGPL-2.1-or-later @@ -213,6 +213,9 @@ rm -rf $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}/ %{_docdir}/test_python.py %changelog +* Fri Jul 25 2025 Fedora Release Engineering - 0.23.93-8 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild + * Tue Jun 03 2025 Python Maint - 0.23.93-7 - Rebuilt for Python 3.14 From 3b470a2d656b915cbd80f03ab2c2742da968408a Mon Sep 17 00:00:00 2001 From: Yaakov Selkowitz Date: Fri, 5 Sep 2025 11:08:41 -0400 Subject: [PATCH 19/25] Fix Qt overlinking This was causing Qt5 to be linked into every binary in zbar, where it is only needed for the Qt bindings (which already specify QT_CFLAGS, QT_LIBS, etc). --- fix_qt_overlinking.patch | 16 ++++++++++++++++ zbar.spec | 8 +++++++- 2 files changed, 23 insertions(+), 1 deletion(-) create mode 100644 fix_qt_overlinking.patch diff --git a/fix_qt_overlinking.patch b/fix_qt_overlinking.patch new file mode 100644 index 0000000..727a57e --- /dev/null +++ b/fix_qt_overlinking.patch @@ -0,0 +1,16 @@ +This was causing Qt5 to be linked into every binary in zbar, where it is only +needed for the Qt bindings (which already specify QT_CFLAGS, QT_LIBS, etc). + +diff --git a/configure.ac b/configure.ac +index f0f9723..2a26973 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -689,8 +689,6 @@ AM_CONDITIONAL([HAVE_QT], [test "x$with_qt" = "xyes"]) + AM_COND_IF([HAVE_QT], + [AC_MSG_NOTICE([using Qt version $QT_VERSION]) + AC_MSG_NOTICE([using moc from $MOC]) +- CPPFLAGS="$CPPFLAGS $QT_CPPFLAGS" +- LIBS="$LIBS $QT_LIBS" + AC_CONFIG_FILES([zbar-qt.pc:"${qt_pkgconfig_file}.in"]) + #dnl -fPIC has no effect on Windows and breaks windres + AS_IF([test "x$win32" = "xno"], [CPPFLAGS="$CPPFLAGS -fPIC"])]) diff --git a/zbar.spec b/zbar.spec index 5b7e9d1..a1c44fa 100644 --- a/zbar.spec +++ b/zbar.spec @@ -6,13 +6,14 @@ Name: zbar Version: 0.23.93 -Release: 8%{?dist} +Release: 9%{?dist} Summary: Bar code reader License: LGPL-2.1-or-later URL: http://zbar.sourceforge.net/ Source0: https://linuxtv.org/downloads/%{name}/%{name}-%{version}.tar.bz2 Patch0: use_python3_on_python_script.patch +Patch1: fix_qt_overlinking.patch BuildRequires: autoconf BuildRequires: automake @@ -118,8 +119,10 @@ on Java Native Interface (JNI) applications using ZBar. %prep %setup -q %patch 0 -p1 +%patch 1 -p1 %build +autoreconf -fiv %configure --with-python=python3 --with-gtk=auto --with-dbusconfdir=%{_sysconfdir} --docdir=%{_docdir}/%{name}-%{version} --with-graphicsmagick --without-xshm --without-xv --enable-codes=ean,databar,code128,code93,code39,codabar,i25,qrcode,sqcode,pdf417 # rpath @@ -213,6 +216,9 @@ rm -rf $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}/ %{_docdir}/test_python.py %changelog +* Fri Sep 05 2025 Yaakov Selkowitz - 0.23.93-9 +- Fix Qt overlinking + * Fri Jul 25 2025 Fedora Release Engineering - 0.23.93-8 - Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild From 9796c95d232ccd12c7351339d98839b393d2311b Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 17 Jan 2026 21:06:31 +0000 Subject: [PATCH 20/25] Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild --- zbar.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/zbar.spec b/zbar.spec index a1c44fa..e45a5d2 100644 --- a/zbar.spec +++ b/zbar.spec @@ -6,7 +6,7 @@ Name: zbar Version: 0.23.93 -Release: 9%{?dist} +Release: 10%{?dist} Summary: Bar code reader License: LGPL-2.1-or-later @@ -216,6 +216,9 @@ rm -rf $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}/ %{_docdir}/test_python.py %changelog +* Sat Jan 17 2026 Fedora Release Engineering - 0.23.93-10 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild + * Fri Sep 05 2025 Yaakov Selkowitz - 0.23.93-9 - Fix Qt overlinking From a1e97927fd862a8ca777462155b54c4ee4176923 Mon Sep 17 00:00:00 2001 From: Simone Caronni Date: Mon, 2 Feb 2026 13:35:52 +0100 Subject: [PATCH 21/25] Fix FTBFS --- zbar.spec | 4 ---- 1 file changed, 4 deletions(-) diff --git a/zbar.spec b/zbar.spec index e45a5d2..c95043b 100644 --- a/zbar.spec +++ b/zbar.spec @@ -186,15 +186,11 @@ rm -rf $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}/ %files gtk %{_libdir}/libzbargtk.so.* %{_bindir}/zbarcam-gtk -%dir %{_libdir}/girepository-1.0 -%{_libdir}/girepository-1.0/ZBar-1.0.typelib %files gtk-devel %{_libdir}/libzbargtk.so %{_libdir}/pkgconfig/zbar-gtk.pc %{_includedir}/zbar/zbargtk.h -%dir %{_datadir}/gir-1.0 -%{_datadir}/gir-1.0/ZBar-1.0.gir %files qt %{_libdir}/libzbarqt.so.* From 13577c08e5cc2ec7f623ed405f276d19fce33c6e Mon Sep 17 00:00:00 2001 From: Python Maint Date: Wed, 3 Jun 2026 23:53:33 +0200 Subject: [PATCH 22/25] Rebuilt for Python 3.15 --- zbar.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/zbar.spec b/zbar.spec index c95043b..160395e 100644 --- a/zbar.spec +++ b/zbar.spec @@ -6,7 +6,7 @@ Name: zbar Version: 0.23.93 -Release: 10%{?dist} +Release: 11%{?dist} Summary: Bar code reader License: LGPL-2.1-or-later @@ -212,6 +212,9 @@ rm -rf $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}/ %{_docdir}/test_python.py %changelog +* Wed Jun 03 2026 Python Maint - 0.23.93-11 +- Rebuilt for Python 3.15 + * Sat Jan 17 2026 Fedora Release Engineering - 0.23.93-10 - Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild From ce2f2dbd06c8e7b15d02e6cecf6daf89c73c63c2 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 17 Jul 2026 09:39:04 +0000 Subject: [PATCH 23/25] Rebuilt for https://fedoraproject.org/wiki/Fedora_45_Mass_Rebuild --- zbar.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/zbar.spec b/zbar.spec index 160395e..3fe9550 100644 --- a/zbar.spec +++ b/zbar.spec @@ -6,7 +6,7 @@ Name: zbar Version: 0.23.93 -Release: 11%{?dist} +Release: 12%{?dist} Summary: Bar code reader License: LGPL-2.1-or-later @@ -212,6 +212,9 @@ rm -rf $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}/ %{_docdir}/test_python.py %changelog +* Fri Jul 17 2026 Fedora Release Engineering - 0.23.93-12 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_45_Mass_Rebuild + * Wed Jun 03 2026 Python Maint - 0.23.93-11 - Rebuilt for Python 3.15 From 6c6747c8126e2f5cdfaa96f8ad4b8df17f3ea5e7 Mon Sep 17 00:00:00 2001 From: Michal Schorm Date: Tue, 21 Jul 2026 07:06:59 +0200 Subject: [PATCH 24/25] Remove stale 'xmlto' BuildRequires Man pages have been pre-built in the upstream tarball since the initial packaging (525f75c, 2009). A stamp file prevents regeneration during the build. Related: rhbz#2503124 Co-Authored-By: Claude AI --- zbar.spec | 1 - 1 file changed, 1 deletion(-) diff --git a/zbar.spec b/zbar.spec index 3fe9550..85358e7 100644 --- a/zbar.spec +++ b/zbar.spec @@ -29,7 +29,6 @@ BuildRequires: make BuildRequires: python3-gobject-devel BuildRequires: qt5-qtbase-devel BuildRequires: qt5-qtx11extras-devel -BuildRequires: xmlto %if %{JAVA} BuildRequires: java-devel %endif From 257ee58d8894ad35400033ccfbf8eafb6960c598 Mon Sep 17 00:00:00 2001 From: Gwyn Ciesla Date: Tue, 4 Aug 2026 14:27:07 -0500 Subject: [PATCH 25/25] Rebuild for Python 3.15.0b4 --- zbar.spec | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/zbar.spec b/zbar.spec index 85358e7..255f4e8 100644 --- a/zbar.spec +++ b/zbar.spec @@ -6,7 +6,7 @@ Name: zbar Version: 0.23.93 -Release: 12%{?dist} +Release: 13%{?dist} Summary: Bar code reader License: LGPL-2.1-or-later @@ -34,6 +34,8 @@ BuildRequires: java-devel %endif BuildRequires: python3-devel BuildRequires: python3-setuptools +BuildRequires: xmlto +BuildRequires: gobject-introspection-devel %description ZBar Bar Code Reader is an open source software suite for reading bar @@ -165,6 +167,7 @@ rm -rf $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}/ %files libs -f zbar.lang %license COPYING LICENSE.md %{_libdir}/libzbar.so.0* +%{_libdir}/girepository-1.0/ZBar-1.0.typelib %files devel %doc HACKING.md TODO.md @@ -181,6 +184,7 @@ rm -rf $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}/ %{_includedir}/zbar/Video.h %{_includedir}/zbar/Window.h %{_includedir}/zbar/Processor.h +%{_datadir}/gir-1.0/ZBar-1.0.gir %files gtk %{_libdir}/libzbargtk.so.* @@ -211,6 +215,9 @@ rm -rf $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}/ %{_docdir}/test_python.py %changelog +* Tue Aug 04 2026 Gwyn Ciesla - 0.23.93-13 +- Rebuild for Python 3.15.0b4 + * Fri Jul 17 2026 Fedora Release Engineering - 0.23.93-12 - Rebuilt for https://fedoraproject.org/wiki/Fedora_45_Mass_Rebuild