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: Adam Williamson To: git-commits@fedoraproject.org Subject: [rpms/rpkg] 1.70-1: Backport upstream fix for changelog line duplication Date: Mon, 10 Aug 2026 21:44:45 GMT Message-ID: <178639828586.1.2789026987496099388.rpms-rpkg-32edd5569620@fedoraproject.org> List-ID: X-Git-Repo: rpms/rpkg X-Git-Branch: 1.70-1 X-Git-Rev: 32edd5569620dcc0da26bbec240bfdab3701c07c QSBuZXcgY29tbWl0IGhhcyBiZWVuIHB1c2hlZC4KClJlcG8gICA6IHJwbXMvcnBrZwpCcmFuY2gg OiAxLjcwLTEKQ29tbWl0IDogMzJlZGQ1NTY5NjIwZGNjMGRhMjZiYmVjMjQwYmZkYWIzNzAxYzA3 YwpBdXRob3IgOiBBZGFtIFdpbGxpYW1zb24gPGF3aWxsaWFtQHJlZGhhdC5jb20+CkRhdGUgICA6 IDIwMjUtMDMtMDNUMTA6MTQ6NTItMDg6MDAKU3RhdHMgIDogKzU4Ly0xIGluIDIgZmlsZShzKQpV UkwgICAgOiBodHRwczovL3NyYy5mZWRvcmFwcm9qZWN0Lm9yZy9ycG1zL3Jwa2cvYy8zMmVkZDU1 Njk2MjBkY2MwZGEyNmJiZWMyNDBiZmRhYjM3MDFjMDdjP2JyYW5jaD0xLjcwLTEKCkxvZzoKQmFj a3BvcnQgdXBzdHJlYW0gZml4IGZvciBjaGFuZ2Vsb2cgbGluZSBkdXBsaWNhdGlvbgoKLS0tCmRp ZmYgLS1naXQgYS8wMDAxLWNsb2ctaXMtZHVwbGljYXRpbmctY2hhbmdlbG9nLWxpbmVzLnBhdGNo IGIvMDAwMS1jbG9nLWlzLWR1cGxpY2F0aW5nLWNoYW5nZWxvZy1saW5lcy5wYXRjaApuZXcgZmls ZSBtb2RlIDEwMDY0NAppbmRleCAwMDAwMDAwLi43ZGY0MjM5Ci0tLSAvZGV2L251bGwKKysrIGIv MDAwMS1jbG9nLWlzLWR1cGxpY2F0aW5nLWNoYW5nZWxvZy1saW5lcy5wYXRjaApAQCAtMCwwICsx LDUwIEBACitGcm9tIDdiM2Y5MmY2ZjNjYWExNWJkYTE5ZjU1N2Y1ZWIzMzQwNWRjZDcxNDcgTW9u IFNlcCAxNyAwMDowMDowMCAyMDAxCitGcm9tOiA9P1VURi04P3E/T25kPUM1PTk5ZWo9MjBOb3Nl az89IDxvbm9zZWtAcmVkaGF0LmNvbT4KK0RhdGU6IFR1ZSwgMjEgSmFuIDIwMjUgMTg6MDk6NTcg KzAxMDAKK1N1YmplY3Q6IFtQQVRDSF0gYGNsb2dgIGlzIGR1cGxpY2F0aW5nIGNoYW5nZWxvZyBs aW5lcworTUlNRS1WZXJzaW9uOiAxLjAKK0NvbnRlbnQtVHlwZTogdGV4dC9wbGFpbjsgY2hhcnNl dD1VVEYtOAorQ29udGVudC1UcmFuc2Zlci1FbmNvZGluZzogOGJpdAorCitgY2xvZ2AgaGF2ZSB0 byByZWFkIHRoZSB0YWcgQ0hBTkdFTE9HVEVYVCAobm90IG1hY3JvKSBhcHByb3ByaWF0ZWx5Cith cyBhbiBhcnJheTogLS1xZiAnWyV7Q0hBTkdFTE9HVEVYVH1cbl0nLgorV2hvbGUgYXJyYXkgaXMg cmVhZCwgc28gdGhlIDxTRVBBUkFUT1I+IGlzIHVzZWQgdG8gZXh0cmFjdCB0aGUgZmlyc3QKK2No YW5nZWxvZy4KKworRml4ZXM6IGh0dHBzOi8vcGFndXJlLmlvL2ZlZHBrZy9pc3N1ZS81ODEKK1Jl c29sdmVzOiByaGJ6IzIzMTA3MTMKK0pJUkE6IFJIRUxDTVAtMTQyODUKKworU2lnbmVkLW9mZi1i eTogT25kxZllaiBOb3NlayA8b25vc2VrQHJlZGhhdC5jb20+CistLS0KKyBweXJwa2cvX19pbml0 X18ucHkgfCA3ICsrKysrKy0KKyAxIGZpbGUgY2hhbmdlZCwgNiBpbnNlcnRpb25zKCspLCAxIGRl bGV0aW9uKC0pCisKK2RpZmYgLS1naXQgYS9weXJwa2cvX19pbml0X18ucHkgYi9weXJwa2cvX19p bml0X18ucHkKK2luZGV4IGRmY2NhZDMuLjViNzc0NTMgMTAwNjQ0CistLS0gYS9weXJwa2cvX19p bml0X18ucHkKKysrKyBiL3B5cnBrZy9fX2luaXRfXy5weQorQEAgLTI2NDMsNyArMjY0MywxMCBA QCBjbGFzcyBDb21tYW5kcyhvYmplY3QpOgorICAgICAgICAgIyBDb21tYW5kIGNvbnRhaW5zIHdv cmthcm91bmQgKHVuZGVmaW5lcyBfY2hhbmdlbG9nX3RyaW10aW1lKSBkZXNjcmliZWQgYXQ6Cisg ICAgICAgICAjIGh0dHBzOi8vZ2l0aHViLmNvbS9ycG0tc29mdHdhcmUtbWFuYWdlbWVudC9ycG0v aXNzdWVzLzEzMDEKKyAgICAgICAgICMgSXQgY2F1c2VkLCB0aGF0IG9sZGVyIGNoYW5nZWxvZyBy ZWNvcmRzIHdlcmUgbm90IGRpc3BsYXllZC4KKy0gICAgICAgIGNtZCA9IFsicnBtIl0gKyBzZWxm LnJwbWRlZmluZXMgKyBbIi1xIiwgIi0tcWYiLCAiJXtDSEFOR0VMT0dURVhUfVxuIiwKKysgICAg ICAgICMKKysgICAgICAgICMgWyV7Q0hBTkdFTE9HVEVYVH1dIGlzIGFuIGFycmF5IHRoYXQgY29u dGFpbnMgYWxsIGNoYW5nZWxvZyByZWNvcmRzIGluIGEgc3BlY2ZpbGUKKysgICAgICAgICMgPFNF UEFSQVRPUj4gdGFnIGlzIHBsYWNlZCBiZXR3ZWVuIGNoYW5nZWxvZ3MgcmVjb3JkcyB0byBiZSBh YmxlIHRvIGV4dHJhY3QgdGhlIGZpcnN0IG9uZQorKyAgICAgICAgY21kID0gWyJycG0iXSArIHNl bGYucnBtZGVmaW5lcyArIFsiLXEiLCAiLS1xZiIsICJbJXtDSEFOR0VMT0dURVhUfVxuPFNFUEFS QVRPUj5dIiwKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIi0t dW5kZWZpbmUiLCAiX2NoYW5nZWxvZ190cmltdGltZSIsCisgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICItLXNwZWNmaWxlIiwgIiVzIiAlIHNwZWNfZmlsZV0KKyAg ICAgICAgIHByb2MgPSBzdWJwcm9jZXNzLlBvcGVuKGNtZCwKK0BAIC0yNjYwLDYgKzI2NjMsOCBA QCBjbGFzcyBDb21tYW5kcyhvYmplY3QpOgorICAgICAgICAgICAgIGNsb2dfbGluZXMgPSBbXQor ICAgICAgICAgYnVmID0gc2l4LlN0cmluZ0lPKHN0ZG91dCkKKyAgICAgICAgIGZvciBsaW5lIGlu IGJ1ZjoKKysgICAgICAgICAgICBpZiBsaW5lLnN0YXJ0c3dpdGgoIjxTRVBBUkFUT1I+Iik6Cisr ICAgICAgICAgICAgICAgIGJyZWFrCisgICAgICAgICAgICAgaWYgbGluZSA9PSAnXG4nIG9yIGxp bmUuc3RhcnRzd2l0aCgnJCcpOgorICAgICAgICAgICAgICAgICBjb250aW51ZQorICAgICAgICAg ICAgIGlmIGxpbmUgPT0gJyhub25lKVxuJzoKKy0tIAorMi40OC4xCisKCmRpZmYgLS1naXQgYS9y cGtnLnNwZWMgYi9ycGtnLnNwZWMKaW5kZXggNmUxMDcyNC4uODAxOGYwMCAxMDA2NDQKLS0tIGEv cnBrZy5zcGVjCisrKyBiL3Jwa2cuc3BlYwpAQCAtMSw2ICsxLDYgQEAKIE5hbWU6ICAgICAgICAg ICBycGtnCiBWZXJzaW9uOiAgICAgICAgMS42NwotUmVsZWFzZTogICAgICAgIDYlez9kaXN0fQor UmVsZWFzZTogICAgICAgIDclez9kaXN0fQogCiBTdW1tYXJ5OiAgICAgICAgUHl0aG9uIGxpYnJh cnkgZm9yIGludGVyYWN0aW5nIHdpdGggcnBtK2dpdAogIyBBdXRvbWF0aWNhbGx5IGNvbnZlcnRl ZCBmcm9tIG9sZCBmb3JtYXQ6IEdQTHYyKyBhbmQgTEdQTHYyIC0gcmV2aWV3IGlzIGhpZ2hseSBy ZWNvbW1lbmRlZC4KQEAgLTUwLDYgKzUwLDEwIEBAIFBhdGNoNTogICAgICAgICAwMDA1LUZpeGlu Zy1lbmNvZGluZy1vZi10aGUtdXJsLXdoZW4tY2hlY2tpbmctbG9va2FzaWRlLnBhdGNoCiBQYXRj aDY6ICAgICAgICAgMDAwNi1BZGQtZHJhZnQtYnVpbGRzLXN1cHBvcnQucGF0Y2gKIFBhdGNoNzog ICAgICAgICAwMDA3LUZpeC1yZWd1bGFyLWV4cHJlc3Npb24tZm9yLXBhcnNpbmctU291cmNlLWxp bmVzLnBhdGNoCiBQYXRjaDg6ICAgICAgICAgMDAwOC1jaGFpbi1idWlsZC1jb3JyZWN0LXRoZS1p bmZvLW1lc3NhZ2UucGF0Y2gKKyMgaHR0cHM6Ly9wYWd1cmUuaW8vcnBrZy9jLzdiM2Y5MmY2Cisj IGh0dHBzOi8vcGFndXJlLmlvL2ZlZHBrZy9pc3N1ZS81ODEKKyMgRml4ZXMgZHVwbGljYXRpb24g b2YgY2hhbmdlbG9nIGxpbmVzICh3aGljaCBhZmZlY3RlZCBmZWRwa2cgYWxzbykKK1BhdGNoOTog ICAgICAgICAgMDAwMS1jbG9nLWlzLWR1cGxpY2F0aW5nLWNoYW5nZWxvZy1saW5lcy5wYXRjaAog CiAKICVkZXNjcmlwdGlvbgpAQCAtMjgxLDYgKzI4NSw5IEBAIGV4YW1wbGVfY2xpX2Rpcj0kUlBN X0JVSUxEX1JPT1Qle19kYXRhZGlyfS8le25hbWV9L2V4YW1wbGVzL2NsaQogCiAKICVjaGFuZ2Vs b2cKKyogTW9uIE1hciAwMyAyMDI1IEFkYW0gV2lsbGlhbXNvbiA8YXdpbGxpYW1AcmVkaGF0LmNv bT4gLSAxLjY3LTcKKy0gUGF0Y2g6IGBjbG9nYCBpcyBkdXBsaWNhdGluZyBjaGFuZ2Vsb2cgbGlu ZXMKKwogKiBTYXQgSmFuIDE4IDIwMjUgRmVkb3JhIFJlbGVhc2UgRW5naW5lZXJpbmcgPHJlbGVu Z0BmZWRvcmFwcm9qZWN0Lm9yZz4gLSAxLjY3LTYKIC0gUmVidWlsdCBmb3IgaHR0cHM6Ly9mZWRv cmFwcm9qZWN0Lm9yZy93aWtpL0ZlZG9yYV80Ml9NYXNzX1JlYnVpbGQKIAo=