[rpms/lazarus] multiple-IDE-widgetsets: Simplify version/release for qt5pas/qt6pas

[rpms/lazarus] multiple-IDE-widgetsets: Simplify version/release for qt5pas/qt6pas

[Artur Frenszek-Iwicki]

A new commit has been pushed.

Repo   : rpms/lazarus
Branch : multiple-IDE-widgetsets
Commit : fb20ccb28c663e05302cbc49b699c8c457a9d7ff
Author : Artur Frenszek-Iwicki <fedora@svgames.pl>
Date   : 2026-06-11T10:46:58+02:00
Stats  : +12/-14 in 1 file(s)
URL    : https://src.fedoraproject.org/rpms/lazarus/c/fb20ccb28c663e05302cbc49b699c8c457a9d7ff?branch=multiple-IDE-widgetsets

Log:
Simplify version/release for qt5pas/qt6pas

---
diff --git a/lazarus.spec b/lazarus.spec
index 2eabefa..19413bb 100644
--- a/lazarus.spec
+++ b/lazarus.spec
@@ -2,17 +2,16 @@ Name:           lazarus
 Summary:        Lazarus Component Library and IDE for Free Pascal
 
 Version:        4.8
+Release:        2%{?dist}
 
-%global baserelease 1
-Release:        %{baserelease}%{?dist}
+# Version suffix used by subpackages using separate versioning
+%global version_suffix %{expand:laz%{version}}
 
 # The qt5pas version is taken from lcl/interfaces/qt5/cbindings/Qt5Pas.pro
-%global qt5pas_version 2.16
-%global qt5pas_release %(relstr="%{version}.%{baserelease}"; relstr=(${relstr//./ }); ((relno=${relstr[0]}*10000 + ${relstr[1]}*100 + ${relstr[2]})); echo "${relno}%{?dist}";)
+%global qt5pas_version 2.16^%{version_suffix}
 
 # The qt6pas version is taken from lcl/interfaces/qt6/cbindings/Qt6Pas.pro
-%global qt6pas_version 6.2.10
-%global qt6pas_release %{qt5pas_release}
+%global qt6pas_version 6.2.10^%{version_suffix}
 
 # The IDE itself is licensed under GPLv2+, with minor parts under a modified LGPL.
 # The Lazarus Component Library has parts licensed under all the licenses mentioned in the tag.
@@ -200,7 +199,7 @@ using the Qt widgetset.
 Summary: Lazarus Component Library - Qt5 widgetset support
 Requires: %{name}-lcl%{?_isa} = %{version}-%{release}
 
-Requires: qt5pas-devel%{?_isa} = %{qt5pas_version}-%{qt5pas_release}
+Requires: qt5pas-devel%{?_isa} = %{qt5pas_version}-%{release}
 
 %description lcl-qt5
 Lazarus is a cross-platform IDE and component library for Free Pascal.
@@ -213,7 +212,7 @@ using the Qt5 widgetset.
 Summary: Lazarus Component Library - Qt6 widgetset support
 Requires: %{name}-lcl%{?_isa} = %{version}-%{release}
 
-Requires: qt6pas-devel%{?_isa} = %{qt6pas_version}-%{qt6pas_release}
+Requires: qt6pas-devel%{?_isa} = %{qt6pas_version}-%{release}
 
 %description lcl-qt6
 Lazarus is a cross-platform IDE and component library for Free Pascal.
@@ -225,7 +224,6 @@ using the Qt6 widgetset.
 # Qt5pas start
 %package -n     qt5pas
 Version:        %{qt5pas_version}
-Release:        %{qt5pas_release}
 Summary:        Qt5 bindings for Pascal
 
 %description -n qt5pas
@@ -233,12 +231,11 @@ Qt5 bindings for Pascal from Lazarus.
 
 %package -n     qt5pas-devel
 Version:        %{qt5pas_version}
-Release:        %{qt5pas_release}
 Summary:        Development files for qt5pas
 
 Requires:       qt5-qtbase-devel%{?_isa}
 Requires:       qt5-qtx11extras-devel%{?_isa}
-Requires:       qt5pas%{?_isa} = %{qt5pas_version}-%{qt5pas_release}
+Requires:       qt5pas%{?_isa} = %{qt5pas_version}-%{release}
 
 %description -n qt5pas-devel
 The qt5pas-devel package contains libraries and header files for
@@ -247,7 +244,6 @@ developing applications that use qt5pas.
 # Qt5pas end, Qt6pas start
 %package -n     qt6pas
 Version:        %{qt6pas_version}
-Release:        %{qt6pas_release}
 Summary:        Qt6 bindings for Pascal
 
 %description -n qt6pas
@@ -255,11 +251,10 @@ Qt6 bindings for Pascal from Lazarus.
 
 %package -n     qt6pas-devel
 Version:        %{qt6pas_version}
-Release:        %{qt6pas_release}
 Summary:        Development files for qt6pas
 
 Requires:       qt6-qtbase-devel%{?_isa}
-Requires:       qt6pas%{?_isa} = %{qt6pas_version}-%{qt6pas_release}
+Requires:       qt6pas%{?_isa} = %{qt6pas_version}-%{release}
 
 %description -n qt6pas-devel
 The qt6pas-devel package contains libraries and header files for
@@ -553,6 +548,9 @@ appstream-util validate-relax --nonet %{buildroot}%{_metainfodir}/%{name}.appdat
 
 
 %changelog
+* Thu Jun 11 2026 Artur Frenszek-Iwicki <fedora@svgames.pl> - 4.8-2
+- Suffix qt5pas/qt6pas versions with Lazarus version instead of abusing the Release number
+
 * Wed Jun 10 2026 Artur Frenszek-Iwicki <fedora@svgames.pl> - 4.8-1
 - Update to v4.8