From: Jan Rękorajski <baggins@pld-linux.org>
Date: Sun, 15 Nov 2020 09:15:17 +0000 (+0100)
Subject: - hrmib is not supported by rpm4, don't pretend it is
X-Git-Tag: auto/th/rpm-4.16.1.2-1~27
X-Git-Url: http://git.pld-linux.org/?p=packages%2Frpm.git;a=commitdiff_plain;h=dbbb9b40bf60b06cfaeaae5ac5d5b6b13916eac8

- hrmib is not supported by rpm4, don't pretend it is
---

diff --git a/rpm-hrmib-cache b/rpm-hrmib-cache
deleted file mode 100644
index 8ee25bb..0000000
--- a/rpm-hrmib-cache
+++ /dev/null
@@ -1,22 +0,0 @@
-#!/bin/sh
-build_hrmib_cache() {
-	# skip if no rpm(1), touch(1), xargs(1)
-	[ -x /bin/rpm -a -x /bin/touch -a -x /bin/xargs ] || return
-
-	export LC_ALL=C
-	umask 002
-
-	mydir=/var/cache/hrmib
-
-	echo >&2 "Populating $mydir with initial contents"
-	mkdir -p $mydir || return
-	echo $mydir/* | xargs rm -f
-
-	buf=$(rpm --nodigest --nosignature -qa --qf '%{N}-%{V}-%{R}.%{ARCH} %{INSTALLTIME:date}\n')
-	echo "$buf" | while read nvra idate; do
-		touch -d "$idate" "$mydir/$nvra"
-	done
-	touch $mydir
-}
-
-build_hrmib_cache
diff --git a/rpm.spec b/rpm.spec
index c7bef13..e5cd897 100644
--- a/rpm.spec
+++ b/rpm.spec
@@ -40,7 +40,6 @@ Source4:	%{name}.sysconfig
 Source5:	%{name}.groups
 Source6:	%{name}-groups-po.awk
 Source7:	%{name}-install-tree
-Source8:	%{name}-hrmib-cache
 Source9:	%{name}-user_group.sh
 # http://svn.pld-linux.org/banner.sh/
 Source10:	banner.sh
@@ -642,7 +641,7 @@ cd python
 %install
 rm -rf $RPM_BUILD_ROOT
 install -d $RPM_BUILD_ROOT{/bin,/%{_lib},/etc/sysconfig,%{_sysconfdir}/{rpm,pki/rpm-gpg}} \
-	$RPM_BUILD_ROOT{/var/lib/{banner,rpm},/var/cache/hrmib}
+	$RPM_BUILD_ROOT/var/lib/{banner,rpm}
 
 cp -p %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/pki/rpm-gpg/PLD-3.0-Th-GPG-key.asc
 
@@ -706,7 +705,6 @@ install -d $RPM_BUILD_ROOT%{_rpmlibdir}/pld
 
 cp -p %{SOURCE7} $RPM_BUILD_ROOT%{_rpmlibdir}/install-build-tree
 cp -p %{SOURCE9} $RPM_BUILD_ROOT%{_rpmlibdir}/user_group.sh
-cp -p %{SOURCE8} $RPM_BUILD_ROOT%{_rpmlibdir}/hrmib-cache
 cp -p %{SOURCE4} $RPM_BUILD_ROOT/etc/sysconfig/rpm
 
 cp -p %{SOURCE10} $RPM_BUILD_ROOT%{_bindir}/banner.sh
@@ -772,9 +770,6 @@ if [ -e /var/lib/rpm/Packages ] && \
 	%{_rpmlibdir}/dbupgrade.sh
 fi
 
-%triggerpostun -- %{name} < 4.4.9-44
-%{_rpmlibdir}/hrmib-cache
-
 %post	lib -p /sbin/ldconfig
 %postun lib -p /sbin/ldconfig
 
@@ -813,10 +808,6 @@ find %{_rpmlibdir} -name '*-linux' -type l | xargs rm -f
 
 %dir /var/lib/rpm
 
-# exported package NVRA (stamped with install tid)
-# net-snmp hrSWInstalledName queries, bash-completions
-%dir /var/cache/hrmib
-
 %{_rpmlibdir}/rpmpopt*
 %{_rpmlibdir}/rpmrc
 %{_rpmlibdir}/macros
@@ -856,8 +847,6 @@ find %{_rpmlibdir} -name '*-linux' -type l | xargs rm -f
 
 %dir %{_rpmlibdir}/pld
 
-%attr(755,root,root) %{_rpmlibdir}/hrmib-cache
-
 %attr(755,root,root) %{_rpmlibdir}/dbupgrade.sh
 %attr(755,root,root) %{_rpmlibdir}/rpmdb_checkversion
 %attr(755,root,root) %{_rpmlibdir}/rpmdb_reset