SOURCES/updatedb.conf

@@ -1,4 +1,4 @@
 PRUNE_BIND_MOUNTS = "yes"
 PRUNEFS = "9p afs anon_inodefs auto autofs bdev binfmt_misc cgroup cifs coda configfs cpuset debugfs devpts ecryptfs exofs fuse fuse.sshfs fusectl gfs gfs2 gpfs hugetlbfs inotifyfs iso9660 jffs2 lustre mqueue ncpfs nfs nfs4 nfsd pipefs proc ramfs rootfs rpc_pipefs securityfs selinuxfs sfs sockfs sysfs tmpfs ubifs udf usbfs ceph fuse.ceph"
 PRUNENAMES = ".git .hg .svn .bzr .arch-ids {arch} CVS"
-PRUNEPATHS = "/afs /media /mnt /net /sfs /tmp /udev /var/cache/ccache /var/lib/yum/yumdb /var/lib/dnf/yumdb /var/spool/cups /var/spool/squid /var/tmp /var/lib/ceph /var/lib/mock /sysroot/ostree/deploy"
+PRUNEPATHS = "/afs /media /mnt /net /sfs /tmp /udev /var/cache/ccache /var/lib/yum/yumdb /var/lib/dnf/yumdb /var/spool/cups /var/spool/squid /var/tmp /var/lib/ceph"

SPECS/mlocate.spec

@@ -3,9 +3,10 @@
 Summary: An utility for finding files by name
 Name: mlocate
 Version: 0.26
-Release: 30%{?dist}
+Release: 20%{?dist}
 License: GPLv2
 URL: https://fedorahosted.org/mlocate/
+Group: Applications/System
 Source0: https://fedorahosted.org/releases/m/l/mlocate/mlocate-%{version}.tar.xz
 Source1: updatedb.conf
 Source2: mlocate-run-updatedb
@@ -15,9 +16,7 @@ Requires(pre): shadow-utils
 Requires(post): grep, sed
 # standard systemd requires
 %{?systemd_requires}
-BuildRequires: make
 BuildRequires: systemd
-BuildRequires: gcc
 Provides: bundled(gnulib)
 Obsoletes: slocate <= 2.7-30
 
@@ -58,17 +57,6 @@ exit 0
 if /bin/grep -q '^[^#]*DAILY_UPDATE' %{_sysconfdir}/updatedb.conf; then
     /bin/sed -i.rpmsave -e '/DAILY_UPDATE/s/^/#/' %{_sysconfdir}/updatedb.conf
 fi
-# Bind mounts shouldn't be pruned on ostree based systems so locate works
-# properly on HOME and other directories. We can't use the ostree-booted file
-# to identy Silverblue - see
-# https://github.com/fedora-silverblue/issue-tracker/issues/76#issuecomment-714562564
-. /etc/os-release || exit
-if [ "$VARIANT_ID" = "silverblue" ] || [ -f /run/ostree-booted ]; then
-  if /bin/grep -q '^[^#]*PRUNE_BIND_MOUNTS' %{_sysconfdir}/updatedb.conf; then
-      /bin/sed -i.rpmsave -e '/PRUNE_BIND_MOUNTS/s/^/#/' %{_sysconfdir}/updatedb.conf
-  fi
-fi
-
 %systemd_post mlocate-updatedb.timer
 systemctl start mlocate-updatedb.timer
 
@@ -94,39 +82,6 @@ systemctl start mlocate-updatedb.timer
 %ghost %attr(0640,root,slocate) %{_localstatedir}/lib/mlocate/mlocate.db
 
 %changelog
-* Mon Aug 09 2021 Mohan Boddu <mboddu@redhat.com> - 0.26-30
-- Rebuilt for IMA sigs, glibc 2.34, aarch64 flags
-  Related: rhbz#1991688
-
-* Fri Apr 16 2021 Mohan Boddu <mboddu@redhat.com> - 0.26-29
-- Rebuilt for RHEL 9 BETA on Apr 15th 2021. Related: rhbz#1947937
-
-* Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 0.26-28
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
-
-* Thu Oct 22 2020 Tomas Popela <tpopela@redhat.com> - 0.26-27
-- Don't prune bind mounts on ostree based systems, prune the deployments folder
-  there to avoid duplications.
-- Fixes: https://github.com/fedora-silverblue/issue-tracker/issues/76
-
-* Tue Jul 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 0.26-26
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
-
-* Wed Jan 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 0.26-25
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
-
-* Thu Jul 25 2019 Fedora Release Engineering <releng@fedoraproject.org> - 0.26-24
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
-
-* Fri Feb 01 2019 Fedora Release Engineering <releng@fedoraproject.org> - 0.26-23
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
-
-* Fri Jul 13 2018 Fedora Release Engineering <releng@fedoraproject.org> - 0.26-22
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
-
-* Thu Mar 22 2018 Michal Sekletar <msekleta@redhat.com> - 0.26-21
-- add gcc to BuildRequires
-
 * Fri Feb 09 2018 Igor Gnatenko <ignatenkobrain@fedoraproject.org> - 0.26-20
 - Escape macros in %%changelog