|
@@ -30,11 +30,18 @@
|
|
|
# Remove -s to get verbose output.
|
|
|
%define silentrules PARALLELMFLAGS=-s
|
|
|
|
|
|
+# We need to run ldconfig manually because __brp_ldconfig assumes that
|
|
|
+# glibc itself is always installed in $RPM_BUILD_ROOT, but with sysroots
|
|
|
+# we may be installed into a subdirectory of that path. Therefore we
|
|
|
+# unset __brp_ldconfig and run ldconfig by hand with the sysroots path
|
|
|
+# passed to -r.
|
|
|
+%undefine __brp_ldconfig
|
|
|
+
|
|
|
Summary: The GNU libc libraries
|
|
|
Summary(ja): GNU libc ライブラリ
|
|
|
Name: glibc
|
|
|
Version: %{glibcversion}
|
|
|
-Release: 1%{?_dist_release}%{?with_systemd:.systemd}
|
|
|
+Release: 2%{?_dist_release}%{?with_systemd:.systemd}
|
|
|
Group: system
|
|
|
Vendor: Project Vine
|
|
|
Distribution: Vine Linux
|
|
@@ -60,7 +67,7 @@ Source11: SUPPORTED
|
|
|
Source1000: rpm-old-changelog.txt
|
|
|
|
|
|
# patched form upstream
|
|
|
-Patch0: glibc-2.33-20210209.patch
|
|
|
+Patch0: glibc-2.33-20210308.patch
|
|
|
|
|
|
# patches from Fedora
|
|
|
#Patch1: glibc-post_upgrade.patch
|
|
@@ -319,8 +326,7 @@ Provides: %{name}-headers(%{_target_cpu})
|
|
|
%ifarch x86_64
|
|
|
# If both -m32 and -m64 is to be supported on AMD64, x86_64 glibc-headers
|
|
|
# have to be installed, not i586 ones.
|
|
|
-Obsoletes: %{name}-headers(i586)
|
|
|
-Obsoletes: %{name}-headers(i686)
|
|
|
+Obsoletes: %{name}-headers < %{version}-%{release}
|
|
|
%endif
|
|
|
Requires(pre): kernel-headers
|
|
|
Requires: kernel-headers >= 2.2.1, %{name} = %{version}-%{release}
|
|
@@ -1512,6 +1518,20 @@ popd
|
|
|
%endif # %{run_glibc_tests}
|
|
|
|
|
|
|
|
|
+######################################################################
|
|
|
+# File triggers to do ldconfig calls automatically (see rhbz#1380878)
|
|
|
+######################################################################
|
|
|
+
|
|
|
+# File triggers for when libraries are added or removed in standard
|
|
|
+# paths.
|
|
|
+%transfiletriggerin common -P 2000000 -- /lib /usr/lib /lib64 /usr/lib64
|
|
|
+/sbin/ldconfig
|
|
|
+%end
|
|
|
+
|
|
|
+%transfiletriggerpostun common -P 2000000 -- /lib /usr/lib /lib64 /usr/lib64
|
|
|
+/sbin/ldconfig
|
|
|
+%end
|
|
|
+
|
|
|
%pre -p <lua>
|
|
|
-- Check that the running kernel is new enough
|
|
|
required = '%{enablekernel}'
|
|
@@ -1656,11 +1676,6 @@ else
|
|
|
io.stdout:write ("Error: Missing " .. iconv_cache .. " file.\n")
|
|
|
end
|
|
|
|
|
|
-%postun -p /sbin/ldconfig
|
|
|
-
|
|
|
-%post -n compat32-%{name} -p /sbin/ldconfig
|
|
|
-%postun -n compat32-%{name} -p /sbin/ldconfig
|
|
|
-
|
|
|
%triggerin common -p <lua> -- glibc
|
|
|
if posix.stat("%{_prefix}/lib/locale/locale-archive.tmpl", "size") > 0 then
|
|
|
pid = posix.fork()
|
|
@@ -1778,10 +1793,6 @@ if [ "$1" = 0 ]; then
|
|
|
/sbin/install-info --delete %{_infodir}/libc.info.gz %{_infodir}/dir > /dev/null 2>&1 || :
|
|
|
fi
|
|
|
|
|
|
-%post utils -p /sbin/ldconfig
|
|
|
-
|
|
|
-%postun utils -p /sbin/ldconfig
|
|
|
-
|
|
|
%pre -n nscd
|
|
|
getent group nscd >/dev/null || /usr/sbin/groupadd -g 28 -r nscd
|
|
|
getent passwd nscd >/dev/null ||
|
|
@@ -1817,15 +1828,12 @@ if [ "$1" -ge "1" ]; then
|
|
|
fi
|
|
|
%endif
|
|
|
|
|
|
-%if %{xenpackage}
|
|
|
-%post xen -p /sbin/ldconfig
|
|
|
-%postun xen -p /sbin/ldconfig
|
|
|
-%endif
|
|
|
|
|
|
%clean
|
|
|
rm -rf "$RPM_BUILD_ROOT"
|
|
|
rm -f *.filelist*
|
|
|
|
|
|
+
|
|
|
%files -f glibc.filelist
|
|
|
%defattr(-,root,root)
|
|
|
/sbin/ldconfig
|
|
@@ -1940,6 +1948,10 @@ rm -f *.filelist*
|
|
|
%endif
|
|
|
|
|
|
%changelog
|
|
|
+* Mon Mar 08 2021 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 2.33-2
|
|
|
+- updated Patch0.
|
|
|
+- added filetriggers.
|
|
|
+
|
|
|
* Tue Feb 09 2021 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 2.33-1
|
|
|
- updated to 2.33.
|
|
|
- updated Patch0.
|