From 924384baf48a160fa0b0d2782135adc287d4b23c Mon Sep 17 00:00:00 2001 From: Funda Wang Date: Tue, 6 Aug 2024 02:29:49 +0800 Subject: [PATCH] Move .so file into devel package (cherry picked from commit 55ef3f2461f813e124d580c8f87834fef746bb82) --- popt.spec | 34 ++++++++++++---------------------- 1 file changed, 12 insertions(+), 22 deletions(-) diff --git a/popt.spec b/popt.spec index 587d03e..845abc0 100644 --- a/popt.spec +++ b/popt.spec @@ -1,10 +1,10 @@ Name: popt Version: 1.19 -Release: 2 +Release: 3 Summary: C library for parsing command line parameters License: MIT URL: https://github.com/rpm-software-management/popt/ -Source0: http://ftp.rpm.org/%{name}/releases/%{name}-1.x/%{name}-%{version}.tar.gz +Source0: https://ftp.osuosl.org/pub/rpm/popt/releases/popt-1.x/%{name}-%{version}.tar.gz Patch0: fix-obscure-iconv-mis-call-error-path-could-lead-to-.patch Patch1: fix-handle-newly-added-asset-.-call-like-elsewhere.patch @@ -13,7 +13,7 @@ Patch3: fix-coverity-CID-1057440-Unused-pointer-value-UNUSED.patch Patch9000: revert-fix-memory-leak-regressions-in-popt.patch -BuildRequires: gcc git gettext +BuildRequires: gcc gettext %description The popt library exists essentially for parsing command line options. Some @@ -26,7 +26,6 @@ of help and usage messages. %package devel Summary: Development files for %{name} Requires: %{name} = %{version}-%{release} -Requires: pkgconfig Provides: %{name}-static = %{version}-%{release} Obsoletes: %{name}-static < %{version}-%{release} @@ -34,12 +33,7 @@ Obsoletes: %{name}-static < %{version}-%{release} The %{name}-devel package contains libraries and header files for developing applications that use %{name}. -%package help -Summary: Doc files for %{name} -Buildarch: noarch - -%description help -The %{name}-help package contains doc files for %{name}. +%package_help %prep %autosetup -n %{name}-%{version} -p1 @@ -50,37 +44,33 @@ The %{name}-help package contains doc files for %{name}. %install %make_install -rm -f %{buildroot}/%{_libdir}/libpopt.la +%delete_la mkdir -p %{buildroot}/%{_sysconfdir}/popt.d %find_lang %{name} %check -make check - -%pre - -%preun - -%post -p /sbin/ldconfig - -%postun -p /sbin/ldconfig +%make_build check %files -f %{name}.lang %license COPYING %{_sysconfdir}/%{name}.d -%{_libdir}/lib%{name}.so* +%{_libdir}/lib%{name}.so.* %files devel %{_includedir}/%{name}.h %{_libdir}/pkgconfig/%{name}.pc +%{_libdir}/lib%{name}.so %{_libdir}/lib%{name}.a %files help %doc README -%{_mandir}/man3/%{name}.3.gz +%{_mandir}/man3/* %changelog +* Tue Aug 06 2024 Funda Wang - 1.19-3 +- Move .so file into devel package + * Tue Dec 13 2022 Jiayi Chen <1398871225@qq.com> - 1.19-2 - Revert fix memory leak regressions in popt introduced by updating to 1.19 -- Gitee