From 4a515dd0a9d67178360cc703aed05db4dce9fe0e Mon Sep 17 00:00:00 2001 From: Leigh Scott Date: Sat, 5 Feb 2022 23:49:35 +0000 Subject: [PATCH] Fix pkgconfig files --- remove_ldflags_pkconfig_files.patch | 11 +++++++++++ zziplib.spec | 14 ++++++++------ 2 files changed, 19 insertions(+), 6 deletions(-) create mode 100644 remove_ldflags_pkconfig_files.patch diff --git a/remove_ldflags_pkconfig_files.patch b/remove_ldflags_pkconfig_files.patch new file mode 100644 index 0000000..65af4e5 --- /dev/null +++ b/remove_ldflags_pkconfig_files.patch @@ -0,0 +1,11 @@ +--- a/configure ++++ b/configure +@@ -19143,7 +19143,7 @@ Name: @PACKAGE_NAME@ + Description: @PACKAGE_DESCRIPTION@ + Version: @PACKAGE_VERSION@ + Requires: @PACKAGE_REQUIRES@ +-Libs: -L\${libdir} @LDFLAGS@ @LIBS@ ++Libs: -L\${libdir} @LIBS@ + Cflags: -I\${includedir} @CPPFLAGS@ + AXEOF + fi # DONE generate $pkgconfig_generate.in diff --git a/zziplib.spec b/zziplib.spec index 0a16d4e..0742089 100644 --- a/zziplib.spec +++ b/zziplib.spec @@ -1,17 +1,17 @@ Summary: Lightweight library to easily extract data from zip files Name: zziplib Version: 0.13.71 -Release: 6%{?dist} +Release: 7%{?dist} License: LGPLv2+ or MPLv1.1 URL: http://zziplib.sourceforge.net/ Source: https://github.com/gdraheim/zziplib/archive/v%{version}.tar.gz - +Patch1: remove_ldflags_pkconfig_files.patch Patch100: multilib-32.patch Patch101: multilib-64.patch BuildRequires: make -BuildRequires: gcc +BuildRequires: gcc BuildRequires: perl-interpreter BuildRequires: python3 BuildRequires: python3-rpm-macros @@ -62,7 +62,7 @@ zziplib library. %prep %setup -q - +%patch1 -p1 %build export CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing" @@ -80,8 +80,7 @@ sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool pushd %{_builddir}/zziplib-%{version} %ifarch i686 armv7hl patch -p2 < %{PATCH100} -%endif -%ifnarch i686 armv7hl +%else patch -p2 < %{PATCH101} %endif popd @@ -112,6 +111,9 @@ popd %{_mandir}/man3/* %changelog +* Sat Feb 05 2022 Leigh Scott - 0.13.71-7 +- Fix pkgconfig files + * Sat Jan 22 2022 Fedora Release Engineering - 0.13.71-6 - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild