--- rpms/smeserver-userpanel/contribs10/smeserver-userpanel.spec	2022/11/22 19:05:35	1.7
+++ 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.6 2022/08/01 19:36:06 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,7 +38,13 @@ userpanels available in seperate rpms.
 Panels can be delegated at user, group or global levels
 
 %changelog
-* Tue Nov 22 2022 Jean-Philippe Pialasse <tests@pialasse.com> %{version}-5.sme
+* 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]
 
 * Mon Aug 01 2022 Jean-Philippe Pialasse <tests@pialasse.com> 1.4-4.sme
@@ -46,22 +53,22 @@ Panels can be delegated at user, group o
 - fix call to svc in place of systemctl [SME: 11390]
 - remove reference to info.txt [SME: 10964]
 
-* Tue Feb 23 2021 Jean-Philipe Pialasse <tests@pialasse.com> 1.4-3.sme
+* Tue Feb 23 2021 Jean-Philippe Pialasse <tests@pialasse.com> 1.4-3.sme
 - add -update event to avoid reboot [SME: 11079]
   also fix detection of userpassword file
 
 * Mon Nov 02 2020 Michel Begue <mab974@gmail.com> 1.4-2.sme
 - Initial release for sme10 [SME: 11079]
 
-* Wed May 31 2017 Jean-Philipe Pialasse <tests@pialasse.com> 1.2-3.sme
+* Wed May 31 2017 Jean-Philippe Pialasse <tests@pialasse.com> 1.2-3.sme
 - rebuild archive to fix [SME: 8026]
 - Eliminated rpmbuild "bogus date" warnings due to inconsistent weekday,
   by assuming the date is correct and changing the weekday.
 
-* Tue May 30 2017 Jean-Philipe Pialasse <tests@pialasse.com> 1.1-8.sme
+* Tue May 30 2017 Jean-Philippe Pialasse <tests@pialasse.com> 1.1-8.sme
 - fix bad redirection on logout or timeout [SME: 8026]
 
-* Tue Jul 19 2016 Jean-Philipe Pialasse <tests@pialasse.com> 1.1-6.sme
+* Tue Jul 19 2016 Jean-Philippe Pialasse <tests@pialasse.com> 1.1-6.sme
 - adapt to the new color of manager for Koozali [SME: 9678]
 - thanks to John Crisp for this great work.
 
@@ -380,6 +387,7 @@ Panels can be delegated at user, group o
 %patch3 -p1
 %patch4 -p1
 %patch5 -p1
+%patch6 -p1
 
 %build
 perl createlinks