diff options
Diffstat (limited to 'libzip.spec')
| -rw-r--r-- | libzip.spec | 32 |
1 files changed, 6 insertions, 26 deletions
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 |