mariadb-galera 5.5.36 build contains shared/common/etc rpm MariaDB-galera packages. This is wrong, only MariaDB-galera-server should be built. Other packages are built now because of the merge error.
Somthing to think of — all non-server packages used to be exactly identical in galera and non-galera tree. But now there are galera-specific test files, perhaps we need MariaDB-galera-test package too?
Another thought — perhaps the wrong set of packages to built was not the only merge error in cpack_rpm..cmake
{"report":{"fcp":678.4000000953674,"ttfb":119,"pageVisibility":"visible","entityId":33129,"key":"jira.project.issue.view-issue","isInitial":true,"threshold":1000,"elementTimings":{},"userDeviceMemory":8,"userDeviceProcessors":64,"apdex":1,"journeyId":"f2b87168-5e61-4129-a154-d41832149b78","navigationType":0,"readyForUser":740.4000000953674,"redirectCount":0,"resourceLoadedEnd":996.4000000953674,"resourceLoadedStart":124.79999995231628,"resourceTiming":[{"duration":35.10000014305115,"initiatorType":"link","name":"https://jira.mariadb.org/s/2c21342762a6a02add1c328bed317ffd-CDN/lu2bu7/820016/12ta74/0a8bac35585be7fc6c9cc5a0464cd4cf/_/download/contextbatch/css/_super/batch.css","startTime":124.79999995231628,"connectEnd":0,"connectStart":0,"domainLookupEnd":0,"domainLookupStart":0,"fetchStart":124.79999995231628,"redirectEnd":0,"redirectStart":0,"requestStart":0,"responseEnd":159.90000009536743,"responseStart":0,"secureConnectionStart":0},{"duration":35.700000047683716,"initiatorType":"link","name":"https://jira.mariadb.org/s/7ebd35e77e471bc30ff0eba799ebc151-CDN/lu2bu7/820016/12ta74/8679b4946efa1a0bb029a3a22206fb5d/_/download/contextbatch/css/jira.browse.project,project.issue.navigator,jira.view.issue,jira.general,jira.global,atl.general,-_super/batch.css?agile_global_admin_condition=true&jag=true&jira.create.linked.issue=true&slack-enabled=true","startTime":125,"connectEnd":0,"connectStart":0,"domainLookupEnd":0,"domainLookupStart":0,"fetchStart":125,"redirectEnd":0,"redirectStart":0,"requestStart":0,"responseEnd":160.70000004768372,"responseStart":0,"secureConnectionStart":0},{"duration":106.09999990463257,"initiatorType":"script","name":"https://jira.mariadb.org/s/fbf975c0cce4b1abf04784eeae9ba1f4-CDN/lu2bu7/820016/12ta74/0a8bac35585be7fc6c9cc5a0464cd4cf/_/download/contextbatch/js/_super/batch.js?locale=en","startTime":125.10000014305115,"connectEnd":125.10000014305115,"connectStart":125.10000014305115,"domainLookupEnd":125.10000014305115,"domainLookupStart":125.10000014305115,"fetchStart":125.10000014305115,"redirectEnd":0,"redirectStart":0,"requestStart":125.10000014305115,"responseEnd":231.20000004768372,"responseStart":231.10000014305115,"secureConnectionStart":125.10000014305115},{"duration":173.20000004768372,"initiatorType":"script","name":"https://jira.mariadb.org/s/94c15bff32baef80f4096a08aceae8bc-CDN/lu2bu7/820016/12ta74/c92c0caa9a024ae85b0ebdbed7fb4bd7/_/download/contextbatch/js/atl.global,-_super/batch.js?locale=en","startTime":125.29999995231628,"connectEnd":125.29999995231628,"connectStart":125.29999995231628,"domainLookupEnd":125.29999995231628,"domainLookupStart":125.29999995231628,"fetchStart":125.29999995231628,"redirectEnd":0,"redirectStart":0,"requestStart":125.29999995231628,"responseEnd":298.5,"responseStart":298.5,"secureConnectionStart":125.29999995231628},{"duration":169.30000019073486,"initiatorType":"script","name":"https://jira.mariadb.org/s/099b33461394b8015fc36c0a4b96e19f-CDN/lu2bu7/820016/12ta74/8679b4946efa1a0bb029a3a22206fb5d/_/download/contextbatch/js/jira.browse.project,project.issue.navigator,jira.view.issue,jira.general,jira.global,atl.general,-_super/batch.js?agile_global_admin_condition=true&jag=true&jira.create.linked.issue=true&locale=en&slack-enabled=true","startTime":125.29999995231628,"connectEnd":125.29999995231628,"connectStart":125.29999995231628,"domainLookupEnd":125.29999995231628,"domainLookupStart":125.29999995231628,"fetchStart":125.29999995231628,"redirectEnd":0,"redirectStart":0,"requestStart":125.29999995231628,"responseEnd":294.60000014305115,"responseStart":294.60000014305115,"secureConnectionStart":125.29999995231628},{"duration":173.79999995231628,"initiatorType":"script","name":"https://jira.mariadb.org/s/d41d8cd98f00b204e9800998ecf8427e-CDN/lu2bu7/820016/12ta74/1.0/_/download/batch/jira.webresources:calendar-en/jira.webresources:calendar-en.js","startTime":125.5,"connectEnd":125.5,"connectStart":125.5,"domainLookupEnd":125.5,"domainLookupStart":125.5,"fetchStart":125.5,"redirectEnd":0,"redirectStart":0,"requestStart":125.5,"responseEnd":299.2999999523163,"responseStart":299.2999999523163,"secureConnectionStart":125.5},{"duration":174.79999995231628,"initiatorType":"script","name":"https://jira.mariadb.org/s/d41d8cd98f00b204e9800998ecf8427e-CDN/lu2bu7/820016/12ta74/1.0/_/download/batch/jira.webresources:calendar-localisation-moment/jira.webresources:calendar-localisation-moment.js","startTime":125.5,"connectEnd":125.5,"connectStart":125.5,"domainLookupEnd":125.5,"domainLookupStart":125.5,"fetchStart":125.5,"redirectEnd":0,"redirectStart":0,"requestStart":125.5,"responseEnd":300.2999999523163,"responseStart":300.2999999523163,"secureConnectionStart":125.5},{"duration":175.5,"initiatorType":"link","name":"https://jira.mariadb.org/s/b04b06a02d1959df322d9cded3aeecc1-CDN/lu2bu7/820016/12ta74/a2ff6aa845ffc9a1d22fe23d9ee791fc/_/download/contextbatch/css/jira.global.look-and-feel,-_super/batch.css","startTime":125.70000004768372,"connectEnd":0,"connectStart":0,"domainLookupEnd":0,"domainLookupStart":0,"fetchStart":125.70000004768372,"redirectEnd":0,"redirectStart":0,"requestStart":0,"responseEnd":301.2000000476837,"responseStart":0,"secureConnectionStart":0},{"duration":175.5,"initiatorType":"script","name":"https://jira.mariadb.org/rest/api/1.0/shortcuts/820016/47140b6e0a9bc2e4913da06536125810/shortcuts.js?context=issuenavigation&context=issueaction","startTime":125.70000004768372,"connectEnd":125.70000004768372,"connectStart":125.70000004768372,"domainLookupEnd":125.70000004768372,"domainLookupStart":125.70000004768372,"fetchStart":125.70000004768372,"redirectEnd":0,"redirectStart":0,"requestStart":125.70000004768372,"responseEnd":301.2000000476837,"responseStart":301.2000000476837,"secureConnectionStart":125.70000004768372},{"duration":176.30000019073486,"initiatorType":"link","name":"https://jira.mariadb.org/s/3ac36323ba5e4eb0af2aa7ac7211b4bb-CDN/lu2bu7/820016/12ta74/d176f0986478cc64f24226b3d20c140d/_/download/contextbatch/css/com.atlassian.jira.projects.sidebar.init,-_super,-project.issue.navigator,-jira.view.issue/batch.css?jira.create.linked.issue=true","startTime":125.79999995231628,"connectEnd":0,"connectStart":0,"domainLookupEnd":0,"domainLookupStart":0,"fetchStart":125.79999995231628,"redirectEnd":0,"redirectStart":0,"requestStart":0,"responseEnd":302.10000014305115,"responseStart":0,"secureConnectionStart":0},{"duration":176.09999990463257,"initiatorType":"script","name":"https://jira.mariadb.org/s/3339d87fa2538a859872f2df449bf8d0-CDN/lu2bu7/820016/12ta74/d176f0986478cc64f24226b3d20c140d/_/download/contextbatch/js/com.atlassian.jira.projects.sidebar.init,-_super,-project.issue.navigator,-jira.view.issue/batch.js?jira.create.linked.issue=true&locale=en","startTime":125.90000009536743,"connectEnd":125.90000009536743,"connectStart":125.90000009536743,"domainLookupEnd":125.90000009536743,"domainLookupStart":125.90000009536743,"fetchStart":125.90000009536743,"redirectEnd":0,"redirectStart":0,"requestStart":125.90000009536743,"responseEnd":302,"responseStart":302,"secureConnectionStart":125.90000009536743},{"duration":665.3999998569489,"initiatorType":"script","name":"https://jira.mariadb.org/s/d41d8cd98f00b204e9800998ecf8427e-CDN/lu2bu7/820016/12ta74/1.0/_/download/batch/jira.webresources:bigpipe-js/jira.webresources:bigpipe-js.js","startTime":131.40000009536743,"connectEnd":131.40000009536743,"connectStart":131.40000009536743,"domainLookupEnd":131.40000009536743,"domainLookupStart":131.40000009536743,"fetchStart":131.40000009536743,"redirectEnd":0,"redirectStart":0,"requestStart":131.40000009536743,"responseEnd":796.7999999523163,"responseStart":796.7999999523163,"secureConnectionStart":131.40000009536743},{"duration":864.9000000953674,"initiatorType":"script","name":"https://jira.mariadb.org/s/d41d8cd98f00b204e9800998ecf8427e-CDN/lu2bu7/820016/12ta74/1.0/_/download/batch/jira.webresources:bigpipe-init/jira.webresources:bigpipe-init.js","startTime":131.5,"connectEnd":131.5,"connectStart":131.5,"domainLookupEnd":131.5,"domainLookupStart":131.5,"fetchStart":131.5,"redirectEnd":0,"redirectStart":0,"requestStart":131.5,"responseEnd":996.4000000953674,"responseStart":996.4000000953674,"secureConnectionStart":131.5},{"duration":434.60000014305115,"initiatorType":"xmlhttprequest","name":"https://jira.mariadb.org/rest/webResources/1.0/resources","startTime":449,"connectEnd":449,"connectStart":449,"domainLookupEnd":449,"domainLookupStart":449,"fetchStart":449,"redirectEnd":0,"redirectStart":0,"requestStart":449,"responseEnd":883.6000001430511,"responseStart":883.6000001430511,"secureConnectionStart":449},{"duration":364.2000000476837,"initiatorType":"script","name":"https://www.google-analytics.com/analytics.js","startTime":654.4000000953674,"connectEnd":0,"connectStart":0,"domainLookupEnd":0,"domainLookupStart":0,"fetchStart":654.4000000953674,"redirectEnd":0,"redirectStart":0,"requestStart":0,"responseEnd":1018.6000001430511,"responseStart":0,"secureConnectionStart":0}],"fetchStart":0,"domainLookupStart":0,"domainLookupEnd":0,"connectStart":0,"connectEnd":0,"requestStart":11,"responseStart":119,"responseEnd":128,"domLoading":123,"domInteractive":1040,"domContentLoadedEventStart":1040,"domContentLoadedEventEnd":1078,"domComplete":1818,"loadEventStart":1818,"loadEventEnd":1820,"userAgent":"Mozilla/5.0 AppleWebKit/537.36 (KHTML, like Gecko; compatible; ClaudeBot/1.0; +claudebot@anthropic.com)","marks":[{"name":"bigPipe.sidebar-id.start","time":1001.6000001430511},{"name":"bigPipe.sidebar-id.end","time":1002.6000001430511},{"name":"bigPipe.activity-panel-pipe-id.start","time":1002.7999999523163},{"name":"bigPipe.activity-panel-pipe-id.end","time":1005.6000001430511},{"name":"activityTabFullyLoaded","time":1083.5}],"measures":[],"correlationId":"6df407df1f462e","effectiveType":"4g","downlink":10,"rtt":0,"serverDuration":62,"dbReadsTimeInMs":8,"dbConnsTimeInMs":14,"applicationHash":"9d11dbea5f4be3d4cc21f03a88dd11d8c8687422","experiments":[]}}