From 5606d6d5e63394c545b5de6cd880eb6957a18bda Mon Sep 17 00:00:00 2001 From: Dariusz Michaluk Date: Mon, 17 Jun 2019 15:17:52 +0200 Subject: [PATCH] Temporary workaround libopenssl-devel/libopenssl1.1-devel conflict If some package use efl and libopenssl-devel, libopenssl1.1-devel is downloaded by GBS also, this cause conflict. Requires.private field is a list of private packages required by this package, but not exposed to applications. We can ommit this field. Change-Id: I8a6e39fc79097c9380212e3a2b586931566dc5a4 --- packaging/efl.spec | 2 ++ 1 file changed, 2 insertions(+) diff --git a/packaging/efl.spec b/packaging/efl.spec index c14af1e..2e9bb82 100644 --- a/packaging/efl.spec +++ b/packaging/efl.spec @@ -1257,6 +1257,8 @@ ninja \ mv %{buildroot}%{_libdir}/libelementary_t.so.1.22.100 %{buildroot}%{_libdir}/libelementary.so.1.22.100 rm %{buildroot}%{_libdir}/libelementary_t.* +sed -i 's/, openssl1.1//g' %{buildroot}%{_libdir}/pkgconfig/*.pc + mkdir -p %{buildroot}%{_tmpfilesdir} install -m 0644 %SOURCE100 %{buildroot}%{_tmpfilesdir}/efl.conf -- 2.7.4