From eb3b40e218d202a3300e07a87bdbcbbbfe4757e011fef10a856a59c9ed22f288 Mon Sep 17 00:00:00 2001 From: Frank Schreiner Date: Mon, 25 Feb 2019 12:56:04 +0000 Subject: [PATCH] disabled libdrpm for (open)SUSE OBS-URL: https://build.opensuse.org/package/show/system:packagemanager/createrepo_c?expand=0&rev=28 --- createrepo_c.spec | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/createrepo_c.spec b/createrepo_c.spec index 86371b1..bd9e272 100644 --- a/createrepo_c.spec +++ b/createrepo_c.spec @@ -1,7 +1,7 @@ # # spec file for package createrepo_c # -# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany. # Copyright (c) 2019 Neal Gompa . # # All modifications and additions to the file contributed by third parties @@ -13,7 +13,7 @@ # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. -# Please submit bugfixes or comments via http://bugs.opensuse.org/ +# Please submit bugfixes or comments via https://bugs.opensuse.org/ # @@ -26,8 +26,13 @@ %bcond_with python3 %endif +%if ( 0%{?sle_version} || 0%{?suse_version} ) +# Disabled DeltaRPM support for SUSE +%bcond_with drpm +%else # Enable enhanced DeltaRPM support %bcond_without drpm +%endif %if (0%{?is_opensuse} && 0%{?sle_version} >= 150100) || 0%{?suse_version} >= 1550 %bcond_without zchunk @@ -75,8 +80,8 @@ BuildRequires: rpm-devel >= 4.9.0 BuildRequires: sqlite3-devel BuildRequires: zlib-devel %if %{with zchunk} -BuildRequires: zchunk-devel >= 0.9.11 BuildRequires: zchunk +BuildRequires: zchunk-devel >= 0.9.11 %endif Requires: %{libname}%{?_isa} = %{version}-%{release} %if %{with tests} @@ -107,9 +112,9 @@ rpm packages and maintaining it. %package -n %{libname} Summary: Library for repodata manipulation -Group: System/Libraries # The function to create DeltaRPMs calls /usr/bin/makedeltarpm, # which is part of the 'deltarpm' package +Group: System/Libraries Requires: deltarpm %description -n %{libname} @@ -154,7 +159,6 @@ sed -i -e '/HTML_TIMESTAMP/d' doc/Doxyfile.in.in %make_build %make_build doc-c - %if %{with tests} %check %define __builddir build @@ -165,7 +169,6 @@ sed -i -e '/HTML_TIMESTAMP/d' doc/Doxyfile.in.in %define __builddir build %cmake_install - mkdir -p %{buildroot}%{_sysconfdir}/alternatives for i in createrepo mergerepo modifyrepo sqliterepo;do ln -s %{_bindir}/$i\_c %{buildroot}%{_sysconfdir}/alternatives/$i