From 9ed292cc6444ee6e45be092e49f572d78e22720b Mon Sep 17 00:00:00 2001 From: Artur Frenszek-Iwicki Date: Sat, 1 Jul 2023 14:00:00 +0200 Subject: [PATCH] Edit dependencies Make the lazarus metapackage strongly require the default set of sub-packages. This should prevent dependent packages from failing to build because weak dependencies are disabled in koji/mock. --- lazarus.spec | 46 +++++++++++++++++++++++----------------------- 1 file changed, 23 insertions(+), 23 deletions(-) diff --git a/lazarus.spec b/lazarus.spec index e210eaf..626538e 100644 --- a/lazarus.spec +++ b/lazarus.spec @@ -3,7 +3,7 @@ Summary: Lazarus Component Library and IDE for Free Pascal Version: 2.2.6 -%global baserelease 2 +%global baserelease 3 Release: %{baserelease}%{?dist} # The qt5pas version is taken from lcl/interfaces/qt5/cbindings/Qt5Pas.pro @@ -50,12 +50,17 @@ BuildRequires: perl-generators BuildRequires: qt5-qtbase-devel BuildRequires: qt5-qtx11extras-devel -# -- Run-time dependencies +# -- Run-time dependencies. +# Since "lazarus" is a metapackage, it puts strong requirements on the +# default set of sub-packages. Users not interested in the default set +# can omit the metapackage and install individual sub-packages +# as they see fit. Requires: %{name}-ide%{?_isa} = %{version}-%{release} Requires: %{name}-lcl%{?_isa} = %{version}-%{release} - -Recommends: %{name}-doc = %{version}-%{release} +Requires: %{name}-lcl-nogui%{?_isa} = %{version}-%{release} +Requires: %{name}-lcl-gtk2%{?_isa} = %{version}-%{release} +Requires: %{name}-tools%{?_isa} = %{version}-%{release} # For smooth upgrade from F38 or older. Can be removed in F41. Obsoletes: lazarus < 2.2.6-2 @@ -83,14 +88,16 @@ Lazarus Component Library (LCL). %package ide Summary: Lazarus RAD IDE for Free Pascal License: %{license_ide} -Requires: %{name}-tools%{?_isa} = %{version}-%{release} + +Requires: %{name}-lcl%{?_isa} = %{version}-%{release} +Requires: %{name}-tools%{?_isa} = %{version}-%{release} +Recommends: %{name}-doc = %{version}-%{release} + Requires: fpc-src Requires: gdb +Requires: hicolor-icon-theme Requires: make -# For smooth upgrade from F38 or older. Can be removed in F41. -Obsoletes: lazarus < 2.2.6-2 - %description ide Lazarus is a cross-platform IDE and component library for Free Pascal. @@ -104,9 +111,6 @@ Requires: binutils Requires: fpc%{?_isa} Requires: glibc-devel%{?_isa} -# For smooth upgrade from F38 or older. Can be removed in F41. -Obsoletes: lazarus < 2.2.6-2 - %description tools Lazarus is a cross-platform IDE and component library for Free Pascal. @@ -131,9 +135,6 @@ Summary: Lazarus Component Library Recommends: %{name}-lcl-nogui%{?_isa} = %{version}-%{release} Recommends: %{name}-lcl-gtk2%{?_isa} = %{version}-%{release} -# For smooth upgrade from F38 or older. Can be removed in F41. -Obsoletes: lazarus < 2.2.6-2 - %description lcl Lazarus is a cross-platform IDE and component library for Free Pascal. @@ -144,9 +145,6 @@ This package contains the common parts of the Lazarus Component Library. Summary: Lazarus Component Library - non-graphical components Requires: %{name}-lcl%{?_isa} = %{version}-%{release} -# For smooth upgrade from F38 or older. Can be removed in F41. -Obsoletes: lazarus < 2.2.6-2 - %description lcl-nogui Lazarus is a cross-platform IDE and component library for Free Pascal. @@ -160,9 +158,6 @@ Requires: %{name}-lcl%{?_isa} = %{version}-%{release} Requires: gtk2-devel%{?_isa} -# For smooth upgrade from F38 or older. Can be removed in F41. -Obsoletes: lazarus < 2.2.6-2 - %description lcl-gtk2 Lazarus is a cross-platform IDE and component library for Free Pascal. @@ -365,6 +360,9 @@ appstream-util validate-relax --nonet %{buildroot}%{_metainfodir}/%{name}.appdat %{_bindir}/lrstolfm %{_bindir}/updatepofiles +%dir %{_sysconfdir}/lazarus +%config(noreplace) %{_sysconfdir}/lazarus/environmentoptions.xml + %license lazarus/COPYING.GPL.txt %{_mandir}/man1/lazbuild.1* %{_mandir}/man1/lazres.1* @@ -396,8 +394,6 @@ appstream-util validate-relax --nonet %{buildroot}%{_metainfodir}/%{name}.appdat %{_datadir}/mime/packages/lazarus.xml %{_datadir}/icons/hicolor/48x48/mimetypes/* %{_metainfodir}/%{name}.appdata.xml -%dir %{_sysconfdir}/lazarus -%config(noreplace) %{_sysconfdir}/lazarus/environmentoptions.xml %doc lazarus/README.md %license lazarus/COPYING.txt @@ -440,7 +436,7 @@ appstream-util validate-relax --nonet %{buildroot}%{_metainfodir}/%{name}.appdat %license %{_libdir}/%{name}/lcl/interfaces/customdrawn/android/ApacheLicense2.0.txt %dir %{_libdir}/%{name} -%{_libdir}/%{name}/components +%{_libdir}/%{name}/components/ %{_libdir}/%{name}/lcl/ %lcl_base_files -n nogui %exclude %lcl_base_files -n gtk2 %exclude @@ -485,6 +481,10 @@ appstream-util validate-relax --nonet %{buildroot}%{_metainfodir}/%{name}.appdat %changelog +* Sat Jul 01 2023 Artur Frenszek-Iwicki - 2.2.6-3 +- Move /etc/lazarus from lazarus-ide to lazarus-tools (files required by lazbuild) +- Edit dependencies - make the lazarus metapackage strongly require the default set of sub-packages + * Thu Jun 08 2023 Artur Frenszek-Iwicki - 2.2.6-2 - Put the IDE, LCL and documentation in separate packages - Move lazbuild and other tools to a separate sub-package