From mboxrd@z Thu Jan 1 00:00:00 1970 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: base64 From: Pat Riehecky To: git-commits@fedoraproject.org Subject: [rpms/ocsinventory-agent] epel10.2: Fix for /usr/sbin merge in Fedora 42 Date: Fri, 05 Jun 2026 19:02:59 GMT Message-ID: <178068617949.1.2142470154801621981.rpms-ocsinventory-agent-e09643beb709@fedoraproject.org> List-ID: X-Git-Repo: rpms/ocsinventory-agent X-Git-Branch: epel10.2 X-Git-Rev: e09643beb7097b05f90ae106424916afece961e4 QSBuZXcgY29tbWl0IGhhcyBiZWVuIHB1c2hlZC4KClJlcG8gICA6IHJwbXMvb2NzaW52ZW50b3J5 LWFnZW50CkJyYW5jaCA6IGVwZWwxMC4yCkNvbW1pdCA6IGUwOTY0M2JlYjcwOTdiMDVmOTBhZTEw NjQyNDkxNmFmZWNlOTYxZTQKQXV0aG9yIDogUGF0IFJpZWhlY2t5IDxyaWVoZWNreUBmbmFsLmdv dj4KRGF0ZSAgIDogMjAyNS0wMS0yMlQxNTozMToyMy0wNjowMApTdGF0cyAgOiArNy8tMiBpbiAx IGZpbGUocykKVVJMICAgIDogaHR0cHM6Ly9zcmMuZmVkb3JhcHJvamVjdC5vcmcvcnBtcy9vY3Np bnZlbnRvcnktYWdlbnQvYy9lMDk2NDNiZWI3MDk3YjA1ZjkwYWUxMDY0MjQ5MTZhZmVjZTk2MWU0 P2JyYW5jaD1lcGVsMTAuMgoKTG9nOgpGaXggZm9yIC91c3Ivc2JpbiBtZXJnZSBpbiBGZWRvcmEg NDIKCi0tLQpkaWZmIC0tZ2l0IGEvb2NzaW52ZW50b3J5LWFnZW50LnNwZWMgYi9vY3NpbnZlbnRv cnktYWdlbnQuc3BlYwppbmRleCBmZjBkZjBhLi44MjgzZjVjIDEwMDY0NAotLS0gYS9vY3NpbnZl bnRvcnktYWdlbnQuc3BlYworKysgYi9vY3NpbnZlbnRvcnktYWdlbnQuc3BlYwpAQCAtMjIyLDgg KzIyMiwxMCBAQCBybSBydW4tcG9zdGluc3QKICV7bWFrZV9pbnN0YWxsfQogZmluZCAle2J1aWxk cm9vdH0gLXR5cGUgZiAtbmFtZSAnKi5icycgLXNpemUgMCAtZGVsZXRlCiAKLSMgTW92ZSBleGUg dG8gcm9vdCBkaXJlY3RvcnkKLW12ICV7YnVpbGRyb290fSV7X2JpbmRpcn0gJXtidWlsZHJvb3R9 JXtfc2JpbmRpcn0KK2lmIFtbICIle19iaW5kaXJ9IiAhPSAiJXtfc2JpbmRpcn0iIF1dOyB0aGVu CisgICAgIyBNb3ZlIGV4ZSB0byByaWdodCBkaXJlY3RvcnkKKyAgICBtdiAle2J1aWxkcm9vdH0l e19iaW5kaXJ9ICV7YnVpbGRyb290fSV7X3NiaW5kaXJ9CitmaQogCiBta2RpciAtcCAle2J1aWxk cm9vdH0le19sb2NhbHN0YXRlZGlyfS97bG9nLGxpYn0vJXtuYW1lfQogbWtkaXIgLXAgJXtidWls ZHJvb3R9JXtfc3lzY29uZmRpcn0ve2xvZ3JvdGF0ZS5kLHN5c2NvbmZpZyxvY3NpbnZlbnRvcnkv c29mdHdhcmVzfQpAQCAtMzA1LDYgKzMwNyw5IEBAIGZpbmQgJXtidWlsZHJvb3R9IC10eXBlIGYg LW5hbWUgLl8uRFNfU3RvcmUgLWV4ZWMgcm0ge30gXDsKIAogCiAlY2hhbmdlbG9nCisqIFdlZCBK YW4gMjIgMjAyNSBQYXQgUmllaGVja3kgPHJpZWhlY2t5QGZuYWwuZ292PiAtIDIuMTAuNC02Cist IEZpeCBmb3IgL3Vzci9zYmluIG1lcmdlIGluIEY0MgorCiAqIEZyaSBKYW4gMTcgMjAyNSBGZWRv cmEgUmVsZWFzZSBFbmdpbmVlcmluZyA8cmVsZW5nQGZlZG9yYXByb2plY3Qub3JnPiAtIDIuMTAu NC01CiAtIFJlYnVpbHQgZm9yIGh0dHBzOi8vZmVkb3JhcHJvamVjdC5vcmcvd2lraS9GZWRvcmFf NDJfTWFzc19SZWJ1aWxkCiAK