--- rpms/smeserver-userpanel/contribs10/smeserver-userpanel.spec	2022/11/22 19:11:22	1.8
+++ rpms/smeserver-userpanel/contribs10/smeserver-userpanel.spec	2022/12/01 06:43:51	1.9
@@ -1,4 +1,4 @@
-# $Id: smeserver-userpanel.spec,v 1.7 2022/11/22 19:05:35 jpp Exp $
+# $Id: smeserver-userpanel.spec,v 1.8 2022/11/22 19:11:22 jpp Exp $
 # Authority: dungog
 # Name: Stephen Noble
 
@@ -6,7 +6,7 @@ Summary: Provide a user panel to let use
 %define name smeserver-userpanel
 Name: %{name}
 %define version 1.4
-%define release 5
+%define release 6
 Version: %{version}
 Release: %{release}%{?dist}
 License: GPL
@@ -19,6 +19,7 @@ Patch2: smeserver-userpanel-1.4-bz12064-
 Patch3: smeserver-userpanel-1.4-bz11390-systemctl.patch
 Patch4: smeserver-userpanel-1.4-bz10964-infotxt.patch
 Patch5: smeserver-userpanel-1.4-bz12235.patch
+Patch6: smeserver-userpanel-1.4-bz10261-bz12249.patch
 
 BuildArchitectures: noarch
 BuildRoot: /var/tmp/%{name}-%{version}
@@ -37,6 +38,12 @@ userpanels available in seperate rpms.
 Panels can be delegated at user, group or global levels
 
 %changelog
+* Thu Dec 01 2022 Jean-Philippe Pialasse <tests@pialasse.com> 1.4-6.sme
+- fix translation not expanded [SME: 10261]
+- fix httpd admin stopped [SME: 12249]
+  moved actions before template and service actions
+  removed inline expand and restart
+
 * Tue Nov 22 2022 Jean-Philippe Pialasse <tests@pialasse.com> 1.4-5.sme
 - prevent manager locking on reconfiguration [SME: 12235]
 
@@ -380,6 +387,7 @@ Panels can be delegated at user, group o
 %patch3 -p1
 %patch4 -p1
 %patch5 -p1
+%patch6 -p1
 
 %build
 perl createlinks