fix_qt_overlinking.patch

@@ -1,16 +0,0 @@
-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"])])

zbar.spec

@@ -6,14 +6,13 @@
 
 Name:		zbar
 Version:	0.23.93
-Release:	13%{?dist}
+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:		fix_qt_overlinking.patch
 
 BuildRequires:	autoconf
 BuildRequires:	automake
@@ -26,16 +25,15 @@ BuildRequires:	libtool
 BuildRequires:	libv4l-devel
 BuildRequires:	libXv-devel
 BuildRequires:	make
-BuildRequires:	python3-gobject-devel
+BuildRequires:	pygobject3-devel
 BuildRequires:	qt5-qtbase-devel
 BuildRequires:	qt5-qtx11extras-devel
+BuildRequires:	xmlto
 %if %{JAVA}
-BuildRequires:	java-devel
+BuildRequires:	java-11-openjdk-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
@@ -120,10 +118,8 @@ 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
@@ -167,7 +163,6 @@ 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
@@ -184,16 +179,19 @@ 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.*
 %{_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.*
@@ -215,42 +213,6 @@ rm -rf $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}/
 %{_docdir}/test_python.py
 
 %changelog
-* Tue Aug 04 2026 Gwyn Ciesla <gwync@protonmail.com> - 0.23.93-13
-- Rebuild for Python 3.15.0b4
-
-* Fri Jul 17 2026 Fedora Release Engineering <releng@fedoraproject.org> - 0.23.93-12
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_45_Mass_Rebuild
-
-* Wed Jun 03 2026 Python Maint <python-maint@redhat.com> - 0.23.93-11
-- Rebuilt for Python 3.15
-
-* Sat Jan 17 2026 Fedora Release Engineering <releng@fedoraproject.org> - 0.23.93-10
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild
-
-* Fri Sep 05 2025 Yaakov Selkowitz <yselkowi@redhat.com> - 0.23.93-9
-- Fix Qt overlinking
-
-* Fri Jul 25 2025 Fedora Release Engineering <releng@fedoraproject.org> - 0.23.93-8
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild
-
-* Tue Jun 03 2025 Python Maint <python-maint@redhat.com> - 0.23.93-7
-- Rebuilt for Python 3.14
-
-* Sun Jan 19 2025 Fedora Release Engineering <releng@fedoraproject.org> - 0.23.93-6
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild
-
-* Sat Jul 20 2024 Fedora Release Engineering <releng@fedoraproject.org> - 0.23.93-5
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild
-
-* Fri Jun 07 2024 Python Maint <python-maint@redhat.com> - 0.23.93-4
-- Rebuilt for Python 3.13
-
-* Mon Apr 15 2024 Gwyn Ciesla <gwync@protonmail.com> - 0.23.93-3
-- Update python3-gobject BuildRequires
-
-* Sat Jan 27 2024 Fedora Release Engineering <releng@fedoraproject.org> - 0.23.93-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
-
 * Tue Jan 09 2024 Gwyn Ciesla <gwync@protonmail.com> - 0.23.93-1
 - 0.23.93