From 84f4d66df0d1b98e1864d1f51db63b4836b89188 Mon Sep 17 00:00:00 2001 From: Python Maint Date: Fri, 7 Jun 2024 14:12:34 +0200 Subject: [PATCH 01/12] 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 02/12] 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 03/12] 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 04/12] 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 05/12] 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 06/12] 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 07/12] 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 08/12] 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 09/12] 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 10/12] 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 11/12] 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 12/12] 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