From 795f64919be70ddf29eff7ec39ff70315dee2aa2 Mon Sep 17 00:00:00 2001 From: lirui <1692257904@qq.com> Date: Fri, 23 Apr 2021 15:57:41 +0800 Subject: [PATCH] merge the drpmsync subpackage into the deltarpm package --- deltarpm.spec | 22 +++++++++------------- 1 file changed, 9 insertions(+), 13 deletions(-) diff --git a/deltarpm.spec b/deltarpm.spec index ddf0e65..381f233 100644 --- a/deltarpm.spec +++ b/deltarpm.spec @@ -1,7 +1,7 @@ %bcond_without python3 Name: deltarpm Version: 3.6.2 -Release: 5 +Release: 6 Summary: deltarpm contains the difference between an old and a new version of an RPM package. License: BSD URL: https://github.com/rpm-software-management/deltarpm @@ -10,6 +10,8 @@ Source0: https://github.com/rpm-software-management/deltarpm/archive/3.6. BuildRequires: gcc bzip2-devel perl-generators xz-devel rpm-devel popt-devel zlib-devel BuildRequires: %{_vendor}-rpm-config BuildRequires: python3-devel gdb +Provides: drpmsync = %{version}-%{release} +Obsoletes: drpmsync < %{version}-%{release} %description Delta RPM packages contain the difference between an old and a new @@ -32,14 +34,6 @@ Requires: %{name} = %{version}-%{release} %description -n python3-%{name} Python3 bindings for deltarpm. -%package -n drpmsync -Summary: Sync a file tree with deltarpms -Requires: %{name}%{_isa} = %{version}-%{release} - -%description -n drpmsync -This package contains a tool to sync a file tree with -deltarpms. - %prep %autosetup -p1 @@ -59,7 +53,6 @@ deltarpms. %defattr(-,root,root) %license LICENSE.BSD %{_bindir}/* -%exclude %{_bindir}/drpmsync %files help %defattr(-,root,root) @@ -72,10 +65,13 @@ deltarpms. %{python3_sitearch}/__pycache__/%{name}*.pyc %{python3_sitearch}/_%{name}module.so -%files -n drpmsync -%{_bindir}/drpmsync - %changelog +* Fri Apr 23 2021 Liquor - 3.6.2-6 +- Type:enhancement +- ID: NA +- SUG: NA +- DESC:merge the drpmsync subpackage into the deltarpm package + * Wed Dec 9 2020 wangchen2020 - 3.6.2-5 - Type:bugfix - ID: NA -- Gitee