From 55d327dbc5cae219d300879e97bd2849fe1c4fc7 Mon Sep 17 00:00:00 2001 From: Slava Barinov Date: Thu, 26 Mar 2020 16:06:16 +0300 Subject: [PATCH] packaging: Fixed packaging to prevent conflicts Signed-off-by: Slava Barinov --- packaging/elfutils.spec | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/packaging/elfutils.spec b/packaging/elfutils.spec index 95307d9..8bef4bd 100644 --- a/packaging/elfutils.spec +++ b/packaging/elfutils.spec @@ -8,7 +8,8 @@ Url: http://elfutils.fedorahosted.org Group: Base/Utilities Source: elfutils-%{version}.tar.bz2 Source2: baselibs.conf -Source1001: elfutils.manifest +Source1001: elfutils.manifest +Requires: libdw libelf BuildRequires: automake BuildRequires: bison BuildRequires: bzip2-devel @@ -93,12 +94,14 @@ cp %{SOURCE1001} . #DATE="\"$(date -d "${modified}" "+%%b %%e %%Y")\"" #TIME="\"$(date -d "${modified}" "+%%R")\"" #find . -type f -regex ".*\.c\|.*\.cpp\|.*\.h" -exec sed -i "s/__DATE__/${DATE}/g;s/__TIME__/${TIME}/g" {} + -%reconfigure CFLAGS="$CFLAGS -Wno-missing-attributes -Wno-implicit-fallthrough -Wno-format-truncation -Wno-absolute-value -Wno-nonnull-compare -Wno-misleading-indentation" --program-prefix=eu- --enable-maintainer-mode --disable-debuginfod --enable-static +%reconfigure CFLAGS="$CFLAGS -Wno-missing-attributes -Wno-implicit-fallthrough -Wno-format-truncation -Wno-absolute-value -Wno-nonnull-compare -Wno-misleading-indentation" --program-prefix=eu- --enable-maintainer-mode --disable-debuginfod make %{?_smp_mflags} %install %make_install # remove unneeded files +rm -f %{buildroot}%{_libdir}/pkgconfig/libdebuginfod.pc +rm -rf %{buildroot}/usr/share/man ls -lR %{buildroot}%{_libdir}/libelf* %post -n libelf -p /sbin/ldconfig @@ -148,6 +151,7 @@ ls -lR %{buildroot}%{_libdir}/libelf* %dir %{_includedir}/elfutils %{_includedir}/elfutils/elf-knowledge.h %{_includedir}/elfutils/version.h +%{_libdir}/pkgconfig/libelf.pc %files -n libdw %manifest %{name}.manifest @@ -166,5 +170,7 @@ ls -lR %{buildroot}%{_libdir}/libelf* %{_includedir}/elfutils/libdw.h %{_includedir}/elfutils/libdwfl.h %{_includedir}/elfutils/libdwelf.h +%{_includedir}/elfutils/known-dwarf.h +%{_libdir}/pkgconfig/libdw.pc %changelog -- 2.7.4