From 00f961fde925f099e539da5ce76213eaa343cba8 Mon Sep 17 00:00:00 2001 From: CentOS Sources Date: Jan 24 2020 20:14:47 +0000 Subject: import drpm-0.4.1-1.el8 --- diff --git a/.drpm.metadata b/.drpm.metadata index 6c4b695..d44babd 100644 --- a/.drpm.metadata +++ b/.drpm.metadata @@ -1 +1 @@ -5bba9e784193ba61ca76dc008c8e115628ca7f5b SOURCES/drpm-0.3.0.tar.bz2 +b94bdaf921cbdb1dfe06c3184eddb15e84205b55 SOURCES/drpm-0.4.1.tar.bz2 diff --git a/.gitignore b/.gitignore index cfacbd6..e2de5d8 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -SOURCES/drpm-0.3.0.tar.bz2 +SOURCES/drpm-0.4.1.tar.bz2 diff --git a/SPECS/drpm.spec b/SPECS/drpm.spec index 8fbda8b..128b8a5 100644 --- a/SPECS/drpm.spec +++ b/SPECS/drpm.spec @@ -1,18 +1,24 @@ +# Do not build with zstd for RHEL +%if 0%{?rhel} || (0%{?suse_version} && 0%{?suse_version} < 1500) +%bcond_with zstd +%else +%bcond_without zstd +%endif + Name: drpm -Version: 0.3.0 -Release: 14%{?dist} +Version: 0.4.1 +Release: 1%{?dist} Summary: A library for making, reading and applying deltarpm packages - -# the entire source code is LGPLv3+, except src/drpm_diff.c and src/drpm_search.c which are BSD -License: LGPLv3+ and BSD -URL: https://fedorahosted.org/%{name} -Source: https://fedorahosted.org/released/%{name}/%{name}-%{version}.tar.bz2 +# the entire source code is LGPLv2+, except src/drpm_diff.c and src/drpm_search.c which are BSD +License: LGPLv2+ and BSD +URL: https://github.com/rpm-software-management/%{name} +Source: %{url}/releases/download/%{version}/%{name}-%{version}.tar.bz2 # add workaround for gcc7 on ppc64le temporary before it's fixed in gcc # https://bugzilla.redhat.com/show_bug.cgi?id=1420350 Patch1: drpm-0.3.0-workaround-ppc64le-gcc.patch -BuildRequires: cmake >= 2.8 +BuildRequires: cmake >= 2.8.5 BuildRequires: gcc BuildRequires: rpm-devel @@ -20,6 +26,9 @@ BuildRequires: openssl-devel BuildRequires: zlib-devel BuildRequires: bzip2-devel BuildRequires: xz-devel +%if %{with zstd} +BuildRequires: pkgconfig(libzstd) +%endif BuildRequires: pkgconfig BuildRequires: doxygen @@ -46,7 +55,7 @@ mkdir build %build pushd build -%cmake .. +%cmake .. -DWITH_ZSTD:BOOL=%{?with_zstd:ON}%{!?with_zstd:OFF} -DHAVE_LZLIB_DEVEL:BOOL=%{?suse_version:ON}%{!?suse_version:OFF} %make_build make doc popd @@ -61,10 +70,12 @@ pushd build ctest -VV popd +%if (0%{?rhel} && 0%{?rhel} < 8) || 0%{?suse_version} %ldconfig_scriptlets +%endif %files -%license COPYING COPYING.LESSER LICENSE.BSD +%license COPYING LICENSE.BSD %{_libdir}/libdrpm.so.* %files devel @@ -74,6 +85,15 @@ popd %{_libdir}/pkgconfig/drpm.pc %changelog +* Wed Oct 23 2019 Ales Matej 0.4.1-1 +- Update to 0.4.1 +- Relicense to LGPLv2+ +- Fix number of bugs mainly with drpm_make and drpm_apply +- Add support for zstd drpms +- CMake cleanups +- Make running tests optional +- Small spec improvements + * Fri Aug 3 2018 Florian Weimer - 0.3.0-14 - Honor %%{valgrind_arches}