From 59e69024cb5b5c7fdb9df0c632ef310a11ad6cfd Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Thu, 5 Nov 2020 16:27:42 +0100 Subject: adapt for SCL build --- libzip.spec | 20 ++++++++++++++++++-- 1 file changed, 18 insertions(+), 2 deletions(-) diff --git a/libzip.spec b/libzip.spec index a7d308f..f3629c3 100644 --- a/libzip.spec +++ b/libzip.spec @@ -17,13 +17,15 @@ %global with_xz 1 %endif +%{?scl: %scl_package libzip} + %if 0%{?fedora} >= 26 || 0%{?rhel} >= 8 -Name: %{libname} +Name: %{?scl_prefix}%{libname} %else Name: %{libname}%{soname} %endif Version: 1.7.3 -Release: 1%{?dist} +Release: 2%{?dist} Summary: C library for reading, creating, and modifying zip archives License: BSD @@ -56,6 +58,7 @@ BuildRequires: perl(Symbol) BuildRequires: perl(UNIVERSAL) BuildRequires: perl(strict) BuildRequires: perl(warnings) +%if 0%{?!scl:1} %if "%{name}" == "%{libname}" Obsoletes: %{libname}%{soname} <= %{version} %if 0%{?rhel} @@ -63,7 +66,13 @@ Obsoletes: %{libname}%{soname} <= %{version} Provides: %{libname} = %{version}-%{release} %endif %endif +%endif +%if 0%{?rhel} >= 8 && 0%{?scl:1} +%{?_sclreq:Requires: %{?scl_prefix}runtime%{?_sclreq}%{?_isa}} +%global __provides_exclude ^(libzip\\.so|cmake|pkgconfig).*$ +%global __requires_exclude ^libzip\\.so.*$ +%endif %description libzip is a C library for reading, creating, and modifying zip archives. Files @@ -78,6 +87,7 @@ The API is documented by man pages. %package devel Summary: Development files for %{name} Requires: %{name}%{?_isa} = %{version}-%{release} +%if 0%{?!scl:1} %if "%{name}" != "%{libname}" Conflicts: %{libname}-last-devel < %{version} Conflicts: %{libname}-devel < %{version} @@ -86,6 +96,7 @@ Provides: %{libname}-devel = %{version}-%{release} Obsoletes: %{libname}-last-devel <= %{version} Obsoletes: %{libname}%{soname}-devel <= %{version} %endif +%endif %description devel The %{name}-devel package contains libraries and header files for @@ -95,6 +106,7 @@ developing applications that use %{name}. %package tools Summary: Command line tools from %{name} Requires: %{name}%{?_isa} = %{version}-%{release} +%if 0%{?!scl:1} %if "%{name}" != "%{libname}" Conflicts: %{libname}-last-tools < %{version} # Fedora 23 have sub package @@ -106,6 +118,7 @@ Conflicts: %{libname} < 1.1 Obsoletes: %{libname}-last-tools <= %{version} Obsoletes: %{libname}%{soname}-tools <= %{version} %endif +%endif %description tools The %{name}-tools package provides command line tools split off %{name}: @@ -200,6 +213,9 @@ make check %changelog +* Thu Nov 5 2020 Remi Collet - 1.7.3-2 +- adapt for SCL build + * Wed Jul 15 2020 Remi Collet - 1.7.3-1 - update to 1.7.3 - drop patch merged upstream -- cgit