[libzip] Warning about conflicting contexts for /usr/lib64/libzip/include/zipconf.h versus /usr/include/zipco

[Rex Dieter]

commit 6a26985ce9e817c92fd8a6afd44312090ee1dc9c
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Wed Sep 5 12:24:40 2012 -0500

    Warning about conflicting contexts for /usr/lib64/libzip/include/zipconf.h versus /usr/include/zipconf-64.h (#853954)

 libzip.spec |   13 ++++++++-----
 1 files changed, 8 insertions(+), 5 deletions(-)
---
diff --git a/libzip.spec b/libzip.spec
index 748360b..ed1f811 100644
--- a/libzip.spec
+++ b/libzip.spec
@@ -3,7 +3,7 @@
 
 Name:    libzip
 Version: 0.10.1
-Release: 3%{?dist}
+Release: 4%{?dist}
 Summary: C library for reading, creating, and modifying zip archives
 
 License: BSD
@@ -63,12 +63,12 @@ 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}
-cp -alf %{buildroot}%{_libdir}/libzip/include/zipconf.h \
-        %{buildroot}%{_includedir}/zipconf-%{__isa_bits}.h
+ln -s ../%{_lib}/libzip/include/zipconf.h \
+      %{buildroot}%{_includedir}/zipconf-%{__isa_bits}.h
 install -D -m644 -p %{SOURCE1} %{buildroot}%{_includedir}/zipconf.h
 %else
-cp -alf %{buildroot}%{_libdir}/libzip/include/zipconf.h \
-        %{buildroot}%{_includedir}/zipconf.h
+ln -s ../%{_lib}/libzip/include/zipconf.h/libzip/include/zipconf.h \
+      %{buildroot}%{_includedir}/zipconf.h
 %endif
 
 
@@ -94,6 +94,9 @@ cp -alf %{buildroot}%{_libdir}/libzip/include/zipconf.h \
 
 
 %changelog
+* Wed Sep 05 2012 Rex Dieter <rdieter at fedoraproject.org> 0.10.1-4
+- Warning about conflicting contexts for /usr/lib64/libzip/include/zipconf.h versus /usr/include/zipconf-64.h (#853954)
+
 * Thu Jul 19 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.10.1-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild