diff options
| author | Remi Collet <remi@remirepo.net> | 2018-01-05 12:32:33 +0100 |
|---|---|---|
| committer | Remi Collet <remi@remirepo.net> | 2018-01-05 12:32:33 +0100 |
| commit | a86d6f741590ba182cbb48d6f11368b458c971ed (patch) | |
| tree | d01110ea1afedeab2e2350d652e32cd59a604c6b | |
| parent | fb5195e03b35d142ccd5551eee65fb97004d3900 (diff) | |
add upstream patch and drop multilib hack
| -rw-r--r-- | libzip.spec | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/libzip.spec b/libzip.spec index 4b57ad9..b8fda75 100644 --- a/libzip.spec +++ b/libzip.spec @@ -18,7 +18,7 @@ Name: %{libname} Name: %{libname}%{soname} %endif Version: 1.4.0 -Release: 2%{?dist} +Release: 3%{?dist} Group: System Environment/Libraries Summary: C library for reading, creating, and modifying zip archives @@ -30,6 +30,8 @@ Source0: https://libzip.org/download/libzip-%{version}.tar.xz Patch0: libzip-rpath.patch # allow path customization (lib64) Patch1: libzip-upstream.patch +# fix multi-lib issue +Patch2: libzip-multilib.patch BuildRequires: zlib-devel BuildRequires: bzip2-devel @@ -52,7 +54,6 @@ BuildRequires: perl(Symbol) BuildRequires: perl(UNIVERSAL) BuildRequires: perl(strict) BuildRequires: perl(warnings) -BuildRequires: multilib-rpm-config %if "%{name}" == "%{libname}" Obsoletes: %{libname}%{soname} <= %{version} %if 0%{?rhel} @@ -117,6 +118,7 @@ The %{name}-tools package provides command line tools split off %{name}: %setup -q -n %{libname}-%{version} %patch1 -p1 -b .upstream %patch0 -p1 -b .rpm +%patch2 -p1 -b .multilib # unwanted in package documentation rm INSTALL.md @@ -137,8 +139,6 @@ make %{?_smp_mflags} %install make install DESTDIR=%{buildroot} INSTALL='install -p' -%multilib_fix_c_header --file %{_includedir}/zipconf.h - %check %if %{with_tests} @@ -176,6 +176,9 @@ make check %changelog +* Fri Jan 5 2018 Remi Collet <remi@remirepo.net> - 1.4.0-3 +- add upstream patch and drop multilib hack + * Tue Jan 2 2018 Remi Collet <remi@remirepo.net> - 1.4.0-2 - re-add multilib hack #1529886 |