[packages/e2fsprogs] - don't create empty libcom_err package if allstatic

qboosh qboosh at pld-linux.org
Tue Oct 7 19:56:10 CEST 2025


commit 1345270113aa17e71c1213c94c731dba5b4539fa
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date:   Tue Oct 7 19:48:14 2025 +0200

    - don't create empty libcom_err package if allstatic

 e2fsprogs.spec | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)
---
diff --git a/e2fsprogs.spec b/e2fsprogs.spec
index 0afb382..8412d8f 100644
--- a/e2fsprogs.spec
+++ b/e2fsprogs.spec
@@ -90,10 +90,12 @@ BuildRequires:	libuuid-static
 %endif
 Requires(post,postun):	/sbin/ldconfig
 Requires(post,preun,postun):	systemd-units >= 38
+%if %{without allstatic}
 Requires:	%{name}-libs = %{version}-%{release}
-Requires:	fsck
 Requires:	libcom_err = %{version}-%{release}
 Requires:	libss = %{version}-%{release}
+%endif
+Requires:	fsck
 Requires:	systemd-units >= 38
 Obsoletes:	e2fsprogs-evms < 1.36
 Obsoletes:	libext2fs2
@@ -532,7 +534,9 @@ Biblioteka opisu popularnych błędów dla uniksów.
 Summary:	Development files for Common Error Description Library for unices
 Summary(pl.UTF-8):	Pliki dla programistów do biblioteki opisu popularnych błędów dla uniksów
 Group:		Development/Libraries
+%if %{without allstatic}
 Requires:	libcom_err = %{version}-%{release}
+%endif
 Conflicts:	e2fsprogs-devel < 1.34-3
 
 %description -n libcom_err-devel
@@ -574,7 +578,9 @@ Summary:	Development files for subsystem command parsing library
 Summary(pl.UTF-8):	Pliki dla programistów do biblioteki analizy poleceń podsystemów
 Group:		Development/Libraries
 Requires:	libcom_err-devel = %{version}-%{release}
+%if %{without allstatic}
 Requires:	libss = %{version}-%{release}
+%endif
 Conflicts:	e2fsprogs < 1.41.11-2
 Conflicts:	e2fsprogs-devel < 1.41.11-2
 
@@ -978,9 +984,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/libe2p.a
 %{_libdir}/libext2fs.a
 
+%if %{without allstatic}
 %files -n libcom_err
 %defattr(644,root,root,755)
-%if %{without allstatic}
 %attr(755,root,root) /%{_lib}/libcom_err.so.*.*
 %ghost /%{_lib}/libcom_err.so.2
 %endif
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/e2fsprogs.git/commitdiff/a5c0f2dde4c60871e75a3849d6043ca7d48d3585



More information about the pld-cvs-commit mailing list