--- rpms/smeserver-userpanel/contribs8/smeserver-userpanel.spec	2013/02/07 02:23:23	1.1
+++ rpms/smeserver-userpanel/contribs8/smeserver-userpanel.spec	2013/11/28 22:35:28	1.2
@@ -1,4 +1,4 @@
-# $Id: smeserver-userpanel.spec,v 1.4 2008/11/25 16:20:33 slords Exp $
+# $Id: smeserver-userpanel.spec,v 1.1 2013/02/07 02:23:23 unnilennium 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 0.9
-%define release 11
+%define release 12
 Version: %{version}
 Release: %{release}%{?dist}
 License: GPL
@@ -14,6 +14,8 @@ URL: http://www.dungog.net/sme
 Group: SMEserver/addon
 Source: %{name}-%{version}.tar.gz
 Patch0: smeserver-userpanel-0.9-pleasewait.patch
+Patch1:  smeserver-userpanel-0.9-logout-menu.patch
+Patch2: smeserver-userpanel-0.9-sigevents.patch
 BuildArchitectures: noarch
 BuildRoot: /var/tmp/%{name}-%{version}
 Requires: e-smith-release >= 7.1.1
@@ -30,6 +32,12 @@ userpanels available in seperate rpms.
 Panels can be delegated at user, group or global levels
 
 %changelog
+* Thu Nov 28 2013 JP Pialasse <tests@pialasse.com>  0.9-12.sme
+- NFR: logout button  [SME: 8022]
+- NFR: show username [SME: 8025]
+- should fix 500 error by adding action in most events [SME: 7667]
+- spec file tidying
+
 * Sun Feb 17 2008 Stephen Noble <support@dungog.net> 0.9-11
 - remove pleasewait hack [SME: 126] 
 
@@ -313,6 +321,8 @@ Panels can be delegated at user, group o
 %prep
 %setup
 %patch0 -p1
+%patch1 -p1
+%patch2 -p1
 
 %build
 perl createlinks
@@ -323,49 +333,50 @@ mkdir -p root/etc/e-smith/web/panels/use
 rm -rf $RPM_BUILD_ROOT
 (cd root   ; find . -depth -print | cpio -dump $RPM_BUILD_ROOT)
 rm -f %{name}-%{version}-filelist
-/sbin/e-smith/genfilelist $RPM_BUILD_ROOT > %{name}-%{version}-filelist
+/sbin/e-smith/genfilelist $RPM_BUILD_ROOT \
+|grep -v 'logout-user'> %{name}-%{version}-filelist
 echo "%doc COPYING"  >> %{name}-%{version}-filelist
+echo '%attr(0755,root,admin) /etc/e-smith/web/common/cgi-bin/logout-user'>> %{name}-%{version}-filelist
 
 %clean
-cd ..
-rm -rf %{name}-%{version}
+#cd ..
+#rm -rf %{name}-%{version}
 
 %pre
 %preun
 
 %post
 
-/sbin/e-smith/expand-template /etc/httpd/admin-conf/httpd.conf
-/sbin/e-smith/expand-template /etc/httpd/conf/httpd.conf
-/usr/local/bin/svc -h /service/httpd-admin
-/usr/local/bin/svc -h /service/httpd-e-smith
+#/sbin/e-smith/expand-template /etc/httpd/admin-conf/httpd.conf
+#/sbin/e-smith/expand-template /etc/httpd/conf/httpd.conf
+#/usr/local/bin/svc -h /service/httpd-admin
+#/usr/local/bin/svc -h /service/httpd-e-smith
 
 #needs script to find existing languages
 #upgrades (and new installs) should be in new but existing users may miss some lexicons
 #should have in build not post
-for lang in en-us fr es it de sv pt sl nl #el id
-do
-/bin/mkdir -p /etc/e-smith/locale/$lang/etc/e-smith/web/panels/user
-/bin/ln -sf /etc/e-smith/locale/$lang/etc/e-smith/web/functions /etc/e-smith/locale/$lang/etc/e-smith/web/panels/user/cgi-bin
-done
+#for lang in en-us fr es it de sv pt sl nl #el id
+#do
+#/bin/mkdir -p /etc/e-smith/locale/$lang/etc/e-smith/web/panels/user
+#/bin/ln -sf /etc/e-smith/locale/$lang/etc/e-smith/web/functions /etc/e-smith/locale/$lang/etc/e-smith/web/panels/user/cgi-bin
+#done
 
-/sbin/e-smith/signal-event conf-userpanel
+#/sbin/e-smith/signal-event conf-userpanel
 
 %postun
 #uninstall
-if [ $1 = 0 ] ; then
- /sbin/e-smith/expand-template /etc/httpd/admin-conf/httpd.conf
- /sbin/e-smith/expand-template /etc/httpd/conf/httpd.conf
- /usr/local/bin/svc -h /service/httpd-admin
- /usr/local/bin/svc -h /service/httpd-e-smith
-
- #this has moved ?fixme? 
- DBS=`find /home/e-smith/db/navigation -type f -name "navigation.*"`
- for db in $DBS ; do
-   /sbin/e-smith/db $db delete userpanelaccess
- done
-fi
+#if [ $1 = 0 ] ; then
+# /sbin/e-smith/expand-template /etc/httpd/admin-conf/httpd.conf
+# /sbin/e-smith/expand-template /etc/httpd/conf/httpd.conf
+# /usr/local/bin/svc -h /service/httpd-admin
+# /usr/local/bin/svc -h /service/httpd-e-smith
+
+# #this has moved ?fixme? 
+# DBS=`find /home/e-smith/db/navigation -type f -name "navigation.*"`
+# for db in $DBS ; do
+#   /sbin/e-smith/db $db delete userpanelaccess
+# done
+#fi
 
 %files -f %{name}-%{version}-filelist
 %defattr(-,root,root)
-