diff options
| -rw-r--r-- | compat_reports/6.9.4_to_6.9.5/compat_report.html | 663 | ||||
| -rw-r--r-- | libonig.xml | 2 | ||||
| -rw-r--r-- | onig-soname.patch | 12 | ||||
| -rw-r--r-- | oniguruma.spec | 37 |
4 files changed, 695 insertions, 19 deletions
diff --git a/compat_reports/6.9.4_to_6.9.5/compat_report.html b/compat_reports/6.9.4_to_6.9.5/compat_report.html new file mode 100644 index 0000000..7717aae --- /dev/null +++ b/compat_reports/6.9.4_to_6.9.5/compat_report.html @@ -0,0 +1,663 @@ +<!-- kind:binary;verdict:compatible;affected:0;added:5;removed:0;type_problems_high:0;type_problems_medium:0;type_problems_low:0;interface_problems_high:0;interface_problems_medium:0;interface_problems_low:0;changed_constants:0;constant_changes_other:3;tool_version:2.3 --> +<!-- kind:source;verdict:compatible;affected:0;added:5;removed:0;type_problems_high:0;type_problems_medium:0;type_problems_low:0;interface_problems_high:0;interface_problems_medium:0;interface_problems_low:0;changed_constants:2;constant_changes_other:3;tool_version:2.3 --> +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> +<head> +<meta http-equiv="Content-Type" content="text/html; charset=utf-8" /> +<meta name="viewport" content="width=device-width,initial-scale=1" /> +<meta name="keywords" content="libonig, compatibility, API, ABI, report" /> +<meta name="description" content="API/ABI compatibility report for the libonig library between 6.9.4 and 6.9.5 versions" /> +<title>libonig: 6.9.4 to 6.9.5 compatibility report</title> +<style type="text/css"> +body { + font-family:Arial, sans-serif; + background-color:White; + color:Black; +} +hr { + color:Black; + background-color:Black; + height:1px; + border:0; +} +h1 { + margin-bottom:0px; + padding-bottom:0px; + font-size:1.625em; +} +h2 { + margin-bottom:0px; + padding-bottom:0px; + font-size:1.25em; + white-space:nowrap; +} +span.section { + font-weight:bold; + cursor:pointer; + color:#003E69; + white-space:nowrap; + margin-left:0.3125em; +} +span.new_sign { + font-weight:bold; + margin-left:1.65em; + color:#003E69; +} +span.new_sign_lbl { + margin-left:3em; + font-size:1em; + color:Black; +} +span:hover.section { + color:#336699; +} +span.sect_aff { + cursor:pointer; + padding-left:1.55em; + font-size:0.875em; + color:#cc3300; +} +span.sect_info { + cursor:pointer; + padding-left:1.55em; + font-size:0.875em; + color:Black; +} +span.ext { + font-weight:normal; +} +span.h_name { + color:#cc3300; + font-size:0.875em; + font-weight:bold; +} +div.h_list, div.lib_list { + font-size:0.94em; + padding-left:0.4em; +} +span.ns { + color:#408080; + font-size:0.94em; +} +span.lib_name { + color:Green; + font-size:0.875em; + font-weight:bold; +} +span.iname { + font-weight:bold; + color:#003E69; + margin-left:0.3125em; +} +span.iname_b { + font-weight:bold; +} +span.iname_a { + color:#333333; + font-weight:bold; + font-size:0.94em; +} +span.sym_p { + font-weight:normal; + white-space:normal; +} +span.sym_pd { + white-space:normal; +} +span.sym_p span, span.sym_pd span { + white-space:nowrap; +} +div.affect { + padding-left:1em; + padding-bottom:10px; + font-size:0.87em; + font-style:italic; + line-height:0.9em; +} +div.affected { + padding-left:1.9em; + padding-top:10px; +} +table.ptable { + border-collapse:collapse; + border:1px outset black; + margin-left:0.95em; + margin-top:3px; + margin-bottom:3px; + width:56.25em; +} +table.ptable td { + border:1px solid gray; + padding:3px; + font-size:0.875em; + text-align:left; + vertical-align:top; + max-width:28em; + word-wrap:break-word; +} +table.ptable th.pn { + width:2%; +} +table.ptable th.chg { + width:47%; +} +table.vtable { + border-collapse:collapse; + border:1px outset black; + margin-left:1.9em; + margin-top:0.7em; +} +table.vtable td { + border:1px solid gray; + padding:3px; + font-size:0.875em; + vertical-align:top; + max-width:450px; + word-wrap:break-word; +} +table.ptable th, table.vtable th { + background-color:#eeeeee; + font-weight:bold; + color:#333333; + font-family:Verdana, Arial; + font-size:0.875em; + border:1px solid gray; + text-align:center; + vertical-align:top; + white-space:nowrap; + padding:3px; +} +table.summary { + border-collapse:collapse; + border:1px outset black; +} +table.summary th { + background-color:#eeeeee; + font-weight:normal; + text-align:left; + font-size:0.94em; + white-space:nowrap; + border:1px inset gray; + padding:3px; +} +table.summary td { + text-align:right; + white-space:nowrap; + border:1px inset gray; + padding:3px 5px 3px 10px; +} +span.mngl { + padding-left:1em; + font-size:0.875em; + cursor:text; + color:#444444; + font-weight:bold; +} +span.pleft { + padding-left:2.5em; +} +span.sym_ver { + color:#333333; + white-space:nowrap; + font-family:"DejaVu Sans Mono", Monospace; +} +span.attr { + color:#333333; + font-weight:normal; +} +span.color_p { + font-style:italic; + color:Brown; +} +span.p { + font-style:italic; +} +span.fp { + font-style:italic; + background-color:#DCDCDC; +} +span.ttype { + font-weight:normal; +} +span.nowrap { + white-space:nowrap; +} +span.value { + font-weight:bold; +} +.passed { + background-color:#CCFFCC; + font-weight:normal; +} +.warning { + background-color:#F4F4AF; + font-weight:normal; +} +.failed { + background-color:#FFCCCC; + font-weight:normal; +} +.new { + background-color:#C6DEFF; + font-weight:normal; +} +.compatible { + background-color:#CCFFCC; + font-weight:normal; +} +.almost_compatible { + background-color:#FFDAA3; + font-weight:normal; +} +.incompatible { + background-color:#FFCCCC; + font-weight:normal; +} +.gray { + background-color:#DCDCDC; + font-weight:normal; +} +.top_ref { + font-size:0.69em; +} +.footer { + font-size:0.75em; +} + +.tabset { + float:left; +} +a.tab { + border:1px solid Black; + float:left; + margin:0px 5px -1px 0px; + padding:3px 5px 3px 5px; + position:relative; + font-size:0.875em; + background-color:#DDD; + text-decoration:none; + color:Black; +} +a.disabled:hover +{ + color:Black; + background:#EEE; +} +a.active:hover +{ + color:Black; + background:White; +} +a.active { + border-bottom-color:White; + background-color:White; +} +div.tab { + border-top:1px solid Black; + padding:0px; + width:100%; + clear:both; +} +</style> +<script type="text/javascript" language="JavaScript"> +<!-- +function showContent(header, id) +{ + e = document.getElementById(id); + if(e.style.display == 'none') + { + e.style.display = 'block'; + e.style.visibility = 'visible'; + header.innerHTML = header.innerHTML.replace(/\[[^0-9 ]\]/gi,"[−]"); + } + else + { + e.style.display = 'none'; + e.style.visibility = 'hidden'; + header.innerHTML = header.innerHTML.replace(/\[[^0-9 ]\]/gi,"[+]"); + } +} +function initTabs() +{ + var url = window.location.href; + if(url.indexOf('_Source_')!=-1 || url.indexOf('#Source')!=-1) + { + var tab1 = document.getElementById('BinaryID'); + var tab2 = document.getElementById('SourceID'); + tab1.className='tab disabled'; + tab2.className='tab active'; + } + var sets = document.getElementsByTagName('div'); + for (var i = 0; i < sets.length; i++) + { + if (sets[i].className.indexOf('tabset') != -1) + { + var tabs = []; + var links = sets[i].getElementsByTagName('a'); + for (var j = 0; j < links.length; j++) + { + if (links[j].className.indexOf('tab') != -1) + { + tabs.push(links[j]); + links[j].tabs = tabs; + var tab = document.getElementById(links[j].href.substr(links[j].href.indexOf('#') + 1)); + //reset all tabs on start + if (tab) + { + if (links[j].className.indexOf('active')!=-1) { + tab.style.display = 'block'; + } + else { + tab.style.display = 'none'; + } + } + links[j].onclick = function() + { + var tab = document.getElementById(this.href.substr(this.href.indexOf('#') + 1)); + if (tab) + { + //reset all tabs before change + for (var k = 0; k < this.tabs.length; k++) + { + document.getElementById(this.tabs[k].href.substr(this.tabs[k].href.indexOf('#') + 1)).style.display = 'none'; + this.tabs[k].className = this.tabs[k].className.replace('active', 'disabled'); + } + this.className = 'tab active'; + tab.style.display = 'block'; + // window.location.hash = this.id.replace('ID', ''); + return false; + } + } + } + } + } + } + if(url.indexOf('#')!=-1) { + location.href=location.href; + } +} +if (window.addEventListener) window.addEventListener('load', initTabs, false); +else if (window.attachEvent) window.attachEvent('onload', initTabs); +--> +</script> +</head> +<body><a name='Source'></a><a name='Binary'></a><a name='Top'></a><h1>API compatibility report for the <span style='color:Blue;'>libonig</span> library between <span style='color:Red;'>6.9.4</span> and <span style='color:Red;'>6.9.5</span> versions on <span style='color:Blue;'>x86_64</span></h1> + + <br/> + <div class='tabset'> + <a id='BinaryID' href='#BinaryTab' class='tab active'>Binary<br/>Compatibility</a> + <a id='SourceID' href='#SourceTab' style='margin-left:3px' class='tab disabled'>Source<br/>Compatibility</a> + </div><div id='BinaryTab' class='tab'> +<h2>Test Info</h2><hr/> +<table class='summary'> +<tr><th>Library Name</th><td>libonig</td></tr> +<tr><th>Version #1</th><td>6.9.4</td></tr> +<tr><th>Version #2</th><td>6.9.5</td></tr> +<tr><th>Arch</th><td>x86_64</td></tr> +<tr><th>GCC Version</th><td>9</td></tr> +<tr><th>Subject</th><td width='150px'>Binary Compatibility</td></tr> +</table> +<h2>Test Results</h2><hr/> +<table class='summary'><tr><th>Total Header Files</th><td><a href='#Headers' style='color:Blue;'>2</a></td></tr> +<tr><th>Total Libraries</th><td><a href='#Libs' style='color:Blue;'>1</a></td></tr> +<tr><th>Total Symbols / Types</th><td>194 / 63</td></tr> +<tr><th>Compatibility</th> +<td class='compatible'>100%</td> +</tr> +</table> +<h2>Problem Summary</h2><hr/> +<table class='summary'><tr><th></th><th style='text-align:center;'>Severity</th><th style='text-align:center;'>Count</th></tr><tr><th>Added Symbols</th><td>-</td><td class='new'><a href='#Binary_Added' style='color:Blue;'>5</a></td></tr> +<tr><th>Removed Symbols</th><td>High</td><td>0</td></tr> +<tr><th rowspan='3'>Problems with<br/>Data Types</th><td>High</td><td>0</td></tr> +<tr><td>Medium</td><td>0</td></tr> +<tr><td>Low</td><td>0</td></tr> +<tr><th rowspan='3'>Problems with<br/>Symbols</th><td>High</td><td>0</td></tr> +<tr><td>Medium</td><td>0</td></tr> +<tr><td>Low</td><td>0</td></tr> +<tr><th>Problems with<br/>Constants</th><td>Low</td><td>0</td></tr> +<tr><th>Other Changes<br/>in Constants</th><td>-</td><td class='passed'><a href='#Other_Binary_Changes_In_Constants' style='color:Blue;'>3</a></td></tr> +</table> + +<a name='Binary_Added'></a><h2>Added Symbols <span class='new'> 5 </span></h2><hr/> +<span class='h_name'>oniguruma.h</span>, <span class='lib_name'>libonig.so.5.0.0</span><br/> +<span class="iname">onig_get_retry_limit_in_search <span class='sym_p'>( )</span></span><br/> +<span class="iname">onig_get_subexp_call_max_nest_level <span class='sym_p'>( )</span></span><br/> +<span class="iname">onig_set_retry_limit_in_search <span class='sym_p'><span>( unsigned long <span class='color_p'>n</span></span> )</span></span><br/> +<span class="iname">onig_set_retry_limit_in_search_of_match_param <span class='sym_p'><span>( OnigMatchParam* <span class='color_p'>param</span></span>, <span>unsigned long <span class='color_p'>limit</span></span> )</span></span><br/> +<span class="iname">onig_set_subexp_call_max_nest_level <span class='sym_p'><span>( int <span class='color_p'>level</span></span> )</span></span><br/> +<br/> +<a class='top_ref' href='#Top'>to the top</a><br/> +<a name='Other_Binary_Changes'></a><a name='Other_Binary_Changes_In_Constants'></a> +<h2>Other Changes in Constants <span class='passed'> 3 </span></h2><hr/> +<span class='h_name'>oniguruma.h</span><br/> +<span class="section" onclick="javascript:showContent(this, 'c_1')"> +<span class='ext'>[+]</span> ONIG_SYN_ISOLATED_OPTION_CONTINUE_BRANCH</span> +<br/> +<div id="c_1" style="display:none;"> +<table class='ptable'> +<tr> +<th class='pn'></th> +<th class='chg'>Change</th> +<th>Effect</th> +</tr> +<tr> +<th>1</th> +<td>The constant <b>ONIG_SYN_ISOLATED_OPTION_CONTINUE_BRANCH</b> with value <b>(1U<<10)</b> has been added.</td> +<td>No effect.</td> +</tr> +</table> +<br/> +</div> + +<span class="section" onclick="javascript:showContent(this, 'c_2')"> +<span class='ext'>[+]</span> ONIG_SYN_VARIABLE_LEN_LOOK_BEHIND</span> +<br/> +<div id="c_2" style="display:none;"> +<table class='ptable'> +<tr> +<th class='pn'></th> +<th class='chg'>Change</th> +<th>Effect</th> +</tr> +<tr> +<th>1</th> +<td>The constant <b>ONIG_SYN_VARIABLE_LEN_LOOK_BEHIND</b> with value <b>(1U<<11)</b> has been added.</td> +<td>No effect.</td> +</tr> +</table> +<br/> +</div> + +<span class="section" onclick="javascript:showContent(this, 'c_3')"> +<span class='ext'>[+]</span> ONIGERR_RETRY_LIMIT_IN_SEARCH_OVER</span> +<br/> +<div id="c_3" style="display:none;"> +<table class='ptable'> +<tr> +<th class='pn'></th> +<th class='chg'>Change</th> +<th>Effect</th> +</tr> +<tr> +<th>1</th> +<td>The constant <b>ONIGERR_RETRY_LIMIT_IN_SEARCH_OVER</b> with value <b>-18</b> has been added.</td> +<td>No effect.</td> +</tr> +</table> +<br/> +</div> + +<br/> +<a class='top_ref' href='#Top'>to the top</a><br/> +<a name='Headers'></a><h2>Header Files <span class='gray'> 2 </span></h2><hr/> +<div class='h_list'> +oniggnu.h<br/> +oniguruma.h<br/> +</div> +<br/><a class='top_ref' href='#Top'>to the top</a><br/> +<a name='Libs'></a><h2>Libraries <span class='gray'> 1 </span></h2><hr/> +<div class='lib_list'> +libonig.so.5.0.0<br/> +</div> +<br/><a class='top_ref' href='#Top'>to the top</a><br/> +<br/><br/><br/></div><div id='SourceTab' class='tab'> +<h2>Test Info</h2><hr/> +<table class='summary'> +<tr><th>Library Name</th><td>libonig</td></tr> +<tr><th>Version #1</th><td>6.9.4</td></tr> +<tr><th>Version #2</th><td>6.9.5</td></tr> +<tr><th>Arch</th><td>x86_64</td></tr> +<tr><th>Subject</th><td width='150px'>Source Compatibility</td></tr> +</table> +<h2>Test Results</h2><hr/> +<table class='summary'><tr><th>Total Header Files</th><td><a href='#Headers' style='color:Blue;'>2</a></td></tr> +<tr><th>Total Libraries</th><td><a href='#Libs' style='color:Blue;'>1</a></td></tr> +<tr><th>Total Symbols / Types</th><td>195 / 63</td></tr> +<tr><th>Compatibility</th> +<td class='compatible'>100%</td> +</tr> +</table> +<h2>Problem Summary</h2><hr/> +<table class='summary'><tr><th></th><th style='text-align:center;'>Severity</th><th style='text-align:center;'>Count</th></tr><tr><th>Added Symbols</th><td>-</td><td class='new'><a href='#Source_Added' style='color:Blue;'>5</a></td></tr> +<tr><th>Removed Symbols</th><td>High</td><td>0</td></tr> +<tr><th rowspan='3'>Problems with<br/>Data Types</th><td>High</td><td>0</td></tr> +<tr><td>Medium</td><td>0</td></tr> +<tr><td>Low</td><td>0</td></tr> +<tr><th rowspan='3'>Problems with<br/>Symbols</th><td>High</td><td>0</td></tr> +<tr><td>Medium</td><td>0</td></tr> +<tr><td>Low</td><td>0</td></tr> +<tr><th>Problems with<br/>Constants</th><td>Low</td><td class='warning'><a href='#Constant_Source_Problems_Low' style='color:Blue;'>2</a></td></tr> +<tr><th>Other Changes<br/>in Constants</th><td>-</td><td class='passed'><a href='#Other_Source_Changes_In_Constants' style='color:Blue;'>3</a></td></tr> +</table> + +<a name='Source_Added'></a><h2>Added Symbols <span class='new'> 5 </span></h2><hr/> +<span class='h_name'>oniguruma.h</span><br/> +<span class="iname">onig_get_retry_limit_in_search <span class='sym_p'>( )</span></span><br/> +<span class="iname">onig_get_subexp_call_max_nest_level <span class='sym_p'>( )</span></span><br/> +<span class="iname">onig_set_retry_limit_in_search <span class='sym_p'><span>( unsigned long <span class='color_p'>n</span></span> )</span></span><br/> +<span class="iname">onig_set_retry_limit_in_search_of_match_param <span class='sym_p'><span>( OnigMatchParam* <span class='color_p'>param</span></span>, <span>unsigned long <span class='color_p'>limit</span></span> )</span></span><br/> +<span class="iname">onig_set_subexp_call_max_nest_level <span class='sym_p'><span>( int <span class='color_p'>level</span></span> )</span></span><br/> +<br/> +<a class='top_ref' href='#Top'>to the top</a><br/> +<a name='Low_Risk_Source_Problems'></a><a name='Constant_Source_Problems_Low'></a> +<h2>Problems with Constants, Low Severity <span class='warning'> 2 </span></h2><hr/> +<span class='h_name'>oniguruma.h</span><br/> +<span class="section" onclick="javascript:showContent(this, 'c_4')"> +<span class='ext'>[+]</span> ONIGURUMA_VERSION_INT</span> +<br/> +<div id="c_4" style="display:none;"> +<table class='ptable'> +<tr> +<th class='pn'></th> +<th class='chg'>Change</th> +<th>Effect</th> +</tr> +<tr> +<th>1</th> +<td>The value of constant <b>ONIGURUMA_VERSION_INT</b> has been changed from <b>60904</b> to <b>60905</b>.</td> +<td>Recompilation of a client program may be broken.</td> +</tr> +</table> +<br/> +</div> + +<span class="section" onclick="javascript:showContent(this, 'c_5')"> +<span class='ext'>[+]</span> ONIGURUMA_VERSION_TEENY</span> +<br/> +<div id="c_5" style="display:none;"> +<table class='ptable'> +<tr> +<th class='pn'></th> +<th class='chg'>Change</th> +<th>Effect</th> +</tr> +<tr> +<th>1</th> +<td>The value of constant <b>ONIGURUMA_VERSION_TEENY</b> has been changed from <b>4</b> to <b>5</b>.</td> +<td>Recompilation of a client program may be broken.</td> +</tr> +</table> +<br/> +</div> + +<br/> +<a class='top_ref' href='#Top'>to the top</a><br/> +<a name='Other_Source_Changes'></a><a name='Other_Source_Changes_In_Constants'></a> +<h2>Other Changes in Constants <span class='passed'> 3 </span></h2><hr/> +<span class='h_name'>oniguruma.h</span><br/> +<span class="section" onclick="javascript:showContent(this, 'c_6')"> +<span class='ext'>[+]</span> ONIG_SYN_ISOLATED_OPTION_CONTINUE_BRANCH</span> +<br/> +<div id="c_6" style="display:none;"> +<table class='ptable'> +<tr> +<th class='pn'></th> +<th class='chg'>Change</th> +<th>Effect</th> +</tr> +<tr> +<th>1</th> +<td>The constant <b>ONIG_SYN_ISOLATED_OPTION_CONTINUE_BRANCH</b> with value <b>(1U<<10)</b> has been added.</td> +<td>No effect.</td> +</tr> +</table> +<br/> +</div> + +<span class="section" onclick="javascript:showContent(this, 'c_7')"> +<span class='ext'>[+]</span> ONIG_SYN_VARIABLE_LEN_LOOK_BEHIND</span> +<br/> +<div id="c_7" style="display:none;"> +<table class='ptable'> +<tr> +<th class='pn'></th> +<th class='chg'>Change</th> +<th>Effect</th> +</tr> +<tr> +<th>1</th> +<td>The constant <b>ONIG_SYN_VARIABLE_LEN_LOOK_BEHIND</b> with value <b>(1U<<11)</b> has been added.</td> +<td>No effect.</td> +</tr> +</table> +<br/> +</div> + +<span class="section" onclick="javascript:showContent(this, 'c_8')"> +<span class='ext'>[+]</span> ONIGERR_RETRY_LIMIT_IN_SEARCH_OVER</span> +<br/> +<div id="c_8" style="display:none;"> +<table class='ptable'> +<tr> +<th class='pn'></th> +<th class='chg'>Change</th> +<th>Effect</th> +</tr> +<tr> +<th>1</th> +<td>The constant <b>ONIGERR_RETRY_LIMIT_IN_SEARCH_OVER</b> with value <b>-18</b> has been added.</td> +<td>No effect.</td> +</tr> +</table> +<br/> +</div> + +<br/> +<a class='top_ref' href='#Top'>to the top</a><br/> +<a name='Headers'></a><h2>Header Files <span class='gray'> 2 </span></h2><hr/> +<div class='h_list'> +oniggnu.h<br/> +oniguruma.h<br/> +</div> +<br/><a class='top_ref' href='#Top'>to the top</a><br/> +<a name='Libs'></a><h2>Libraries <span class='gray'> 1 </span></h2><hr/> +<div class='lib_list'> +libonig.so.5.0.0<br/> +</div> +<br/><a class='top_ref' href='#Top'>to the top</a><br/> +<br/><br/><br/></div><hr/> +<div class='footer' align='right'><i>Generated by <a href='https://github.com/lvc/abi-compliance-checker'>ABI Compliance Checker</a> 2.3  </i> +</div> +<br/> + +</body></html> diff --git a/libonig.xml b/libonig.xml index 5255c27..3df5e7b 100644 --- a/libonig.xml +++ b/libonig.xml @@ -9,7 +9,7 @@ <version> <!-- Version of the library --> -6.9.4 +6.9.5 </version> <headers> diff --git a/onig-soname.patch b/onig-soname.patch new file mode 100644 index 0000000..3349ca6 --- /dev/null +++ b/onig-soname.patch @@ -0,0 +1,12 @@ +diff -up ./configure.old ./configure +--- ./configure.old 2020-05-28 10:06:33.980770743 +0200 ++++ ./configure 2020-05-28 10:06:37.392768282 +0200 +@@ -12214,7 +12214,7 @@ CC=$lt_save_CC + # Only expand once: + + +-LTVERSION="5:0:0" ++LTVERSION="105:0:0" + + + diff --git a/oniguruma.spec b/oniguruma.spec index a4e7bb0..c33e400 100644 --- a/oniguruma.spec +++ b/oniguruma.spec @@ -1,4 +1,4 @@ -# remirepo spec file for oniguruma5 +# remirepo spec file for oniguruma5php # renamed for parallel installation, from: # # Fedora spec file for oniguruma @@ -9,7 +9,8 @@ # Please preserve changelog entries # %global libname oniguruma -%global soname 5 +%global oldsoname 5 +%global newsoname 105 %undefine _changelog_trimtime # Fedora 29 have 6.9, soname 5 @@ -21,11 +22,7 @@ %global mainver 6.9.5 %global postver rev1 -%if 0%{?fedora} >= 28 || 0%{?rhel} >= 8 -Name: %{libname} -%else -Name: %{libname}%{soname} -%endif +Name: %{libname}%{oldsoname}php Version: %{mainver}%{?postver:+%postver} Release: 1%{?dist} Summary: Regular expressions library @@ -34,32 +31,31 @@ License: BSD URL: https://github.com/kkos/oniguruma/ Source0: https://github.com/kkos/oniguruma/releases/download/v%{mainver}%{?postver:_%postver}/onig-%{mainver}%{?postver:-%postver}.tar.gz +# Bump soname from 5 to 105 to allow parallel installation +Patch0: onig-soname.patch + BuildRequires: gcc -%if "%{name}" == "%{libname}" -Obsoletes: %{libname}%{soname} <= %{version} -%endif +# TODO Obsoletes: %{libname}%{oldsoname} <= %{version} + %description Oniguruma is a regular expressions library. The characteristics of this library is that different character encoding for every regular expression object can be specified. (supported APIs: GNU regex, POSIX and Oniguruma native) -%if "%{name}" != "%{libname}" -%{name} is designed to be installed beside %{libname}. -%endif + +%{name} is designed to be installed beside %{libname} +and only used by PHP binaries (mbstring extension). %package devel Summary: Development files for %{name} Requires: %{name}%{?isa} = %{version}-%{release} -%if "%{name}" == "%{libname}" -Obsoletes: %{libname}%{soname}-devel <= %{version} -%else +Obsoletes: %{libname}%{oldsoname}-devel <= %{version} Conflicts: %{libname}-devel < %{version} Provides: %{libname}-devel = %{version}-%{release} -%endif %description devel The %{name}-devel package contains libraries and header files for @@ -70,6 +66,8 @@ developing applications that use %{name}. %setup -q -n onig-%{mainver} %{__sed} -i.multilib -e 's|-L@libdir@||' onig-config.in +%patch0 -p1 -b .bump + %if 0 for f in \ README.ja \ @@ -125,7 +123,7 @@ sed -e '/^test_regset_LDADD/s/$/ -lrt/' -i test/Makefile %lang(ja) %doc README_japanese %lang(ja) %doc index_ja.html -%{_libdir}/libonig.so.%{soname}* +%{_libdir}/libonig.so.%{newsoname}* %files devel %doc doc/API @@ -149,6 +147,9 @@ sed -e '/^test_regset_LDADD/s/$/ -lrt/' -i test/Makefile %changelog +* Thu May 28 2020 Remi Collet <remi@remirepo.net> -6.9.5+rev1-1 +- rename to oniguruna5php and bump soname to 105 + * Thu May 14 2020 Remi Collet <remi@remirepo.net> -6.9.5+rev1-1 - update to 6.9.5-rev1 (from Fedora) |