From 1915ac5bd588353b04cb9cdc4da8a93d076d0b38 Mon Sep 17 00:00:00 2001 From: mgb01105731 Date: Tue, 25 Oct 2022 11:01:46 +0800 Subject: [PATCH] optimise spec file & add doc package --- libdnf.spec | 35 ++++++++++++++++++++++++++--------- 1 file changed, 26 insertions(+), 9 deletions(-) diff --git a/libdnf.spec b/libdnf.spec index f145c4f..a5552be 100644 --- a/libdnf.spec +++ b/libdnf.spec @@ -1,4 +1,4 @@ -%define anolis_release 1 +%define anolis_release 2 %define libsolv_version 0.7.20 %define libmodulemd_version 2.13.0 @@ -32,17 +32,25 @@ BuildRequires: pkgconfig(smartcols) BuildRequires: gettext BuildRequires: gpgme-devel -Requires: libmodulemd%{?_isa} >= %{libmodulemd_version} -Requires: libsolv%{?_isa} >= %{libsolv_version} -Requires: librepo%{?_isa} >= %{librepo_version} +Requires: libmodulemd >= %{libmodulemd_version} +Requires: libsolv >= %{libsolv_version} +Requires: librepo >= %{librepo_version} %description A Library providing simplified C and Python API to libsolv. +%package doc +Summary: Documentation files for %{name} +Requires: %{name} = %{version}-%{release} +BuildArch: noarch + +%description doc +The %{name}-doc package contains documentation files for %{name}. + %package devel Summary: Development files for %{name} -Requires: %{name}%{?_isa} = %{version}-%{release} -Requires: libsolv-devel%{?_isa} >= %{libsolv_version} +Requires: %{name} = %{version}-%{release} +Requires: libsolv-devel >= %{libsolv_version} %description devel Development files for %{name}. @@ -50,7 +58,7 @@ Development files for %{name}. %package -n python3-%{name} %{?python_provide:%python_provide python3-%{name}} Summary: Python 3 bindings for the libdnf library. -Requires: %{name}%{?_isa} = %{version}-%{release} +Requires: %{name} = %{version}-%{release} BuildRequires: python3-devel BuildRequires: python3-sphinx BuildRequires: swig @@ -62,7 +70,7 @@ python 3 bindings for the libdnf library. Summary: Python 3 bindings for the hawkey library %{?python_provide:%python_provide python3-hawkey} BuildRequires: python3-devel -Requires: %{name}%{?_isa} = %{version}-%{release} +Requires: %{name} = %{version}-%{release} Requires: python3-%{name} = %{version}-%{release} %description -n python3-hawkey @@ -90,16 +98,21 @@ pushd build-py3 %cmake_install popd +%generate_compatibility_deps + %find_lang %{name} %files -f %{name}.lang +%dir %{abidir} %license COPYING -%doc README.md AUTHORS %{_libdir}/%{name}.so.* +%{abidir}/%{name}.dump %dir %{_libdir}/libdnf/ %dir %{_libdir}/libdnf/plugins/ %{_libdir}/libdnf/plugins/README +%files doc +%doc README.md AUTHORS %files devel %doc %{_datadir}/gtk-doc/html/%{name}/ @@ -108,11 +121,15 @@ popd %{_includedir}/%{name}/ %files -n python3-%{name} +%{abidir}/_*.dump %{python3_sitearch}/%{name}/ %files -n python3-hawkey %{python3_sitearch}/hawkey/ %changelog +* Tue Oct 25 2022 mgb01105731 - 0.65.0-2 +- optimise spec file & add doc package + * Fri Mar 04 2022 Su Lifan - 0.65.0-1 - Initial packaging for Anolis OS 23 -- Gitee