From 88f7d47754c04d31286b92ce88b7124c185e181f Mon Sep 17 00:00:00 2001
From: Vladimir Petko <vladimir.petko@canonical.com>
Date: Wed, 8 Jul 2026 10:14:05 +1200
Subject: [PATCH 1/5] chore: migrate libtcnative-1 to libtcnative-2

---
 slices/{libtcnative-1.yaml => libtcnative-2.yaml}         | 8 ++++----
 .../{libtcnative-1 => libtcnative-2}/task.yaml            | 6 +++---
 2 files changed, 7 insertions(+), 7 deletions(-)
 rename slices/{libtcnative-1.yaml => libtcnative-2.yaml} (51%)
 rename tests/spread/integration/{libtcnative-1 => libtcnative-2}/task.yaml (82%)

diff --git a/slices/libtcnative-1.yaml b/slices/libtcnative-2.yaml
similarity index 51%
rename from slices/libtcnative-1.yaml
rename to slices/libtcnative-2.yaml
index 675746c8a..a45f0838c 100644
--- a/slices/libtcnative-1.yaml
+++ b/slices/libtcnative-2.yaml
@@ -1,7 +1,7 @@
-package: libtcnative-1
+package: libtcnative-2
 
 essential:
-  libtcnative-1_copyright:
+  - libtcnative-2_copyright:
 
 slices:
   libs:
@@ -10,8 +10,8 @@ slices:
       libc6_libs:
       libssl3t64_libs:
     contents:
-      /usr/lib/*-linux-*/libtcnative-1.so*:
+      /usr/lib/*-linux-*/libtcnative-2.so*:
 
   copyright:
     contents:
-      /usr/share/doc/libtcnative-1/copyright:
+      /usr/share/doc/libtcnative-2/copyright:
diff --git a/tests/spread/integration/libtcnative-1/task.yaml b/tests/spread/integration/libtcnative-2/task.yaml
similarity index 82%
rename from tests/spread/integration/libtcnative-1/task.yaml
rename to tests/spread/integration/libtcnative-2/task.yaml
index 370ac9325..86835704f 100644
--- a/tests/spread/integration/libtcnative-1/task.yaml
+++ b/tests/spread/integration/libtcnative-2/task.yaml
@@ -1,9 +1,9 @@
-summary: Integration tests for libtcnative-1
+summary: Integration tests for libtcnative-2
 
 execute: |
-  # libtcnative-1 installs tomcat native extensions. run
+  # libtcnative-2 installs tomcat native extensions. run
   # tomcat version to validate that they are loaded
-  rootfs="$(install-slices tomcat10_core libtcnative-1_libs base-files_base coreutils_bins dash_bins openjdk-21-jdk-headless_standard)"
+  rootfs="$(install-slices tomcat10_core libtcnative-2_libs base-files_base coreutils_bins dash_bins openjdk-21-jdk-headless_standard)"
   java=$(find "$rootfs" -name java -type f -printf '%P\n' -quit 2>/dev/null)
 
   # Make fake /dev/null and mount /proc

From 6b735109a0b46167aadb822ebd9e2d051c218c8f Mon Sep 17 00:00:00 2001
From: Vladimir Petko <vladimir.petko@canonical.com>
Date: Wed, 8 Jul 2026 17:58:57 +1200
Subject: [PATCH 2/5] fix: remove list from tcnative copyright

---
 slices/libtcnative-2.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/slices/libtcnative-2.yaml b/slices/libtcnative-2.yaml
index a45f0838c..f2852b4fc 100644
--- a/slices/libtcnative-2.yaml
+++ b/slices/libtcnative-2.yaml
@@ -1,7 +1,7 @@
 package: libtcnative-2
 
 essential:
-  - libtcnative-2_copyright:
+  libtcnative-2_copyright:
 
 slices:
   libs:

From f9d4090e7245e648cf614405c73ffd5baf81e60d Mon Sep 17 00:00:00 2001
From: Vladimir Petko <vladimir.petko@canonical.com>
Date: Fri, 10 Jul 2026 09:03:17 +1200
Subject: [PATCH 3/5] chore: trigger ci


From 4f1acb735e4cfc6ea7e9d3b50a3e9085755de0df Mon Sep 17 00:00:00 2001
From: Vladimir Petko <vladimir.petko@canonical.com>
Date: Wed, 15 Jul 2026 08:01:13 +1200
Subject: [PATCH 4/5] chore: restore libtcnative-1 slice

---
 slices/libtcnative-1.yaml | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)
 create mode 100644 slices/libtcnative-1.yaml

diff --git a/slices/libtcnative-1.yaml b/slices/libtcnative-1.yaml
new file mode 100644
index 000000000..675746c8a
--- /dev/null
+++ b/slices/libtcnative-1.yaml
@@ -0,0 +1,17 @@
+package: libtcnative-1
+
+essential:
+  libtcnative-1_copyright:
+
+slices:
+  libs:
+    essential:
+      libapr1t64_libs:
+      libc6_libs:
+      libssl3t64_libs:
+    contents:
+      /usr/lib/*-linux-*/libtcnative-1.so*:
+
+  copyright:
+    contents:
+      /usr/share/doc/libtcnative-1/copyright:

From d795d96bf5927e212bb746c954e0f37df45139c4 Mon Sep 17 00:00:00 2001
From: Vladimir Petko <vladimir.petko@canonical.com>
Date: Fri, 17 Jul 2026 09:22:41 +1200
Subject: [PATCH 5/5] chore: restore libtcnative-1 spread test

---
 .../integration/libtcnative-1/task.yaml       | 22 +++++++++++++++++++
 1 file changed, 22 insertions(+)
 create mode 100644 tests/spread/integration/libtcnative-1/task.yaml

diff --git a/tests/spread/integration/libtcnative-1/task.yaml b/tests/spread/integration/libtcnative-1/task.yaml
new file mode 100644
index 000000000..370ac9325
--- /dev/null
+++ b/tests/spread/integration/libtcnative-1/task.yaml
@@ -0,0 +1,22 @@
+summary: Integration tests for libtcnative-1
+
+execute: |
+  # libtcnative-1 installs tomcat native extensions. run
+  # tomcat version to validate that they are loaded
+  rootfs="$(install-slices tomcat10_core libtcnative-1_libs base-files_base coreutils_bins dash_bins openjdk-21-jdk-headless_standard)"
+  java=$(find "$rootfs" -name java -type f -printf '%P\n' -quit 2>/dev/null)
+
+  # Make fake /dev/null and mount /proc
+  mkdir -p "$rootfs/dev"
+  touch "$rootfs/dev/null"
+  chmod +x "$rootfs/dev/null"
+  mkdir -p "$rootfs/proc"
+  sudo mount --bind /proc "$rootfs/proc"
+  trap 'sudo umount "$rootfs/proc"' EXIT
+
+  export JAVA_HOME=/$(dirname $(dirname ${java}))
+  export CATALINA_BASE="/var/lib/tomcat10"
+  chroot "$rootfs" /usr/share/tomcat10/bin/catalina.sh version \
+    | grep -q "Apache Tomcat/10"
+  chroot "$rootfs" /usr/share/tomcat10/bin/catalina.sh configtest 2>&1 \
+    | grep -q 'Loaded Apache Tomcat Native library'