From 8cf67250382a75229861c3f4f3c440b8bbcf8821 Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Wed, 23 Jun 2021 10:25:45 -0500 Subject: [PATCH] drop ldconfig scriptlets (https://fedoraproject.org/wiki/Changes/Removing_ldconfig_scriptlets) drop explicit BR: make (already pulled in via cmake) %build: one cmake option per line %check: drop 'make test', does nothing -devel: drop explicit cmake dep (autodeps should add cmake-filesystem already) --- minizip.spec | 31 ++++++++++++++++++------------- 1 file changed, 18 insertions(+), 13 deletions(-) diff --git a/minizip.spec b/minizip.spec index 678a874..361714c 100644 --- a/minizip.spec +++ b/minizip.spec @@ -1,14 +1,14 @@ Name: minizip Version: 3.0.2 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Minizip contrib in zlib with the latest bug fixes and advanced features License: zlib URL: https://github.com/nmoinvaz/%{name} Source0: https://github.com/nmoinvaz/%{name}/archive/%{version}/%{name}-%{version}.tar.gz -BuildRequires: make -BuildRequires: cmake gcc-c++ +BuildRequires: cmake +BuildRequires: gcc-c++ BuildRequires: libbsd-devel BuildRequires: zlib-devel BuildRequires: bzip2-devel @@ -28,8 +28,7 @@ It also has the latest bug fixes that having been found all over the internet. %package devel Summary: Development files for %{name} Requires: %{name}%{?_isa} = %{version}-%{release} -Requires: cmake zlib-devel - +Requires: zlib-devel %description devel Development files for %{name} library. @@ -40,7 +39,12 @@ Development files for %{name} library. %build -%cmake . -DMZ_BUILD_TEST=ON -DSKIP_INSTALL_BINARIES=ON -DINSTALL_INC_DIR=%{_includedir}/%{name} -DZSTD_FORCE_FETCH=OFF +%cmake \ + -DMZ_BUILD_TEST:BOOL=ON \ + -DSKIP_INSTALL_BINARIES:BOOL=ON \ + -DINSTALL_INC_DIR=%{_includedir}/%{name} \ + -DZSTD_FORCE_FETCH=OFF + %cmake_build @@ -48,13 +52,6 @@ Development files for %{name} library. %cmake_install -%check -make test - -%post -p /sbin/ldconfig -%postun -p /sbin/ldconfig - - %files %license LICENSE %doc README.md @@ -70,7 +67,15 @@ make test %{_includedir}/%{name}/unzip.h %{_includedir}/%{name}/zip.h + %changelog +* Wed Jun 23 2021 Rex Dieter - 3.0.2-2 +- drop ldconfig scriptlets (https://fedoraproject.org/wiki/Changes/Removing_ldconfig_scriptlets) +- drop explicit BR: make (already pulled in via cmake) +- %%build: one cmake option per line +- %%check: drop 'make test', does nothing +- -devel: drop explicit cmake dep (autodeps should add cmake-filesystem already) + * Wed Jun 09 2021 Patrik Novotný - 3.0.2-1 - Rebase to upstream release 3.0.2