diff --git a/zbar.spec b/zbar.spec
index 5ce5e79..d52240b 100644
--- a/zbar.spec
+++ b/zbar.spec
@@ -6,7 +6,7 @@
 
 Name:		zbar
 Version:	0.23.90
-Release:	3%{?dist}
+Release:	5%{?dist}
 Summary:	Bar code reader
 
 License:	LGPLv2+
@@ -15,11 +15,21 @@ Source0:	https://linuxtv.org/downloads/%{name}/%{name}-%{version}.tar.bz2
 Patch0:		use_python3_on_python_script.patch
 Patch1:         py311.patch
 
-BuildRequires: make
-BuildRequires:	autoconf automake libtool gettext-devel
-BuildRequires:	qt5-qtbase-devel qt5-qtx11extras-devel
-BuildRequires:	gtk3-devel GraphicsMagick-devel pygobject3-devel
-BuildRequires:	libv4l-devel libXv-devel xmlto dbus-devel libSM-devel
+BuildRequires:	autoconf
+BuildRequires:	automake
+BuildRequires:	dbus-devel
+BuildRequires:	gettext-devel
+BuildRequires:	GraphicsMagick-devel
+BuildRequires:	gtk3-devel
+BuildRequires:	libSM-devel
+BuildRequires:	libtool
+BuildRequires:	libv4l-devel
+BuildRequires:	libXv-devel
+BuildRequires:	make
+BuildRequires:	pygobject3-devel
+BuildRequires:	qt5-qtbase-devel
+BuildRequires:	qt5-qtx11extras-devel
+BuildRequires:	xmlto
 %if %{JAVA}
 BuildRequires:	java-11-openjdk-devel
 %endif
@@ -33,7 +43,8 @@ Code 93, Code 39, Codabar, Interleaved 2 of 5, QR Code and SQ Code.
 
 %package devel
 Summary: Bar code library extra development files
-Requires: pkgconfig, %{name} = %{version}-%{release}
+Requires: pkgconfig
+Requires: %{name} = %{version}-%{release}
 
 %description devel
 This package contains header files and additional libraries used for
@@ -58,7 +69,9 @@ support on any application compatible with GIR, like python3.
 
 %package gtk-devel
 Summary: Bar code reader GTK widget extra development files
-Requires: pkgconfig, %{name}-gtk = %{version}-%{release}, %{name}-devel = %{version}-%{release}
+Requires: %{name}-devel = %{version}-%{release}
+Requires: %{name}-gtk = %{version}-%{release}
+Requires: pkgconfig
 
 %description gtk-devel
 This package contains header files and additional libraries used for
@@ -75,7 +88,9 @@ applications based on Qt4.
 
 %package qt-devel
 Summary: Bar code reader Qt widget extra development files
-Requires: pkgconfig, %{name}-qt = %{version}-%{release}, %{name}-devel = %{version}-%{release}
+Requires: %{name}-devel = %{version}-%{release}
+Requires: %{name}-qt = %{version}-%{release}
+Requires: pkgconfig
 
 %description qt-devel
 This package contains header files and additional libraries used for
@@ -84,7 +99,8 @@ scanning widget.
 
 %package python3
 Summary: Bar code reader PyGTK widget
-Requires: python3-pillow, %{name} = %{version}-%{release}
+Requires: %{name} = %{version}-%{release}
+Requires: python3-pillow
 
 %description python3
 This package contains a bar code scanning widget for use on
@@ -93,7 +109,9 @@ python applications that work with images.
 %if %{JAVA}
 %package java
 Summary: Bar code reader Java library
-Requires: pkgconfig, %{name}-gtk = %{version}-%{release}, %{name}-devel = %{version}-%{release}
+Requires: %{name}-devel = %{version}-%{release}
+Requires: %{name}-gtk = %{version}-%{release}
+Requires: pkgconfig
 
 %description java
 This package contains header files and additional libraries used for
@@ -203,6 +221,9 @@ rm -rf $RPM_BUILD_ROOT/usr/share/doc/zbar-%{version}/
 %{_docdir}/test_python.py
 
 %changelog
+* Fri Aug 26 2022 Kalev Lember <klember@redhat.com> - 0.23.90-5
+- Sort BuildRequires and Requires and split them out one per line
+
 * Mon Aug 01 2022 Gwyn Ciesla <gwync@protonmail.com> - 0.23.90-4
 - Only build Java on supported platforms.