summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRemi Collet <remi@remirepo.net>2017-11-20 06:46:31 +0100
committerRemi Collet <remi@remirepo.net>2017-11-20 06:46:31 +0100
commitc5616ea1427c289fa9baf96b03f09fac38c9c1f6 (patch)
treebfce1492f8fd319cc4ddec3ccf1ed97c24ca00e4
parent77498584e1c906b6055a024f9e0cdae3b4632719 (diff)
update to 1.3.1
drop multilib header hack
Diffstat
-rw-r--r--9879affbbdec684adb343b331f47f06788681e3b.patch63
-rw-r--r--compat_reports/1.3.0_to_1.3.1/compat_report.html530
-rw-r--r--libzip.spec32
-rw-r--r--libzip.xml63
-rw-r--r--zipconf.h23
5 files changed, 599 insertions, 112 deletions
diff --git a/9879affbbdec684adb343b331f47f06788681e3b.patch b/9879affbbdec684adb343b331f47f06788681e3b.patch
deleted file mode 100644
index a6a451e..0000000
--- a/9879affbbdec684adb343b331f47f06788681e3b.patch
+++ /dev/null
@@ -1,63 +0,0 @@
-From 9879affbbdec684adb343b331f47f06788681e3b Mon Sep 17 00:00:00 2001
-From: Thomas Klausner <tk@giga.or.at>
-Date: Fri, 6 Oct 2017 12:24:22 +0200
-Subject: [PATCH] nonrandomopen: override open64() as well.
-
----
- regress/nonrandomopen.c | 32 +++++++++++++++++++++++++++++++-
- 1 file changed, 31 insertions(+), 1 deletion(-)
-
-diff --git a/regress/nonrandomopen.c b/regress/nonrandomopen.c
-index 4f74222..dd90c14 100644
---- a/regress/nonrandomopen.c
-+++ b/regress/nonrandomopen.c
-@@ -47,7 +47,8 @@
- #endif
-
- static int inited = 0;
--static int (*real_open)(const char *path, int mode, ...) = NULL;
-+static int (*real_open)(const char *path, int flags, ...) = NULL;
-+static int (*real_open64)(const char *path, int flags, ...) = NULL;
-
- static void
- init(void)
-@@ -55,6 +56,10 @@ init(void)
- real_open = dlsym(RTLD_NEXT, "open");
- if (!real_open)
- abort();
-+ real_open64 = dlsym(RTLD_NEXT, "open64");
-+ if (!real_open64) {
-+ /* does not have to exist */
-+ }
- inited = 1;
- }
-
-@@ -78,3 +83,28 @@ open(const char *path, int flags, ...)
- return real_open(path, flags, mode);
- }
- }
-+
-+int
-+open64(const char *path, int flags, ...)
-+{
-+ va_list ap;
-+ mode_t mode;
-+
-+ if (!inited) {
-+ init();
-+ }
-+
-+ if (!real_open64) {
-+ abort();
-+ }
-+
-+ va_start(ap, flags);
-+ mode = va_arg(ap, mode_t);
-+ va_end(ap);
-+
-+ if (strcmp(path, "/dev/urandom") == 0) {
-+ return real_open64("/dev/zero", flags, mode);
-+ } else {
-+ return real_open64(path, flags, mode);
-+ }
-+}
diff --git a/compat_reports/1.3.0_to_1.3.1/compat_report.html b/compat_reports/1.3.0_to_1.3.1/compat_report.html
new file mode 100644
index 0000000..66da708
--- /dev/null
+++ b/compat_reports/1.3.0_to_1.3.1/compat_report.html
@@ -0,0 +1,530 @@
+<!-- kind:binary;verdict:compatible;affected:0;added:1;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;tool_version:2.2 -->
+<!-- kind:source;verdict:compatible;affected:0;added:1;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;tool_version:2.2 -->
+<!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.0 and 1.3.1 versions" />
+<title>libzip: 1.3.0 to 1.3.1 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,"[&minus;]");
+ }
+ 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.0</span> and <span style='color:Red;'>1.3.1</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.0</td></tr>
+<tr><th>Version #2</th><td>1.3.1</td></tr>
+<tr><th>Arch</th><td>x86_64</td></tr>
+<tr><th>GCC Version</th><td>6.4.1</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;'>3</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>118 / 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;'>1</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>
+</table>
+
+<a name='Binary_Added'></a><h2>Added Symbols <span class='new'>&nbsp;1&nbsp;</span></h2><hr/>
+<span class='h_name'>zip.h</span>, <span class='lib_name'>libzip.so.5.0.0</span><br/>
+<span class="iname">zip_libzip_version&#160;<span class='sym_p'>(&#160;)</span></span><br/>
+<br/>
+<a class='top_ref' href='#Top'>to the top</a><br/>
+<a name='Headers'></a><h2>Header Files <span class='gray'>&nbsp;3&nbsp;</span></h2><hr/>
+<div class='h_list'>
+zip.h<br/>
+zipconf-64.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'>&nbsp;1&nbsp;</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.0</td></tr>
+<tr><th>Version #2</th><td>1.3.1</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;'>3</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>278 / 85</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;'>1</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>
+</table>
+
+<a name='Source_Added'></a><h2>Added Symbols <span class='new'>&nbsp;1&nbsp;</span></h2><hr/>
+<span class='h_name'>zip.h</span><br/>
+<span class="iname">zip_libzip_version&#160;<span class='sym_p'>(&#160;)</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'>&nbsp;2&nbsp;</span></h2><hr/>
+<span class='h_name'>zipconf-64.h</span><br/>
+<span class="section" onclick="javascript:showContent(this, 'c_1')">
+<span class='ext'>[+]</span> LIBZIP_VERSION</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 value of constant <b>LIBZIP_VERSION</b> has been changed from <b>&quot;1.3.0&quot;</b> to <b>&quot;1.3.1&quot;</b>.</td>
+<td>Recompilation of a client program may be broken.</td>
+</tr>
+</table>
+<br/>
+</div>
+
+<span class="section" onclick="javascript:showContent(this, 'c_2')">
+<span class='ext'>[+]</span> LIBZIP_VERSION_MICRO</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 value of constant <b>LIBZIP_VERSION_MICRO</b> has been changed from <b>0</b> to <b>1</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='Headers'></a><h2>Header Files <span class='gray'>&nbsp;3&nbsp;</span></h2><hr/>
+<div class='h_list'>
+zip.h<br/>
+zipconf-64.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'>&nbsp;1&nbsp;</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.2 &#160;</i>
+</div>
+<br/>
+
+</body></html>
diff --git a/libzip.spec b/libzip.spec
index 61aec08..b262082 100644
--- a/libzip.spec
+++ b/libzip.spec
@@ -11,35 +11,25 @@
%global multilib_archs x86_64 %{ix86} ppc64 ppc s390x s390 sparc64 sparcv9
%global libname libzip
%global soname 5
-%if 0%{?rhel} == 5
-# Perl is too old
-%global with_tests 0
-%else
%if %{?runselftest}%{!?runselftest:1}
%global with_tests 0%{!?_without_tests:1}
%else
%global with_tests 0%{?_with_tests:1}
%endif
-%endif
%if 0%{?fedora} >= 26
Name: %{libname}
%else
Name: %{libname}%{soname}
%endif
-Version: 1.3.0
-Release: 2%{?dist}
+Version: 1.3.1
+Release: 1%{?dist}
Group: System Environment/Libraries
Summary: C library for reading, creating, and modifying zip archives
License: BSD
URL: http://www.nih.at/libzip/index.html
Source0: http://www.nih.at/libzip/libzip-%{version}.tar.xz
-# to handle multiarch headers, ex from mysql-devel package
-Source1: zipconf.h
-
-# Upstream for 32-bit test suite
-Patch0: 9879affbbdec684adb343b331f47f06788681e3b.patch
BuildRequires: zlib-devel
BuildRequires: bzip2-devel
@@ -119,7 +109,6 @@ The %{name}-tools package provides command line tools split off %{name}:
%prep
%setup -q -n %{libname}-%{version}
-%patch0 -p1
# Avoid lib64 rpaths (FIXME: recheck this on newer releases)
%if "%{_libdir}" != "/usr/lib"
@@ -141,17 +130,6 @@ make install DESTDIR=%{buildroot} INSTALL='install -p'
## unpackaged files
rm -fv %{buildroot}%{_libdir}/lib*.la
-## FIXME: someday fix consumers of libzip to properly handle
-## header @ %%{_libdir}/libzip/include/zipconf.h -- rex
-%ifarch %{multilib_archs}
-ln -s ../%{_lib}/libzip/include/zipconf.h \
- %{buildroot}%{_includedir}/zipconf-%{__isa_bits}.h
-install -D -m644 -p %{SOURCE1} %{buildroot}%{_includedir}/zipconf.h
-%else
-ln -s ../%{_lib}/libzip/include/zipconf.h \
- %{buildroot}%{_includedir}/zipconf.h
-%endif
-
%check
%if %{with_tests}
@@ -181,8 +159,6 @@ make check
%doc API-CHANGES AUTHORS THANKS *.md
%{_includedir}/zip.h
%{_includedir}/zipconf*.h
-%dir %{_libdir}/libzip
-%{_libdir}/libzip/include
%{_libdir}/libzip.so
%{_libdir}/pkgconfig/libzip.pc
%{_mandir}/man3/libzip*
@@ -191,6 +167,10 @@ make check
%changelog
+* Mon Nov 20 2017 Remi Collet <remi@fedoraproject.org> - 1.3.1-1
+- update to 1.3.1
+- drop multilib header hack
+
* Fri Oct 6 2017 Remi Collet <remi@fedoraproject.org> - 1.3.0-2
- test build
diff --git a/libzip.xml b/libzip.xml
new file mode 100644
index 0000000..15cfaec
--- /dev/null
+++ b/libzip.xml
@@ -0,0 +1,63 @@
+<?xml version="1.0" encoding="utf-8"?>
+<descriptor>
+
+<!-- Template for the Library Descriptor -->
+
+<!--
+ Necessary Sections
+ -->
+
+<version>
+ <!-- Version of the library -->
+1.3.1
+</version>
+
+<headers>
+ <!-- The list of paths to header files and/or
+ directories with header files, one per line -->
+/usr/include/zip.h
+/usr/include/zipconf.h
+</headers>
+
+<libs>
+ <!-- The list of paths to shared objects and/or
+ directories with shared objects, one per line -->
+/usr/lib64/libzip.so
+</libs>
+
+<!--
+ Additional Sections
+ -->
+
+<include_paths>
+ <!-- The list of paths to be searched for header files
+ needed for compiling of library headers, one per line -->
+</include_paths>
+
+<gcc_options>
+ <!-- Additional gcc options, one per line -->
+</gcc_options>
+
+<include_preamble>
+ <!-- The list of header files that should be included before other headers, one per line.
+ For example, it is a tree.h for libxml2 and ft2build.h for freetype2 -->
+</include_preamble>
+
+<opaque_types>
+ <!-- The list of opaque types, one per line -->
+</opaque_types>
+
+<skip_interfaces>
+ <!-- The list of functions (mangled/symbol names in C++)
+ that should be skipped while testing, one per line -->
+</skip_interfaces>
+
+<skip_constants>
+ <!-- The list of constants that should not be checked, one name per line -->
+</skip_constants>
+
+<skip_headers>
+ <!-- The list of headers that should not be processed, one name per line -->
+</skip_headers>
+
+</descriptor>
diff --git a/zipconf.h b/zipconf.h
deleted file mode 100644
index 4de5c8d..0000000
--- a/zipconf.h
+++ /dev/null
@@ -1,23 +0,0 @@
-/*
- * Kluge to support multilib installation of both 32 and 64-bit RPMS:
- * we need to arrange that header files that appear in both RPMs are
- * identical. Hence, this file is architecture-independent and calls
- * in an arch-dependent file that will appear in just one RPM.
- *
- * To avoid breaking arches not explicitly supported by Fedora, we
- * use this indirection file *only* on known multilib arches.
- * DO NOT INCLUDE THE NEW FILE DIRECTLY -- ALWAYS INCLUDE THIS ONE INSTEAD. */
-
-#ifndef ZIPCONF_MULTILIB_H
-#define ZIPCONF_MULTILIB_H
-
-#include <bits/wordsize.h>
-#if __WORDSIZE == 32
-#include "zipconf-32.h"
-#elif __WORDSIZE == 64
-#include "zipconf-64.h"
-#else
-#error "unexpected value for __WORDSIZE macro"
-#endif
-
-#endif
generated by cgit (git 2.34.1) at 2024-11-25 06:08:08 +0000