From 2913badea47e272a48b61f2e1dae3bc812590c0a Mon Sep 17 00:00:00 2001
From: madomado <madonuko@outlook.com>
Date: Mon, 11 Mar 2024 06:42:18 +0800
Subject: [PATCH] fix: apparmor (#982)

Correct versioning
---
 anda/lib/apparmor/apparmor.spec | 8 +++-----
 anda/lib/apparmor/update.rhai   | 3 ++-
 2 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/anda/lib/apparmor/apparmor.spec b/anda/lib/apparmor/apparmor.spec
index 9714a69c10..112275b0d4 100644
--- a/anda/lib/apparmor/apparmor.spec
+++ b/anda/lib/apparmor/apparmor.spec
@@ -3,7 +3,7 @@
 %bcond_with tests
 
 Name:           apparmor
-Version:        4.0.0
+Version:        4.0.0~alpha3
 Release:        1%{?dist}
 Summary:        AppArmor userspace components
 
@@ -11,10 +11,9 @@ Summary:        AppArmor userspace components
 
 License:        GPL-2.0
 URL:            https://launchpad.net/apparmor
-Source0:        %{url}/%{baseversion}/%{version}-alpha2/+download/%{name}-%{version}~alpha2.tar.gz
+Source0:        %{url}/%{baseversion}/%(echo %version | sed 's/~/-/')/+download/%{name}-%{version}.tar.gz
 Source1:        apparmor.preset
 Patch01:        0001-fix-avahi-daemon-authselect-denial-in-fedora.patch
-Patch02:        0001-All-current-versions-of-RHEL-and-Fedora-that-are-not.patch
 
 BuildRequires:  gcc
 BuildRequires:  automake
@@ -138,7 +137,7 @@ confinement policies when running virtual hosts in the webserver by using the
 changehat abilities exposed through libapparmor.
 
 %prep
-%autosetup -p1 -n %{name}-%{version}~alpha2
+%autosetup -p1 -n %{name}-%{version}
 
 %build
 export PYTHON=%{__python3}
@@ -270,7 +269,6 @@ make -C utils check
 %{_bindir}/aa-features-abi
 %{_sbindir}/aa-load
 %{_sbindir}/aa-teardown
-%{_sbindir}/rcapparmor
 %{_unitdir}/apparmor.service
 %{_presetdir}/70-apparmor.preset
 %{_prefix}/lib/apparmor
diff --git a/anda/lib/apparmor/update.rhai b/anda/lib/apparmor/update.rhai
index 7cc467baa3..74a3f5d8b4 100644
--- a/anda/lib/apparmor/update.rhai
+++ b/anda/lib/apparmor/update.rhai
@@ -1,3 +1,4 @@
 let html = get("https://launchpad.net/apparmor");
-let v = find("Latest version is ([\\d.]+)", html, 1);
+let v = find("Latest version is ([\\d.\\w\\-]+)", html, 1);
+v.replace('-', '~');
 rpm.version(v);