diff options
| -rw-r--r-- | compat_reports/1.3.2_to_1.4.0/compat_report.html | 1057 | ||||
| -rw-r--r-- | libzip-rpath.patch | 13 | ||||
| -rw-r--r-- | libzip-upstream.patch | 140 | ||||
| -rw-r--r-- | libzip.spec | 40 | ||||
| -rw-r--r-- | libzip.xml | 2 |
5 files changed, 1239 insertions, 13 deletions
diff --git a/compat_reports/1.3.2_to_1.4.0/compat_report.html b/compat_reports/1.3.2_to_1.4.0/compat_report.html new file mode 100644 index 0000000..380e6f6 --- /dev/null +++ b/compat_reports/1.3.2_to_1.4.0/compat_report.html @@ -0,0 +1,1057 @@ +<!-- kind:binary;verdict:compatible;affected:0;added:3;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;type_changes_other:1;constant_changes_other:4;tool_version:2.1 --> +<!-- kind:source;verdict:incompatible;affected:2.2;added:3;removed:6;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:17;type_changes_other:1;constant_changes_other:4;tool_version:2.1 --> +<!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="keywords" content="libzip, compatibility, API, ABI, report" /> +<meta name="description" content="API/ABI compatibility report for the libzip library between 1.3.2 and 1.4.0 versions" /> +<title>libzip: 1.3.2 to 1.4.0 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:100; +} +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:100; + 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:100; +} +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:100; +} +span.nowrap { + white-space:nowrap; +} +span.value { + font-weight:bold; +} +.passed { + background-color:#CCFFCC; + font-weight:100; +} +.warning { + background-color:#F4F4AF; + font-weight:100; +} +.failed { + background-color:#FFCCCC; + font-weight:100; +} +.new { + background-color:#C6DEFF; + font-weight:100; +} +.compatible { + background-color:#CCFFCC; + font-weight:100; +} +.almost_compatible { + background-color:#FFDAA3; + font-weight:100; +} +.incompatible { + background-color:#FFCCCC; + font-weight:100; +} +.gray { + background-color:#DCDCDC; + font-weight:100; +} +.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;'>libzip</span> library between <span style='color:Red;'>1.3.2</span> and <span style='color:Red;'>1.4.0</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>libzip</td></tr> +<tr><th>Version #1</th><td>1.3.2</td></tr> +<tr><th>Version #2</th><td>1.4.0</td></tr> +<tr><th>Arch</th><td>x86_64</td></tr> +<tr><th>GCC Version</th><td>7</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>119 / 48</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;'>3</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 Data Types</th><td>-</td><td class='passed'><a href='#Other_Binary_Changes_In_Types' style='color:Blue;'>1</a></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;'>4</a></td></tr> +</table> + +<a name='Binary_Added'></a><h2>Added Symbols <span class='new'> 3 </span></h2><hr/> +<span class='h_name'>zip.h</span>, <span class='lib_name'>libzip.so.5.0</span><br/> +<span class="iname">zip_source_begin_write_cloning <span class='sym_p'><span>( zip_source_t* <span class='color_p'>p1</span></span>, <span>zip_uint64_t <span class='color_p'>p2</span></span> )</span></span><br/> +<span class="iname">zip_source_buffer_fragment <span class='sym_p'><span>( zip_t* <span class='color_p'>p1</span></span>, <span>zip_buffer_fragment_t const* <span class='color_p'>p2</span></span>, <span>zip_uint64_t <span class='color_p'>p3</span></span>, <span>int <span class='color_p'>p4</span></span> )</span></span><br/> +<span class="iname">zip_source_buffer_fragment_create <span class='sym_p'><span>( zip_buffer_fragment_t const* <span class='color_p'>p1</span></span>, <span>zip_uint64_t <span class='color_p'>p2</span></span>, <span>int <span class='color_p'>p3</span></span>, <span>zip_error_t* <span class='color_p'>p4</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_Types'></a> +<h2>Other Changes in Data Types <span class='passed'> 1 </span></h2><hr/> +<span class='h_name'>zip.h</span><br/> +<span class="section" onclick="javascript:showContent(this, 'c_1')"> +<span class='ext'>[+]</span> <span class='ttype'>enum</span> zip_source_cmd <span class='passed'> 1 </span></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 member <b>ZIP_SOURCE_BEGIN_WRITE_CLONING</b> with value <b>17</b> has been added.</td> +<td>No effect.</td> +</tr> +</table> +<span class="sect_aff" onclick="javascript:showContent(this, 'c_2')"> +[+] affected symbols: 3 (2.5%)</span> +<div id="c_2" style="display:none;"> +<div class='affected'><span class='iname_a'>zip_source_function <span class='sym_p'><span>( zip_t* <i>p1</i></span>, <span>zip_source_callback <span class='fp'>p2</span></span>, <span>void* <i>p3</i></span> )</span></span><br/> +<div class='affect'>Field 'p2.p3' in 2nd parameter 'p2' has base type 'enum zip_source_cmd'.</div> +<span class='iname_a'>zip_source_function_create <span class='sym_p'><span>( zip_source_callback <span class='fp'>p1</span></span>, <span>void* <i>p2</i></span>, <span>zip_error_t* <i>p3</i></span> )</span></span><br/> +<div class='affect'>Field 'p1.p3' in 1st parameter 'p1' has base type 'enum zip_source_cmd'.</div> +<span class='iname_a'>zip_source_make_command_bitmap <span class='sym_p'><span>( zip_source_cmd_t <span class='fp'>p1</span></span>, <span>...</span> )</span></span><br/> +<div class='affect'>1st parameter 'p1' has base type 'enum zip_source_cmd'.</div> +</div> +</div> +<br/><br/></div> + +<br/> +<a class='top_ref' href='#Top'>to the top</a><br/> +<a name='Other_Binary_Changes_In_Constants'></a> +<h2>Other Changes in Constants <span class='passed'> 4 </span></h2><hr/> +<span class='h_name'>zipconf.h</span><br/> +<span class="section" onclick="javascript:showContent(this, 'c_3')"> +<span class='ext'>[+]</span> INT_LIBZIP</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>INT_LIBZIP</b> with value <b>4</b> has been added.</td> +<td>No effect.</td> +</tr> +</table> +<br/> +</div> + +<span class="section" onclick="javascript:showContent(this, 'c_4')"> +<span class='ext'>[+]</span> LONG_LIBZIP</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 constant <b>LONG_LIBZIP</b> with value <b>8</b> has been added.</td> +<td>No effect.</td> +</tr> +</table> +<br/> +</div> + +<span class="section" onclick="javascript:showContent(this, 'c_5')"> +<span class='ext'>[+]</span> LONG_LONG_LIBZIP</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 constant <b>LONG_LONG_LIBZIP</b> with value <b>8</b> has been added.</td> +<td>No effect.</td> +</tr> +</table> +<br/> +</div> + +<span class="section" onclick="javascript:showContent(this, 'c_6')"> +<span class='ext'>[+]</span> SHORT_LIBZIP</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>SHORT_LIBZIP</b> with value <b>2</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'> +zip.h<br/> +zipconf.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'> +libzip.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>libzip</td></tr> +<tr><th>Version #1</th><td>1.3.2</td></tr> +<tr><th>Version #2</th><td>1.4.0</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>279 / 81</td></tr> +<tr><th>Compatibility</th> +<td class='warning'>97.8%</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;'>3</a></td></tr> +<tr><th>Removed Symbols</th><td>High</td><td class='failed'><a href='#Source_Removed' style='color:Blue;'>6</a></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;'>17</a></td></tr> +<tr><th>Other Changes<br/>in Data Types</th><td>-</td><td class='passed'><a href='#Other_Source_Changes_In_Types' style='color:Blue;'>1</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;'>4</a></td></tr> +</table> + +<a name='Source_Added'></a><h2>Added Symbols <span class='new'> 3 </span></h2><hr/> +<span class='h_name'>zip.h</span><br/> +<span class="iname">zip_source_begin_write_cloning <span class='sym_p'><span>( zip_source_t* <span class='color_p'>p1</span></span>, <span>zip_uint64_t <span class='color_p'>p2</span></span> )</span></span><br/> +<span class="iname">zip_source_buffer_fragment <span class='sym_p'><span>( zip_t* <span class='color_p'>p1</span></span>, <span>zip_buffer_fragment_t const* <span class='color_p'>p2</span></span>, <span>zip_uint64_t <span class='color_p'>p3</span></span>, <span>int <span class='color_p'>p4</span></span> )</span></span><br/> +<span class="iname">zip_source_buffer_fragment_create <span class='sym_p'><span>( zip_buffer_fragment_t const* <span class='color_p'>p1</span></span>, <span>zip_uint64_t <span class='color_p'>p2</span></span>, <span>int <span class='color_p'>p3</span></span>, <span>zip_error_t* <span class='color_p'>p4</span></span> )</span></span><br/> +<br/> +<a class='top_ref' href='#Top'>to the top</a><br/> +<a name='Source_Removed'></a><a name='Source_Withdrawn'></a><h2>Removed Symbols <span class='failed'> 6 </span></h2><hr/> +<span class='h_name'>inttypes.h</span><br/> +<span class="iname">imaxabs <span class='sym_p'><span>( intmax_t <span class='color_p'>__n</span></span> )</span></span><br/> +<span class="iname">imaxdiv <span class='sym_p'><span>( intmax_t <span class='color_p'>__numer</span></span>, <span>intmax_t <span class='color_p'>__denom</span></span> )</span></span><br/> +<span class="iname">strtoimax <span class='sym_p'><span>( char const*restrict <span class='color_p'>__nptr</span></span>, <span>char**restrict <span class='color_p'>__endptr</span></span>, <span>int <span class='color_p'>__base</span></span> )</span></span><br/> +<span class="iname">strtoumax <span class='sym_p'><span>( char const*restrict <span class='color_p'>__nptr</span></span>, <span>char**restrict <span class='color_p'>__endptr</span></span>, <span>int <span class='color_p'>__base</span></span> )</span></span><br/> +<span class="iname">wcstoimax <span class='sym_p'><span>( wchar_t const*restrict <span class='color_p'>__nptr</span></span>, <span>wchar_t**restrict <span class='color_p'>__endptr</span></span>, <span>int <span class='color_p'>__base</span></span> )</span></span><br/> +<span class="iname">wcstoumax <span class='sym_p'><span>( wchar_t const*restrict <span class='color_p'>__nptr</span></span>, <span>wchar_t**restrict <span class='color_p'>__endptr</span></span>, <span>int <span class='color_p'>__base</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'> 17 </span></h2><hr/> +<span class='h_name'>zip.h</span><br/> +<span class="section" onclick="javascript:showContent(this, 'c_7')"> +<span class='ext'>[+]</span> ZIP_EXTRA_FIELD_ALL</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 value of constant <b>ZIP_EXTRA_FIELD_ALL</b> has been changed from <b>UINT16_MAX</b> to <b>0xffff</b>.</td> +<td>Recompilation of a client program may be broken.</td> +</tr> +</table> +<br/> +</div> + +<span class="section" onclick="javascript:showContent(this, 'c_8')"> +<span class='ext'>[+]</span> ZIP_EXTRA_FIELD_NEW</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 value of constant <b>ZIP_EXTRA_FIELD_NEW</b> has been changed from <b>UINT16_MAX</b> to <b>0xffff</b>.</td> +<td>Recompilation of a client program may be broken.</td> +</tr> +</table> +<br/> +</div> + +<br/> +<span class='h_name'>zipconf.h</span><br/> +<span class="section" onclick="javascript:showContent(this, 'c_9')"> +<span class='ext'>[+]</span> LIBZIP_VERSION</span> +<br/> +<div id="c_9" 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>LIBZIP_VERSION</b> has been changed from <b>"1.3.2"</b> to <b>"1.4.0"</b>.</td> +<td>Recompilation of a client program may be broken.</td> +</tr> +</table> +<br/> +</div> + +<span class="section" onclick="javascript:showContent(this, 'c_10')"> +<span class='ext'>[+]</span> LIBZIP_VERSION_MICRO</span> +<br/> +<div id="c_10" 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>LIBZIP_VERSION_MICRO</b> with value <b>2</b> has been removed.</td> +<td>Recompilation of a client program may be broken.</td> +</tr> +</table> +<br/> +</div> + +<span class="section" onclick="javascript:showContent(this, 'c_11')"> +<span class='ext'>[+]</span> LIBZIP_VERSION_MINOR</span> +<br/> +<div id="c_11" 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>LIBZIP_VERSION_MINOR</b> has been changed from <b>3</b> to <b>4</b>.</td> +<td>Recompilation of a client program may be broken.</td> +</tr> +</table> +<br/> +</div> + +<span class="section" onclick="javascript:showContent(this, 'c_12')"> +<span class='ext'>[+]</span> ZIP_INT16_MAX</span> +<br/> +<div id="c_12" 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>ZIP_INT16_MAX</b> has been changed from <b>INT16_MAX</b> to <b>0x7fff</b>.</td> +<td>Recompilation of a client program may be broken.</td> +</tr> +</table> +<br/> +</div> + +<span class="section" onclick="javascript:showContent(this, 'c_13')"> +<span class='ext'>[+]</span> ZIP_INT16_MIN</span> +<br/> +<div id="c_13" 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>ZIP_INT16_MIN</b> has been changed from <b>INT16_MIN</b> to <b>(-ZIP_INT16_MAX-1)</b>.</td> +<td>Recompilation of a client program may be broken.</td> +</tr> +</table> +<br/> +</div> + +<span class="section" onclick="javascript:showContent(this, 'c_14')"> +<span class='ext'>[+]</span> ZIP_INT32_MAX</span> +<br/> +<div id="c_14" 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>ZIP_INT32_MAX</b> has been changed from <b>INT32_MAX</b> to <b>0x7fffffffL</b>.</td> +<td>Recompilation of a client program may be broken.</td> +</tr> +</table> +<br/> +</div> + +<span class="section" onclick="javascript:showContent(this, 'c_15')"> +<span class='ext'>[+]</span> ZIP_INT32_MIN</span> +<br/> +<div id="c_15" 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>ZIP_INT32_MIN</b> has been changed from <b>INT32_MIN</b> to <b>(-ZIP_INT32_MAX-1L)</b>.</td> +<td>Recompilation of a client program may be broken.</td> +</tr> +</table> +<br/> +</div> + +<span class="section" onclick="javascript:showContent(this, 'c_16')"> +<span class='ext'>[+]</span> ZIP_INT64_MAX</span> +<br/> +<div id="c_16" 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>ZIP_INT64_MAX</b> has been changed from <b>INT64_MAX</b> to <b>0x7fffffffffffffffLL</b>.</td> +<td>Recompilation of a client program may be broken.</td> +</tr> +</table> +<br/> +</div> + +<span class="section" onclick="javascript:showContent(this, 'c_17')"> +<span class='ext'>[+]</span> ZIP_INT64_MIN</span> +<br/> +<div id="c_17" 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>ZIP_INT64_MIN</b> has been changed from <b>INT64_MIN</b> to <b>(-ZIP_INT64_MAX-1LL)</b>.</td> +<td>Recompilation of a client program may be broken.</td> +</tr> +</table> +<br/> +</div> + +<span class="section" onclick="javascript:showContent(this, 'c_18')"> +<span class='ext'>[+]</span> ZIP_INT8_MAX</span> +<br/> +<div id="c_18" 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>ZIP_INT8_MAX</b> has been changed from <b>INT8_MAX</b> to <b>0x7f</b>.</td> +<td>Recompilation of a client program may be broken.</td> +</tr> +</table> +<br/> +</div> + +<span class="section" onclick="javascript:showContent(this, 'c_19')"> +<span class='ext'>[+]</span> ZIP_INT8_MIN</span> +<br/> +<div id="c_19" 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>ZIP_INT8_MIN</b> has been changed from <b>INT8_MIN</b> to <b>(-ZIP_INT8_MAX-1)</b>.</td> +<td>Recompilation of a client program may be broken.</td> +</tr> +</table> +<br/> +</div> + +<span class="section" onclick="javascript:showContent(this, 'c_20')"> +<span class='ext'>[+]</span> ZIP_UINT16_MAX</span> +<br/> +<div id="c_20" 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>ZIP_UINT16_MAX</b> has been changed from <b>UINT16_MAX</b> to <b>0xffff</b>.</td> +<td>Recompilation of a client program may be broken.</td> +</tr> +</table> +<br/> +</div> + +<span class="section" onclick="javascript:showContent(this, 'c_21')"> +<span class='ext'>[+]</span> ZIP_UINT32_MAX</span> +<br/> +<div id="c_21" 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>ZIP_UINT32_MAX</b> has been changed from <b>UINT32_MAX</b> to <b>0xffffffffLU</b>.</td> +<td>Recompilation of a client program may be broken.</td> +</tr> +</table> +<br/> +</div> + +<span class="section" onclick="javascript:showContent(this, 'c_22')"> +<span class='ext'>[+]</span> ZIP_UINT64_MAX</span> +<br/> +<div id="c_22" 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>ZIP_UINT64_MAX</b> has been changed from <b>UINT64_MAX</b> to <b>0xffffffffffffffffULL</b>.</td> +<td>Recompilation of a client program may be broken.</td> +</tr> +</table> +<br/> +</div> + +<span class="section" onclick="javascript:showContent(this, 'c_23')"> +<span class='ext'>[+]</span> ZIP_UINT8_MAX</span> +<br/> +<div id="c_23" 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>ZIP_UINT8_MAX</b> has been changed from <b>UINT8_MAX</b> to <b>0xff</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_Types'></a> +<h2>Other Changes in Data Types <span class='passed'> 1 </span></h2><hr/> +<span class='h_name'>zip.h</span><br/> +<span class="section" onclick="javascript:showContent(this, 'c_24')"> +<span class='ext'>[+]</span> <span class='ttype'>enum</span> zip_source_cmd <span class='passed'> 1 </span></span> +<br/> +<div id="c_24" 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 member <b>ZIP_SOURCE_BEGIN_WRITE_CLONING</b> with value <b>17</b> has been added.</td> +<td>No effect.</td> +</tr> +</table> +<span class="sect_aff" onclick="javascript:showContent(this, 'c_25')"> +[+] affected symbols: 3 (1.1%)</span> +<div id="c_25" style="display:none;"> +<div class='affected'><span class='iname_a'>zip_source_function <span class='sym_p'><span>( zip_t* <i>p1</i></span>, <span>zip_source_callback <span class='fp'>p2</span></span>, <span>void* <i>p3</i></span> )</span></span><br/> +<div class='affect'>Field 'p2.p3' in 2nd parameter 'p2' has base type 'enum zip_source_cmd'.</div> +<span class='iname_a'>zip_source_function_create <span class='sym_p'><span>( zip_source_callback <span class='fp'>p1</span></span>, <span>void* <i>p2</i></span>, <span>zip_error_t* <i>p3</i></span> )</span></span><br/> +<div class='affect'>Field 'p1.p3' in 1st parameter 'p1' has base type 'enum zip_source_cmd'.</div> +<span class='iname_a'>zip_source_make_command_bitmap <span class='sym_p'><span>( zip_source_cmd_t <span class='fp'>p1</span></span>, <span>...</span> )</span></span><br/> +<div class='affect'>1st parameter 'p1' has base type 'enum zip_source_cmd'.</div> +</div> +</div> +<br/><br/></div> + +<br/> +<a class='top_ref' href='#Top'>to the top</a><br/> +<a name='Other_Source_Changes_In_Constants'></a> +<h2>Other Changes in Constants <span class='passed'> 4 </span></h2><hr/> +<span class='h_name'>zipconf.h</span><br/> +<span class="section" onclick="javascript:showContent(this, 'c_26')"> +<span class='ext'>[+]</span> INT_LIBZIP</span> +<br/> +<div id="c_26" 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>INT_LIBZIP</b> with value <b>4</b> has been added.</td> +<td>No effect.</td> +</tr> +</table> +<br/> +</div> + +<span class="section" onclick="javascript:showContent(this, 'c_27')"> +<span class='ext'>[+]</span> LONG_LIBZIP</span> +<br/> +<div id="c_27" 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>LONG_LIBZIP</b> with value <b>8</b> has been added.</td> +<td>No effect.</td> +</tr> +</table> +<br/> +</div> + +<span class="section" onclick="javascript:showContent(this, 'c_28')"> +<span class='ext'>[+]</span> LONG_LONG_LIBZIP</span> +<br/> +<div id="c_28" 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>LONG_LONG_LIBZIP</b> with value <b>8</b> has been added.</td> +<td>No effect.</td> +</tr> +</table> +<br/> +</div> + +<span class="section" onclick="javascript:showContent(this, 'c_29')"> +<span class='ext'>[+]</span> SHORT_LIBZIP</span> +<br/> +<div id="c_29" 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>SHORT_LIBZIP</b> with value <b>2</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'> +zip.h<br/> +zipconf.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'> +libzip.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.1  </i> +</div> +<br/> + +</body></html> diff --git a/libzip-rpath.patch b/libzip-rpath.patch new file mode 100644 index 0000000..bc5e2da --- /dev/null +++ b/libzip-rpath.patch @@ -0,0 +1,13 @@ +diff -up ./CMakeLists.txt.rpm ./CMakeLists.txt +--- ./CMakeLists.txt.rpm 2017-12-30 07:46:53.988134130 +0100 ++++ ./CMakeLists.txt 2017-12-30 07:47:03.787185954 +0100 +@@ -139,9 +139,6 @@ endif(CMAKE_SYSTEM_NAME MATCHES WindowsP + + ADD_DEFINITIONS("-DHAVE_CONFIG_H") + +-# rpath handling: use rpath in installed binaries +-SET(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR}") +-SET(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE) + + # Testing + ENABLE_TESTING() diff --git a/libzip-upstream.patch b/libzip-upstream.patch new file mode 100644 index 0000000..50be182 --- /dev/null +++ b/libzip-upstream.patch @@ -0,0 +1,140 @@ +From 42a3c4a40b9925b8ef0fb8f38b200fdc9f6fe5a4 Mon Sep 17 00:00:00 2001 +From: Thomas Klausner <tk@giga.or.at> +Date: Fri, 29 Dec 2017 22:29:37 +0100 +Subject: [PATCH] Use GNUInstallDirs variables to allow installation + customization. + +--- + CMakeLists.txt | 13 ++++++------- + lib/CMakeLists.txt | 8 ++++---- + src/CMakeLists.txt | 6 +++--- + 3 files changed, 13 insertions(+), 14 deletions(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 69cdb8b..b61f5ea 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -1,6 +1,5 @@ + # TODO: +-# 1. Problems generating html pages. +-# 2. create usable libtool .la file ++# create usable libtool .la file + + CMAKE_MINIMUM_REQUIRED(VERSION 3.0.2) + +@@ -141,7 +140,7 @@ endif(CMAKE_SYSTEM_NAME MATCHES WindowsPhone OR CMAKE_SYSTEM_NAME MATCHES Window + ADD_DEFINITIONS("-DHAVE_CONFIG_H") + + # rpath handling: use rpath in installed binaries +-SET(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/lib") ++SET(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR}") + SET(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE) + + # Testing +@@ -157,8 +156,8 @@ ADD_SUBDIRECTORY(examples) + # pkgconfig file + SET(prefix ${CMAKE_INSTALL_PREFIX}) + SET(exec_prefix \${prefix}) +-SET(libdir \${exec_prefix}/lib) +-SET(includedir \${prefix}/include) ++SET(libdir \${exec_prefix}/${CMAKE_INSTALL_LIBDIR}) ++SET(includedir \${prefix}/${CMAKE_INSTALL_INCLUDEDIR}) + IF(BZIP2_FOUND) + SET(LIBS "${LIBS} -lbz2") + ENDIF() +@@ -167,7 +166,7 @@ IF(CMAKE_SYSTEM_NAME MATCHES BSD) + SET(PKG_CONFIG_RPATH "-Wl,-R\${libdir}") + ENDIF(CMAKE_SYSTEM_NAME MATCHES BSD) + CONFIGURE_FILE(libzip.pc.in libzip.pc @ONLY) +-INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/libzip.pc DESTINATION lib/pkgconfig) ++INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/libzip.pc DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig) + + # write out config file + CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/cmake-config.h.in ${CMAKE_CURRENT_BINARY_DIR}/config.h) +@@ -188,4 +187,4 @@ FILE(COPY ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/runtest + + # installation + +-INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/zipconf.h DESTINATION include) ++INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/zipconf.h DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}) +diff --git a/lib/CMakeLists.txt b/lib/CMakeLists.txt +index 855ccf5..ecbb45e 100644 +--- a/lib/CMakeLists.txt ++++ b/lib/CMakeLists.txt +@@ -1,6 +1,6 @@ + INCLUDE(CheckFunctionExists) + +-INSTALL(FILES zip.h DESTINATION include) ++INSTALL(FILES zip.h DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}) + + # from http://www.cmake.org/Wiki/CMakeMacroLibtoolFile + MACRO(GET_TARGET_PROPERTY_WITH_DEFAULT _variable _target _property _default_value) +@@ -203,7 +203,7 @@ ADD_LIBRARY(zip ${LIBZIP_SOURCES} ${LIBZIP_EXTRA_FILES} ${LIBZIP_OPSYS_FILES}) + SET_TARGET_PROPERTIES(zip PROPERTIES VERSION 5.0 SOVERSION 5) + TARGET_LINK_LIBRARIES(zip ${ZLIB_LIBRARY} ${OPTIONAL_LIBRARY}) + INSTALL(TARGETS zip +- RUNTIME DESTINATION bin +- ARCHIVE DESTINATION lib +- LIBRARY DESTINATION lib) ++ RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} ++ ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} ++ LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}) + #CREATE_LIBTOOL_FILE(zip lib) +diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt +index 2a3f4d2..ccc8f7e 100644 +--- a/src/CMakeLists.txt ++++ b/src/CMakeLists.txt +@@ -8,12 +8,12 @@ ENDIF(NOT HAVE_GETOPT) + + ADD_EXECUTABLE(zipcmp zipcmp.c ${SRC_EXTRA_FILES}) + TARGET_LINK_LIBRARIES(zipcmp zip) +-INSTALL(TARGETS zipcmp RUNTIME DESTINATION bin) ++INSTALL(TARGETS zipcmp RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}) + + ADD_EXECUTABLE(zipmerge zipmerge.c ${SRC_EXTRA_FILES}) + TARGET_LINK_LIBRARIES(zipmerge zip) +-INSTALL(TARGETS zipmerge RUNTIME DESTINATION bin) ++INSTALL(TARGETS zipmerge RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}) + + ADD_EXECUTABLE(ziptool ziptool.c ${SRC_EXTRA_FILES}) + TARGET_LINK_LIBRARIES(ziptool zip) +-INSTALL(TARGETS ziptool RUNTIME DESTINATION bin) ++INSTALL(TARGETS ziptool RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}) +From 3a7497b791289e316aa794b7f2f1a95dd26ced26 Mon Sep 17 00:00:00 2001 +From: Thomas Klausner <tk@giga.or.at> +Date: Fri, 29 Dec 2017 22:35:53 +0100 +Subject: [PATCH] Set bindir in pkgconfig file and use it. + +--- + CMakeLists.txt | 1 + + libzip.pc.in | 3 ++- + 2 files changed, 3 insertions(+), 1 deletion(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index b61f5ea..3366b25 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -156,6 +156,7 @@ ADD_SUBDIRECTORY(examples) + # pkgconfig file + SET(prefix ${CMAKE_INSTALL_PREFIX}) + SET(exec_prefix \${prefix}) ++SET(bindir \${exec_prefix}/${CMAKE_INSTALL_BINDIR}) + SET(libdir \${exec_prefix}/${CMAKE_INSTALL_LIBDIR}) + SET(includedir \${prefix}/${CMAKE_INSTALL_INCLUDEDIR}) + IF(BZIP2_FOUND) +diff --git a/libzip.pc.in b/libzip.pc.in +index 53abc47..7be7f3e 100644 +--- a/libzip.pc.in ++++ b/libzip.pc.in +@@ -1,9 +1,10 @@ + prefix=@prefix@ + exec_prefix=@exec_prefix@ ++bindir=@bindir@ + libdir=@libdir@ + includedir=@includedir@ + +-zipcmp=@prefix@/bin/zipcmp ++zipcmp=@bindir@/zipcmp + + Name: libzip + Description: library for handling zip archives diff --git a/libzip.spec b/libzip.spec index 4a6a9a1..b0329e2 100644 --- a/libzip.spec +++ b/libzip.spec @@ -17,7 +17,7 @@ Name: %{libname} %else Name: %{libname}%{soname} %endif -Version: 1.3.2 +Version: 1.4.0 Release: 1%{?dist} Group: System Environment/Libraries Summary: C library for reading, creating, and modifying zip archives @@ -26,8 +26,18 @@ License: BSD URL: https://libzip.org/ Source0: https://libzip.org/download/libzip-%{version}.tar.xz +# drop RPATH from installed binaries +Patch0: libzip-rpath.patch +# allow path customization (lib64) +Patch1: libzip-upstream.patch + BuildRequires: zlib-devel BuildRequires: bzip2-devel +%if 0%{?rhel} == 6 || 0%{?rhel} == 7 +BuildRequires: cmake3 >= 3.0.2 +%else +BuildRequires: cmake >= 3.0.2 +%endif # Needed to run the test suite # find regress/ -type f | /usr/lib/rpm/perl.req # find regress/ -type f | /usr/lib/rpm/perl.prov @@ -104,17 +114,21 @@ The %{name}-tools package provides command line tools split off %{name}: %prep %setup -q -n %{libname}-%{version} +%patch1 -p1 -b .upstream +%patch0 -p1 -b .rpm -# Avoid lib64 rpaths (FIXME: recheck this on newer releases) -%if "%{_libdir}" != "/usr/lib" -sed -i -e 's|"/lib /usr/lib|"/%{_lib} %{_libdir}|' configure -#autoreconf -f -i -%endif +# unwanted in package documentation +rm INSTALL.md %build -%configure \ - --disable-static +%if 0%{?rhel} == 6 || 0%{?rhel} == 7 +# drop skipped test which make test suite fails (cmake issue ?) +sed -e '/clone-fs-/d' -i regress/CMakeLists.txt +%cmake3 . +%else +%cmake . +%endif make %{?_smp_mflags} @@ -122,9 +136,6 @@ make %{?_smp_mflags} %install make install DESTDIR=%{buildroot} INSTALL='install -p' -## unpackaged files -rm -fv %{buildroot}%{_libdir}/lib*.la - %check %if %{with_tests} @@ -151,7 +162,7 @@ make check %{_mandir}/man1/zip* %files devel -%doc API-CHANGES AUTHORS THANKS *.md +%doc AUTHORS THANKS *.md %{_includedir}/zip.h %{_includedir}/zipconf*.h %{_libdir}/libzip.so @@ -162,6 +173,11 @@ make check %changelog +* Sat Dec 30 2017 Remi Collet <remi@remirepo.net> - 1.4.0-1 +- update to 1.4.0 +- switch to cmake +- add upstream patch for lib64 + * Mon Nov 20 2017 Remi Collet <remi@remirepo.net> - 1.3.2-1 - update to 1.3.2 @@ -9,7 +9,7 @@ <version> <!-- Version of the library --> -1.3.2 +1.4.0 </version> <headers> |