rpms/rpm
7
0
Fork 0
Code Issues Pull Requests Releases Activity

Remove direct ldconfig calls, use compat macros instead

Browse Source
This commit is contained in:
Panu Matilainen 2018-06-29 11:00:36 +03:00
parent b86c75e7b0
commit 7d7537244d
1 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
rpm.spec
View File

@ -23,7 +23,7 @@
%global rpmver 4.14.1 %global rpmver 4.14.1
#global snapver rc2 #global snapver rc2
%global rel 10 %global rel 11
%global srcver %{version}%{?snapver:-%{snapver}} %global srcver %{version}%{?snapver:-%{snapver}}
%global srcdir %{?snapver:testing}%{!?snapver:%{name}-%(echo %{version} | cut -d'.' -f1-2).x} %global srcdir %{?snapver:testing}%{!?snapver:%{name}-%(echo %{version} | cut -d'.' -f1-2).x}
@ -35,7 +35,7 @@
Summary: The RPM package management system Summary: The RPM package management system
Name: rpm Name: rpm
Version: %{rpmver} Version: %{rpmver}
Release: %{?snapver:0.%{snapver}.}%{rel}%{?dist}.1 Release: %{?snapver:0.%{snapver}.}%{rel}%{?dist}
Group: System Environment/Base Group: System Environment/Base
Url: http://www.rpm.org/ Url: http://www.rpm.org/
Source0: http://ftp.rpm.org/releases/%{srcdir}/%{name}-%{srcver}.tar.bz2 Source0: http://ftp.rpm.org/releases/%{srcdir}/%{name}-%{srcver}.tar.bz2
@ -468,11 +468,9 @@ chmod a-x $RPM_BUILD_ROOT/%{rpmhome}/python-macro-helper
make check || cat tests/rpmtests.log make check || cat tests/rpmtests.log
%endif %endif
%post libs -p /sbin/ldconfig # Fedora < 28 and EPEL-7 builds need these
%postun libs -p /sbin/ldconfig %ldconfig_scripts libs
%ldconfig_scripts build-libs
%post build-libs -p /sbin/ldconfig
%postun build-libs -p /sbin/ldconfig
%files -f %{name}.lang %files -f %{name}.lang
%license COPYING %license COPYING
@ -607,6 +605,9 @@ make check || cat tests/rpmtests.log
%doc doc/librpm/html/* %doc doc/librpm/html/*
%changelog %changelog
* Fri Jun 29 2018 Panu Matilainen <pmatilai@redhat.com> - 4.14.2-11
- Remove direct ldconfig calls, use compat macros instead
* Fri Jun 15 2018 Miro Hrončok <mhroncok@redhat.com> - 4.14.1-10.1 * Fri Jun 15 2018 Miro Hrončok <mhroncok@redhat.com> - 4.14.1-10.1
- Rebuilt for Python 3.7 - Rebuilt for Python 3.7