From 83cbad7655f9322d6801b76c3a37f9b120b55993071cab5a177d4e2a04a92a08 Mon Sep 17 00:00:00 2001 From: Neal Gompa Date: Fri, 26 Feb 2021 12:40:22 +0000 Subject: [PATCH] Accepting request 875375 from home:M0ses:tmp - removed %is_opensuse (CtLG) - disabled drpm for SLE/Leap 15.3 OBS-URL: https://build.opensuse.org/request/show/875375 OBS-URL: https://build.opensuse.org/package/show/system:packagemanager/createrepo_c?expand=0&rev=56 --- createrepo_c.changes | 6 ++++++ createrepo_c.spec | 13 +++++++------ 2 files changed, 13 insertions(+), 6 deletions(-) diff --git a/createrepo_c.changes b/createrepo_c.changes index 41e394a..639b326 100644 --- a/createrepo_c.changes +++ b/createrepo_c.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Fri Feb 26 07:16:58 UTC 2021 - Frank Schreiner + +- removed %is_opensuse (CtLG) +- disabled drpm for SLE/Leap 15.3 + ------------------------------------------------------------------- Tue Jul 7 01:12:50 UTC 2020 - Neal Gompa diff --git a/createrepo_c.spec b/createrepo_c.spec index 3be170c..74ca62d 100644 --- a/createrepo_c.spec +++ b/createrepo_c.spec @@ -1,7 +1,7 @@ # # spec file for package createrepo_c # -# Copyright (c) 2019 SUSE LLC +# Copyright (c) 2021 SUSE LLC # Copyright (c) 2020 Neal Gompa . # # All modifications and additions to the file contributed by third parties @@ -17,7 +17,7 @@ # -%if 0%{?is_opensuse} || 0%{?suse_version} >= 1330 +%if 0%{?suse_version} >= 1330 # Enable Python bindings on openSUSE %bcond_without python3 %bcond_without tests @@ -26,14 +26,14 @@ %bcond_with tests %endif -%if (0%{?is_opensuse} && 0%{?sle_version} >= 150200) || 0%{?suse_version} >= 1550 +%if 0%{?sle_version} >= 160000 || 0%{?suse_version} >= 1550 # Enable enhanced DeltaRPM support %bcond_without drpm %else %bcond_with drpm %endif -%if (0%{?is_opensuse} && 0%{?sle_version} >= 150100) || 0%{?suse_version} >= 1550 +%if 0%{?sle_version} >= 150100 || 0%{?suse_version} >= 1550 %bcond_without zchunk %bcond_without libmodulemd %else @@ -65,7 +65,7 @@ Source0: %{url}/archive/%{version}/%{name}-%{version}.tar.gz %if %{with python3} BuildRequires: python3-devel %endif -%if 0%{?is_opensuse} || 0%{?suse_version} >= 1330 +%if 0%{?suse_version} >= 1330 BuildRequires: python-rpm-macros %endif BuildRequires: bash-completion @@ -110,7 +110,7 @@ Obsoletes: createrepo < 0.11.0 Provides: createrepo = %{version}-%{release} %else Requires(post): update-alternatives -Requires(postun): update-alternatives +Requires(postun):update-alternatives %endif Provides: createrepo-implementation @@ -205,6 +205,7 @@ if [ -e %{_sysconfdir}/alternatives/createrepo ]; then update-alternatives --remove createrepo %{_bindir}/createrepo_c fi %else + %post update-alternatives --install \ %{_bindir}/createrepo createrepo %{_bindir}/createrepo_c 20 \