From 57d08b29f1118ad69bdda02b4491b37577b2fab5 Mon Sep 17 00:00:00 2001 From: happy_orange Date: Tue, 18 Oct 2022 03:34:27 -0400 Subject: [PATCH] add doc package and abi api --- flatpak.spec | 47 ++++++++++++++++++++++++++++++++++------------- 1 file changed, 34 insertions(+), 13 deletions(-) diff --git a/flatpak.spec b/flatpak.spec index 3b289ad..e8eec84 100644 --- a/flatpak.spec +++ b/flatpak.spec @@ -1,9 +1,10 @@ +%define anolis_release 3 %global bubblewrap_version 0.4.0 %global ostree_version 2020.8 Name: flatpak Version: 1.13.2 -Release: 2%{?dist} +Release: %{anolis_release}%{?dist} Summary: Application deployment framework for desktop apps License: LGPLv2+ @@ -45,11 +46,11 @@ BuildRequires: /usr/bin/xmlto BuildRequires: /usr/bin/xsltproc Requires: bubblewrap >= %{bubblewrap_version} -Requires: librsvg2%{?_isa} -Requires: ostree-libs%{?_isa} >= %{ostree_version} +Requires: librsvg2 +Requires: ostree-libs >= %{ostree_version} Requires: /usr/bin/xdg-dbus-proxy Requires: (flatpak-selinux = %{?epoch:%{epoch}:}%{version}-%{release} if selinux-policy-targeted) -Requires: %{name}-session-helper%{?_isa} = %{?epoch:%{epoch}:}%{version}-%{release} +Requires: %{name}-session-helper = %{?epoch:%{epoch}:}%{version}-%{release} Recommends: p11-kit-server Recommends: xdg-desktop-portal > 0.10 @@ -62,8 +63,8 @@ more information. %package devel Summary: Development files for %{name} License: LGPLv2+ -Requires: %{name}%{?_isa} = %{version}-%{release} -Requires: %{name}-libs%{?_isa} = %{version}-%{release} +Requires: %{name} = %{version}-%{release} +Requires: %{name}-libs = %{version}-%{release} %description devel This package contains the pkg-config file and development headers for %{name}. @@ -72,7 +73,7 @@ This package contains the pkg-config file and development headers for %{name}. Summary: Libraries for %{name} License: LGPLv2+ Requires: bubblewrap >= %{bubblewrap_version} -Requires: ostree%{?_isa} >= %{ostree_version} +Requires: ostree >= %{ostree_version} Requires(pre): /usr/sbin/useradd %description libs @@ -103,15 +104,22 @@ that's used by %{name} and other packages. %package tests Summary: Tests for %{name} License: LGPLv2+ -Requires: %{name}%{?_isa} = %{version}-%{release} -Requires: %{name}-libs%{?_isa} = %{version}-%{release} -Requires: %{name}-session-helper%{?_isa} = %{version}-%{release} +Requires: %{name} = %{version}-%{release} +Requires: %{name}-libs = %{version}-%{release} +Requires: %{name}-session-helper = %{version}-%{release} Requires: bubblewrap >= %{bubblewrap_version} -Requires: ostree%{?_isa} >= %{ostree_version} +Requires: ostree >= %{ostree_version} %description tests This package contains installed tests for %{name}. +%package doc +Summary: Documentation files for %{name} +Requires: %{name}-libs = %{version}-%{release} +BuildArch: noarch + +%description doc +The %{name}-doc package contains documentation files for %{name}. %prep %autosetup -p1 @@ -142,6 +150,8 @@ rm -f %{buildroot}%{_libdir}/libflatpak.la %find_lang %{name} +%generate_compatibility_deps + %pre getent group flatpak >/dev/null || groupadd -r flatpak getent passwd flatpak >/dev/null || \ @@ -166,6 +176,9 @@ fi %{_bindir}/flatpak %{_bindir}/flatpak-bisect %{_bindir}/flatpak-coredumpctl +%{abidir}/flatpak-option.list +%{abidir}/flatpak-bisect-option.list +%{abidir}/flatpak-coredumpctl-option.list %{_datadir}/bash-completion %{_datadir}/dbus-1/interfaces/org.freedesktop.portal.Flatpak.xml %{_datadir}/dbus-1/interfaces/org.freedesktop.Flatpak.Authenticator.xml @@ -208,8 +221,10 @@ fi %files libs %license COPYING +%dir %{abidir} %{_libdir}/girepository-1.0/Flatpak-1.0.typelib %{_libdir}/libflatpak.so.* +%{abidir}/libflatpak.dump %files selinux %{_datadir}/selinux/packages/flatpak.pp.bz2 @@ -226,6 +241,12 @@ fi %{_datadir}/installed-tests %{_libexecdir}/installed-tests +%files doc +%doc README.md NEWS INSTALL + %changelog -* Mon Apr 25 2022 Zhongling He 1.13.2 -- Init package from upstream v1.13.2 \ No newline at end of file +* Tue Oct 18 2022 happy_orange - 1.13.2-3 +- add doc package and add api. + +* Mon Apr 25 2022 Zhongling He - 1.13.2-2 +- Init package from upstream v1.13.2 -- Gitee