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: Jan Kratochvil To: git-commits@fedoraproject.org Subject: [rpms/gdb] fix-dup-patch: Simplify .spec: Remove conditional revert of: gdb-6.6-buildid-locate-rpm-scl.patch Date: Thu, 23 Jul 2026 18:32:04 GMT Message-ID: <178483152491.1.4373557129902472756.rpms-gdb-46cc044291e5@fedoraproject.org> List-ID: X-Git-Repo: rpms/gdb X-Git-Branch: fix-dup-patch X-Git-Rev: 46cc044291e53d88055c24c46aabd08dbc0456d6 QSBuZXcgY29tbWl0IGhhcyBiZWVuIHB1c2hlZC4KClJlcG8gICA6IHJwbXMvZ2RiCkJyYW5jaCA6 IGZpeC1kdXAtcGF0Y2gKQ29tbWl0IDogNDZjYzA0NDI5MWU1M2Q4ODA1NWMyNGM0NmFhYmQwOGRi YzA0NTZkNgpBdXRob3IgOiBKYW4gS3JhdG9jaHZpbCA8amFuLmtyYXRvY2h2aWxAcmVkaGF0LmNv bT4KRGF0ZSAgIDogMjAxNi0wMS0wOVQxNDo0Njo0MiswMTowMApTdGF0cyAgOiArNjAvLTQzIGlu IDIgZmlsZShzKQpVUkwgICAgOiBodHRwczovL3NyYy5mZWRvcmFwcm9qZWN0Lm9yZy9ycG1zL2dk Yi9jLzQ2Y2MwNDQyOTFlNTNkODgwNTVjMjRjNDZhYWJkMDhkYmMwNDU2ZDY/YnJhbmNoPWZpeC1k dXAtcGF0Y2gKCkxvZzoKU2ltcGxpZnkgLnNwZWM6IFJlbW92ZSBjb25kaXRpb25hbCByZXZlcnQg b2Y6IGdkYi02LjYtYnVpbGRpZC1sb2NhdGUtcnBtLXNjbC5wYXRjaAoKLS0tCmRpZmYgLS1naXQg YS9nZGItNi42LWJ1aWxkaWQtbG9jYXRlLXJwbS1zY2wucGF0Y2ggYi9nZGItNi42LWJ1aWxkaWQt bG9jYXRlLXJwbS1zY2wucGF0Y2gKaW5kZXggZDU1MzNlOC4uZjJmNjA1ZCAxMDA2NDQKLS0tIGEv Z2RiLTYuNi1idWlsZGlkLWxvY2F0ZS1ycG0tc2NsLnBhdGNoCisrKyBiL2dkYi02LjYtYnVpbGRp ZC1sb2NhdGUtcnBtLXNjbC5wYXRjaApAQCAtMSw2MCArMSwzOCBAQAogd2FybmluZzogU2tpcHBp bmcgZGVwcmVjYXRlZCAuZ2RiX2luZGV4IHNlY3Rpb24KIGh0dHBzOi8vYnVnemlsbGEucmVkaGF0 LmNvbS9zaG93X2J1Zy5jZ2k/aWQ9OTUzNTg1CiAKLUluZGV4OiBnZGItNy42LjkwLjIwMTQwMTI3 L2dkYi9kd2FyZjJyZWFkLmMKLT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tLSBnZGItNy42LjkwLjIwMTQwMTI3Lm9y aWcvZ2RiL2R3YXJmMnJlYWQuYwkyMDE0LTAyLTA2IDE4OjI4OjIzLjc1NjIzMjAyNiArMDEwMAot KysrIGdkYi03LjYuOTAuMjAxNDAxMjcvZ2RiL2R3YXJmMnJlYWQuYwkyMDE0LTAyLTA2IDE4OjI4 OjQ4Ljk2OTI1OTEyMiArMDEwMAotQEAgLTMwMzUsNiArMzAzNSwxNCBAQCByZWFkX2luZGV4X2Zy b21fc2VjdGlvbiAoc3RydWN0IG9iamZpbGUKLSAgICAgICJzZXQgdXNlLWRlcHJlY2F0ZWQtaW5k ZXgtc2VjdGlvbnMgb24iLiAgKi8KLSAgIGlmICh2ZXJzaW9uIDwgNiAmJiAhZGVwcmVjYXRlZF9v aykKLSAgICAgewotKyAgICAgIGV4dGVybiBpbnQgcnBtX3ZlcmlmeV92ZW5kb3IgKGNvbnN0IGNo YXIgKmZpbGVuYW1lKTsKLSsKLSsgICAgICAvKiBSZWQgSGF0IERldmVsb3BlciBUb29sc2V0IGV4 Y2VwdGlvbi4gICovCi0rICAgICAgaWYgKHJwbV92ZXJpZnlfdmVuZG9yIChmaWxlbmFtZSkpCi0r CXt9Ci0rICAgICAgZWxzZQotKyAgICAgIHsKLSsKLSAgICAgICBzdGF0aWMgaW50IHdhcm5pbmdf cHJpbnRlZCA9IDA7Ci0gICAgICAgaWYgKCF3YXJuaW5nX3ByaW50ZWQpCi0gCXsKLUBAIC0zMDQ2 LDYgKzMwNTQsOCBAQCB0byB1c2UgdGhlIHNlY3Rpb24gYW55d2F5LiIpLAotIAkgIHdhcm5pbmdf cHJpbnRlZCA9IDE7Ci0gCX0KLSAgICAgICByZXR1cm4gMDsKLSsKLSsgICAgICB9Ci0gICAgIH0K LSAgIC8qIFZlcnNpb24gNyBpbmRpY2VzIGdlbmVyYXRlZCBieSBnb2xkIHJlZmVyIHRvIHRoZSBD VSBmb3IgYSBzeW1ib2wgaW5zdGVhZAotICAgICAgb2YgdGhlIFRVIChmb3Igc3ltYm9scyBjb21p bmcgZnJvbSBUVXMpLAotSW5kZXg6IGdkYi03LjYuOTAuMjAxNDAxMjcvZ2RiL2J1aWxkLWlkLmMK LT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT0KLS0tLSBnZGItNy42LjkwLjIwMTQwMTI3Lm9yaWcvZ2RiL2J1aWxkLWlkLmMJ MjAxNC0wMi0wNiAxODoyODoyMy43NTgyMzIwMjkgKzAxMDAKLSsrKyBnZGItNy42LjkwLjIwMTQw MTI3L2dkYi9idWlsZC1pZC5jCTIwMTQtMDItMDYgMTg6Mjg6MjYuODE0MjM1MzEyICswMTAwCi1A QCAtNzExLDcgKzcxMSw3IEBAIHN0YXRpYyBpbnQgbWlzc2luZ19ycG1fbGlzdF9lbnRyaWVzOwor ZGlmZiAtZHVwIC1ydXAgZ2RiLTcuMTAuNTAuMjAxNjAxMDYtb3JpZy9nZGIvYnVpbGQtaWQuYyBn ZGItNy4xMC41MC4yMDE2MDEwNi9nZGIvYnVpbGQtaWQuYworLS0tIGdkYi03LjEwLjUwLjIwMTYw MTA2LW9yaWcvZ2RiL2J1aWxkLWlkLmMJMjAxNi0wMS0wOSAxNDo0MDozOS40MjAzODUyNDEgKzAx MDAKKysrKyBnZGItNy4xMC41MC4yMDE2MDEwNi9nZGIvYnVpbGQtaWQuYwkyMDE2LTAxLTA5IDE0 OjQxOjA1Ljk0NDU0OTM5MyArMDEwMAorQEAgLTcxMyw3ICs3MTMsMTEgQEAgc3RhdGljIGludCBt aXNzaW5nX3JwbV9saXN0X2VudHJpZXM7CiAgLyogUmV0dXJucyB0aGUgY291bnQgb2YgbmV3bHkg YWRkZWQgcnBtcy4gICovCiAgCiAgc3RhdGljIGludAotLW1pc3NpbmdfcnBtX2VubGlzdCAoY29u c3QgY2hhciAqZmlsZW5hbWUpCisrI2lmbmRlZiBHREJfSU5ERVhfVkVSSUZZX1ZFTkRPUgorIG1p c3NpbmdfcnBtX2VubGlzdCAoY29uc3QgY2hhciAqZmlsZW5hbWUpCisrI2Vsc2UKICttaXNzaW5n X3JwbV9lbmxpc3RfMSAoY29uc3QgY2hhciAqZmlsZW5hbWUsIGludCB2ZXJpZnlfdmVuZG9yKQor KyNlbmRpZgogIHsKICAgIHN0YXRpYyBpbnQgcnBtX2luaXRfZG9uZSA9IDA7CiAgICBycG10cyB0 czsKLUBAIC04MTUsNyArODE1LDcgQEAgbWlzc2luZ19ycG1fZW5saXN0IChjb25zdCBjaGFyICpm aWxlbmFtZQorQEAgLTgxNyw3ICs4MjEsMTEgQEAgbWlzc2luZ19ycG1fZW5saXN0IChjb25zdCBj aGFyICpmaWxlbmFtZQogICAgbWkgPSBycG10c0luaXRJdGVyYXRvcl9wICh0cywgUlBNVEFHX0JB U0VOQU1FUywgZmlsZW5hbWUsIDApOwogICAgaWYgKG1pICE9IE5VTEwpCiAgICAgIHsKLS0gICAg ICBmb3IgKDs7KQorKyNpZm5kZWYgR0RCX0lOREVYX1ZFUklGWV9WRU5ET1IKKyAgICAgICBmb3Ig KDs7KQorKyNlbHNlCiArICAgICAgaWYgKCF2ZXJpZnlfdmVuZG9yKSBmb3IgKDs7KQorKyNlbmRp ZgogIAl7CiAgCSAgSGVhZGVyIGg7CiAgCSAgY2hhciAqZGVidWdpbmZvLCAqKnNsb3QsICpzLCAq czI7Ci1AQCAtOTMzLDYgKzkzMywzNSBAQCBtaXNzaW5nX3JwbV9lbmxpc3QgKGNvbnN0IGNoYXIg KmZpbGVuYW1lCitAQCAtOTM1LDYgKzk0MywzNyBAQCBtaXNzaW5nX3JwbV9lbmxpc3QgKGNvbnN0 IGNoYXIgKmZpbGVuYW1lCiAgCSAgICB4ZnJlZSAoZGVidWdpbmZvKTsKICAJICBjb3VudCsrOwog IAl9CisrI2lmZGVmIEdEQl9JTkRFWF9WRVJJRllfVkVORE9SCiArICAgICAgZWxzZSAvKiB2ZXJp ZnlfdmVuZG9yICovCiArCXsKICsJICBpbnQgdmVuZG9yX3Bhc3MgPSAwLCB2ZW5kb3JfZmFpbCA9 IDA7CkBAIC04NCwxMyArNjIsMTUgQEAgSW5kZXg6IGdkYi03LjYuOTAuMjAxNDAxMjcvZ2RiL2J1 aWxkLWlkLmMKICsJICAgIH0KICsJICBjb3VudCA9IHZlbmRvcl9wYXNzICE9IDAgJiYgdmVuZG9y X2ZhaWwgPT0gMDsKICsJfQorKyNlbmRpZgogIAogICAgICAgIHJwbWRiRnJlZUl0ZXJhdG9yX3Ag KG1pKTsKICAgICAgfQotQEAgLTk0Myw2ICs5NzIsMTkgQEAgbWlzc2luZ19ycG1fZW5saXN0IChj b25zdCBjaGFyICpmaWxlbmFtZQorQEAgLTk0NSw2ICs5ODQsMjEgQEAgbWlzc2luZ19ycG1fZW5s aXN0IChjb25zdCBjaGFyICpmaWxlbmFtZQogIH0KICAKICBzdGF0aWMgaW50CisrI2lmZGVmIEdE Ql9JTkRFWF9WRVJJRllfVkVORE9SCiArbWlzc2luZ19ycG1fZW5saXN0IChjb25zdCBjaGFyICpm aWxlbmFtZSkKICt7CiArICByZXR1cm4gbWlzc2luZ19ycG1fZW5saXN0XzEgKGZpbGVuYW1lLCAw KTsKQEAgLTEwNCw2ICs4NCwzOCBAQCBJbmRleDogZ2RiLTcuNi45MC4yMDE0MDEyNy9nZGIvYnVp bGQtaWQuYwogK30KICsKICtzdGF0aWMgaW50CisrI2VuZGlmCiAgbWlzc2luZ19ycG1fbGlzdF9j b21wYXIgKGNvbnN0IGNoYXIgKmNvbnN0ICphcCwgY29uc3QgY2hhciAqY29uc3QgKmJwKQogIHsK ICAgIHJldHVybiBzdHJjb2xsICgqYXAsICpicCk7CitkaWZmIC1kdXAgLXJ1cCBnZGItNy4xMC41 MC4yMDE2MDEwNi1vcmlnL2dkYi9kd2FyZjJyZWFkLmMgZ2RiLTcuMTAuNTAuMjAxNjAxMDYvZ2Ri L2R3YXJmMnJlYWQuYworLS0tIGdkYi03LjEwLjUwLjIwMTYwMTA2LW9yaWcvZ2RiL2R3YXJmMnJl YWQuYwkyMDE2LTAxLTA5IDE0OjQwOjM5LjQxNjM4NTIxNiArMDEwMAorKysrIGdkYi03LjEwLjUw LjIwMTYwMTA2L2dkYi9kd2FyZjJyZWFkLmMJMjAxNi0wMS0wOSAxNDo0MTowNS45NDI1NDkzODEg KzAxMDAKK0BAIC0zMTExLDYgKzMxMTEsMTYgQEAgcmVhZF9pbmRleF9mcm9tX3NlY3Rpb24gKHN0 cnVjdCBvYmpmaWxlCisgICAgICAic2V0IHVzZS1kZXByZWNhdGVkLWluZGV4LXNlY3Rpb25zIG9u Ii4gICovCisgICBpZiAodmVyc2lvbiA8IDYgJiYgIWRlcHJlY2F0ZWRfb2spCisgICAgIHsKKysj aWZkZWYgR0RCX0lOREVYX1ZFUklGWV9WRU5ET1IKKysgICAgICBleHRlcm4gaW50IHJwbV92ZXJp ZnlfdmVuZG9yIChjb25zdCBjaGFyICpmaWxlbmFtZSk7CisrCisrICAgICAgLyogUmVkIEhhdCBE ZXZlbG9wZXIgVG9vbHNldCBleGNlcHRpb24uICAqLworKyAgICAgIGlmIChycG1fdmVyaWZ5X3Zl bmRvciAoZmlsZW5hbWUpKQorKwl7fQorKyAgICAgIGVsc2UKKysgICAgICB7CisrCisrI2VuZGlm CisgICAgICAgc3RhdGljIGludCB3YXJuaW5nX3ByaW50ZWQgPSAwOworICAgICAgIGlmICghd2Fy bmluZ19wcmludGVkKQorIAl7CitAQCAtMzEyMiw2ICszMTMyLDEwIEBAIHRvIHVzZSB0aGUgc2Vj dGlvbiBhbnl3YXkuIiksCisgCSAgd2FybmluZ19wcmludGVkID0gMTsKKyAJfQorICAgICAgIHJl dHVybiAwOworKyNpZmRlZiBHREJfSU5ERVhfVkVSSUZZX1ZFTkRPUgorKworKyAgICAgIH0KKysj ZW5kaWYKKyAgICAgfQorICAgLyogVmVyc2lvbiA3IGluZGljZXMgZ2VuZXJhdGVkIGJ5IGdvbGQg cmVmZXIgdG8gdGhlIENVIGZvciBhIHN5bWJvbCBpbnN0ZWFkCisgICAgICBvZiB0aGUgVFUgKGZv ciBzeW1ib2xzIGNvbWluZyBmcm9tIFRVcyksCgpkaWZmIC0tZ2l0IGEvZ2RiLnNwZWMgYi9nZGIu c3BlYwppbmRleCBjNmFhNzg5Li4zNzBjOWI1IDEwMDY0NAotLS0gYS9nZGIuc3BlYworKysgYi9n ZGIuc3BlYwpAQCAtMjcsNyArMjcsNyBAQCBWZXJzaW9uOiA3LjEwLjUwLiV7c25hcHNyY30KIAog IyBUaGUgcmVsZWFzZSBhbHdheXMgY29udGFpbnMgYSBsZWFkaW5nIHJlc2VydmVkIG51bWJlciwg c3RhcnQgaXQgYXQgMS4KICMgYHVwc3RyZWFtJyBpcyBub3QgYSBwYXJ0IG9mIGBuYW1lJyB0byBz dGF5IGZ1bGx5IHJwbSBkZXBlbmRlbmNpZXMgY29tcGF0aWJsZSBmb3IgdGhlIHRlc3RpbmcuCi1S ZWxlYXNlOiAzNyV7P2Rpc3R9CitSZWxlYXNlOiAzOCV7P2Rpc3R9CiAKIExpY2Vuc2U6IEdQTHYz KyBhbmQgR1BMdjMrIHdpdGggZXhjZXB0aW9ucyBhbmQgR1BMdjIrIGFuZCBHUEx2Misgd2l0aCBl eGNlcHRpb25zIGFuZCBHUEwrIGFuZCBMR1BMdjIrIGFuZCBCU0QgYW5kIFB1YmxpYyBEb21haW4g YW5kIEdGREwKIEdyb3VwOiBEZXZlbG9wbWVudC9EZWJ1Z2dlcnMKQEAgLTg3OSwxMSArODc5LDgg QEAgZmluZCAtbmFtZSAiKi5pbmZvKiJ8eGFyZ3Mgcm0gLWYKICVwYXRjaDEwNjcgLXAxCiAlcGF0 Y2gxMDcwIC1wMQogJXBhdGNoODQ4IC1wMQotCiAlcGF0Y2g4MzMgLXAxCi0laWYgMCV7IT9lbDY6 MX0gfHwgMCV7IT9zY2w6MX0KLSVwYXRjaDgzMyAtcDEgLVIKLSVlbmRpZgorCiAlcGF0Y2g2NDIg LXAxCiAlaWYgMCV7P3JoZWw6MX0gJiYgMCV7P3JoZWx9IDw9IDYKICVwYXRjaDY0MiAtcDEgLVIK QEAgLTk1NSw2ICs5NTIsMTEgQEAgZXhwb3J0IExERkxBR1M9IiV7P19fZ2xvYmFsX2xkZmxhZ3N9 ICV7P193aXRoX2FzYW46LWZzYW5pdGl6ZT1hZGRyZXNzfSIKIENGTEFHUz0iJENGTEFHUyAtRERO Rl9ERUJVR0lORk9fSU5TVEFMTCIKICVlbmRpZgogCisjIFBhdGNoODMzOiBnZGItNi42LWJ1aWxk aWQtbG9jYXRlLXJwbS1zY2wucGF0Y2gKKyVpZiAwJXs/ZWw2OjF9ICYmIDAlez9zY2w6MX0KK0NG TEFHUz0iJENGTEFHUyAtREdEQl9JTkRFWF9WRVJJRllfVkVORE9SIgorJWVuZGlmCisKICMgLS1o dG1sZGlyIGFuZCAtLXBkZmRpciBhcmUgbm90IHVzZWQgYXMgdGhleSBhcmUgdXNlZCBmcm9tICV7 Z2RiX2J1aWxkfS4KIC4uL2NvbmZpZ3VyZQkJCQkJCQlcCiAJLS1wcmVmaXg9JXtfcHJlZml4fQkJ CQkJXApAQCAtMTM5Nyw2ICsxMzk5LDkgQEAgdGhlbgogZmkKIAogJWNoYW5nZWxvZworKiBTYXQg SmFuICA5IDIwMTYgSmFuIEtyYXRvY2h2aWwgPGphbi5rcmF0b2NodmlsQHJlZGhhdC5jb20+IC0g Ny4xMC41MC4yMDE2MDEwNi0zOC5mYzI0CistIFNpbXBsaWZ5IC5zcGVjOiBSZW1vdmUgY29uZGl0 aW9uYWwgcmV2ZXJ0IG9mOiBnZGItNi42LWJ1aWxkaWQtbG9jYXRlLXJwbS1zY2wucGF0Y2gKKwog KiBTYXQgSmFuICA5IDIwMTYgSmFuIEtyYXRvY2h2aWwgPGphbi5rcmF0b2NodmlsQHJlZGhhdC5j b20+IC0gNy4xMC41MC4yMDE2MDEwNi0zNy5mYzI0CiAtIFNpbXBsaWZ5IC5zcGVjOiBSZW1vdmUg Y29uZGl0aW9uYWwgcmV2ZXJ0IG9mOiBnZGItZHRzLXJoZWw2LXB5dGhvbi1jb21wYXQucGF0Y2gK IAo=