From ec548c1605c3f672001b4eae3f52a1c20bcdbbbb Mon Sep 17 00:00:00 2001 From: Mark Wielaard Date: Thu, 23 Jul 2020 01:07:41 +0200 Subject: [PATCH] Remove elfutils-libelf-devel-static and elfutils-devel-static --- elfutils.spec | 42 +++++++++--------------------------------- 1 file changed, 9 insertions(+), 33 deletions(-) diff --git a/elfutils.spec b/elfutils.spec index 6d0734e..55f3775 100644 --- a/elfutils.spec +++ b/elfutils.spec @@ -1,6 +1,6 @@ Name: elfutils Version: 0.180 -%global baserelease 4 +%global baserelease 5 Release: %{baserelease}%{?dist} URL: http://elfutils.org/ %global source_url ftp://sourceware.org/pub/elfutils/%{version}/ @@ -101,6 +101,7 @@ Recommends: elfutils-debuginfod-client-devel%{depsuffix} = %{version}-%{release} %else Requires: elfutils-debuginfod-client-devel%{depsuffix} = %{version}-%{release} %endif +Obsoletes: elfutils-devel-static%{depsuffix} < 0.180-5 %description devel The elfutils-devel package contains the libraries to create @@ -108,19 +109,6 @@ applications for handling compiled objects. libdw provides access to the DWARF debugging information. libasm provides a programmable assembler interface. -%package devel-static -Summary: Static archives to handle compiled objects -License: GPLv2+ or LGPLv3+ -%if 0%{!?_isa:1} -Provides: elfutils-devel-static%{depsuffix} = %{version}-%{release} -%endif -Requires: elfutils-devel%{depsuffix} = %{version}-%{release} -Requires: elfutils-libelf-devel-static%{depsuffix} = %{version}-%{release} - -%description devel-static -The elfutils-devel-static package contains the static archives -with the code to handle compiled objects. - %package libelf Summary: Library to read and write ELF files License: GPLv2+ or LGPLv3+ @@ -143,6 +131,7 @@ Provides: elfutils-libelf-devel%{depsuffix} = %{version}-%{release} %endif Requires: elfutils-libelf%{depsuffix} = %{version}-%{release} Obsoletes: libelf-devel <= 0.8.2-2 +Obsoletes: elfutils-libelf-devel-static%{depsuffix} < 0.180-5 %description libelf-devel The elfutils-libelf-devel package contains the libraries to create @@ -150,18 +139,6 @@ applications for handling compiled objects. libelf allows you to access the internals of the ELF object file format, so you can see the different sections of an ELF file. -%package libelf-devel-static -Summary: Static archive of libelf -License: GPLv2+ or LGPLv3+ -%if 0%{!?_isa:1} -Provides: elfutils-libelf-devel-static%{depsuffix} = %{version}-%{release} -%endif -Requires: elfutils-libelf-devel%{depsuffix} = %{version}-%{release} - -%description libelf-devel-static -The elfutils-libelf-static package contains the static archive -for libelf. - %if %{provide_yama_scope} %package default-yama-scope Summary: Default yama attach scope sysctl setting @@ -281,6 +258,9 @@ rm -rf ${RPM_BUILD_ROOT} %make_install -s chmod +x ${RPM_BUILD_ROOT}%{_prefix}/%{_lib}/lib*.so* +# We don't want the static libraries +rm ${RPM_BUILD_ROOT}%{_prefix}/%{_lib}/lib{elf,dw,asm}.a + %find_lang %{name} @@ -368,10 +348,6 @@ fi %{_libdir}/libdw.so %{_libdir}/pkgconfig/libdw.pc -%files devel-static -%{_libdir}/libdw.a -%{_libdir}/libasm.a - %files -f %{name}.lang libelf %{!?_licensedir:%global license %%doc} %license COPYING-GPLV2 COPYING-LGPLV3 @@ -386,9 +362,6 @@ fi %{_libdir}/pkgconfig/libelf.pc %{_mandir}/man3/elf_*.3* -%files libelf-devel-static -%{_libdir}/libelf.a - %if %{provide_yama_scope} %files default-yama-scope %{_sysctldir}/10-default-yama-scope.conf @@ -433,6 +406,9 @@ exit 0 %systemd_postun_with_restart debuginfod.service %changelog +* Wed Jul 22 2020 Mark Wielaard - 0.180-5 +- Remove elfutils-libelf-devel-static and elfutils-devel-static subpackages. + * Mon Jul 13 2020 Tom Stellard - 0.180-4 - Use make macros - https://fedoraproject.org/wiki/Changes/UseMakeBuildInstallMacro