summaryrefslogtreecommitdiffstats
path: root/libzip.spec
diff options
context:
space:
mode:
authorRemi Collet <fedora@famillecollet.com>2012-02-04 09:13:59 +0100
committerRemi Collet <fedora@famillecollet.com>2012-02-04 09:13:59 +0100
commit382118baf6b037764e0bc4fdb17ee6089c93f4af (patch)
tree39c7eba72216d98e00825b0dca523f570e978769 /libzip.spec
parent77746f2ac32095e84cd3bcb95c282cbb5d7aed53 (diff)
libzip: improves multiarch headers (ex from MySQL)
Diffstat (limited to 'libzip.spec')
-rw-r--r--libzip.spec14
1 files changed, 11 insertions, 3 deletions
diff --git a/libzip.spec b/libzip.spec
index 01873f5..4cbe3c5 100644
--- a/libzip.spec
+++ b/libzip.spec
@@ -1,12 +1,14 @@
Name: libzip2
Version: 0.10
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: C library for reading, creating, and modifying zip archives
Group: Applications/File
License: BSD
URL: http://www.nih.at/libzip/index.html
Source0: http://www.nih.at/libzip/libzip-%{version}.tar.bz2
+# to handle multiarch heder, ex from mysql-devel package
+Source1: zipconf.h
Patch0: libzip-0.10-php.patch
@@ -62,6 +64,10 @@ rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT INSTALL='install -p'
find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} ';'
+# Handle multiarch headers
+mv $RPM_BUILD_ROOT%{_libdir}/libzip/include/zipconf.h \
+ $RPM_BUILD_ROOT%{_includedir}/zipconf_$(uname -i).h
+install -pm 644 %{SOURCE1} $RPM_BUILD_ROOT%{_includedir}/zipconf.h
%clean
rm -rf $RPM_BUILD_ROOT
@@ -86,14 +92,16 @@ rm -rf $RPM_BUILD_ROOT
%files devel
%defattr(-,root,root,-)
-%{_includedir}/zip.h
+%{_includedir}/zip*.h
%{_libdir}/libzip.so
-%{_libdir}/libzip/include/zipconf.h
%{_libdir}/pkgconfig/libzip.pc
%{_mandir}/man3/*zip*
%changelog
+* Sat Feb 04 2012 Remi Collet <Fedora@FamilleCollet.com> 0.10-2
+- improves multiarch headers (ex from MySQL)
+
* Sun Mar 20 2011 Remi Collet <Fedora@FamilleCollet.com> 0.10-1
- update to 0.10
- rename to libzip2 and split libs in sub package