Compare commits

..

15 commits

Author SHA1 Message Date
Gwyn Ciesla
257ee58d88 Rebuild for Python 3.15.0b4 2026-08-04 14:27:07 -05:00
Michal Schorm
6c6747c812 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 <noreply@anthropic.com>
2026-07-21 07:40:31 +02:00
Fedora Release Engineering
ce2f2dbd06 Rebuilt for https://fedoraproject.org/wiki/Fedora_45_Mass_Rebuild 2026-07-17 09:39:04 +00:00
Python Maint
13577c08e5 Rebuilt for Python 3.15 2026-06-03 23:53:33 +02:00
Simone Caronni
a1e97927fd Fix FTBFS 2026-02-02 13:35:52 +01:00
Fedora Release Engineering
9796c95d23 Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild 2026-01-17 21:06:31 +00:00
Yaakov Selkowitz
3b470a2d65 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).
2025-09-05 11:08:42 -04:00
Fedora Release Engineering
bb34380f84 Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild 2025-07-25 21:16:33 +00:00
Python Maint
d99b509668 Rebuilt for Python 3.14 2025-06-03 14:09:04 +02:00
Fedora Release Engineering
85f877885c Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild 2025-01-19 16:42:27 +00:00
Fedora Release Engineering
8b34b04285 Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild 2024-07-20 10:49:18 +00:00
Python Maint
84f4d66df0 Rebuilt for Python 3.13 2024-06-07 14:12:34 +02:00
Gwyn Ciesla
f07fb24c88 Update python3-gobject BuildRequires 2024-04-15 15:41:43 -05:00
Fedora Release Engineering
228839a243 Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild 2024-01-27 11:00:53 +00:00
Yaakov Selkowitz
dec080b68c 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.
2024-01-11 23:48:02 -05:00
2 changed files with 62 additions and 8 deletions

16
fix_qt_overlinking.patch Normal file
View file

@ -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"])])

View file

@ -6,13 +6,14 @@
Name: zbar
Version: 0.23.93
Release: 1%{?dist}
Release: 13%{?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
@ -25,15 +26,16 @@ 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
%if %{JAVA}
BuildRequires: java-11-openjdk-devel
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
@ -118,8 +120,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
@ -163,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
@ -179,19 +184,16 @@ 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.*
@ -213,6 +215,42 @@ 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