--- rpms/smeserver-userpanels/contribs7/smeserver-userpanels.spec	2008/03/08 02:30:03	1.2
+++ rpms/smeserver-userpanels/contribs7/smeserver-userpanels.spec	2008/04/26 19:52:26	1.10
@@ -1,21 +1,30 @@
+# $Id: smeserver-userpanels.spec,v 1.9 2008/04/22 09:00:42 snetram Exp $
+# Authority: dungog
+# Name: Stephen Noble
+
 Summary: Panels to let users to change server settings.
 %define name smeserver-userpanels
 Name: %{name}
 %define version 1.0
-%define release 8
+%define release 13
 Version: %{version}
 Release: %{release}%{?dist}
-License: GPL
-URL: http://www.dungog.net/sme
+License: GNU GPL version 2
+URL: http://www.dungog.net/wiki
 Group: SMEserver/addon
 Source: %{name}-%{version}.tar.gz
 Patch0: smeserver-vacation-1.0-esLocalePasswd+Fwd.patch
 Patch1: smeserver-vacation-1.0-svLocalePasswd+Fwd.patch
 Patch2: smeserver-userpanels-1.0-frLocale.patch
 Patch3: smeserver-userpanels-1.0-pootle.patch
+Patch4: smeserver-userpanels-1.0-locale-2008-03-14.patch
+Patch5: smeserver-userpanels-1.0-locale-2008-04-01.patch
+Patch6: smeserver-userpanels-1.0-locale-2008-04-22.patch
+Patch7: smeserver-userpanels-1.0-add2general.patch
 BuildArchitectures: noarch
 BuildRoot: /var/tmp/%{name}-%{version}
 Requires: e-smith-release >= 7.0
+Requires: e-smith-formmagick >= 1.4.0-10
 BuildRequires: e-smith-devtools >= 1.13.1-03
 AutoReqProv: no
 
@@ -25,7 +34,22 @@ Change password,Forward mail, Backup use
 Delegate creation of users with restrictions.
 
 %changelog
-* Sat Mar 01 2008 Stephen Noble <support@dungog.net> - 1.0-8
+* Sat Apr 26 2008 Jonathan Martens <smeserver-contribs@snetram.nl> 1.0-13
+- Add common <base> tags to e-smith-formmagick's general
+
+* Tue Apr 22 2008 Jonathan Martens <smeserver-contribs@snetram.nl> 1.0-12
+- Apply 22 April 2008 locale patch
+
+* Tue Apr 1 2008 Shad L. Lords <slords@mail.com> 1.0-11
+- Update to UTF-8 translations
+
+* Fri Mar 14 2008 Stephen Noble <support@dungog.net> - 1.0-10
+- Add requires for e-smith-formmagick for UTF-8 support [SME: 3858]
+
+* Fri Mar 14 2008 Stephen Noble <support@dungog.net> - 1.0-9
+- update locale 2008-03-14
+
+* Sat Mar 07 2008 Stephen Noble <support@dungog.net> - 1.0-8
 - prepare en lexicons for pootle translations
 
 * Tue Dec 25 2007 Stephen Noble <support@dungog.net> 1.0-7
@@ -77,13 +101,13 @@ Delegate creation of users with restrict
 %patch1 -p1
 %patch2 -p1
 %patch3 -p1
-
+%patch4 -p1
+%patch5 -p1
+%patch6 -p1
+%patch7 -p1
 %build
-LEXICONS1=$(find root/etc/e-smith/web/functions/userpanel-password -type f )
-LEXICONS2=$(find root/etc/e-smith/web/functions/userpanel-forwarding -type f )
-LEXICONS3=$(find root/etc/e-smith/locale/ -type f )
-
-for lexicon in $LEXICONS1 $LEXICONS2 $LEXICONS3
+LEXICONS=$(find root/etc/e-smith/locale/ -type f )
+for lexicon in $LEXICONS root/etc/e-smith/web/functions/userpanel-{password,forwarding}
 do
     /sbin/e-smith/validate-lexicon $lexicon
 done
@@ -107,30 +131,20 @@ rm -rf %{name}-%{version}
 %post
 #new installs
 if [ $1 = 1 ] ; then
-
  globalUP=`/sbin/e-smith/db accounts get globalUP`
  if [ "x$globalUP" = "x" ]; then
      /sbin/e-smith/db accounts set globalUP userpanelglobal FirstName "global user" LastName "panel access" AdminPanels userpanel-forwarding,userpanel-password || :
  fi
-
-/etc/e-smith/events/actions/navigation-conf 2>/dev/null
-
 fi
 
 #upgrades (and new installs)
-
 if [ -d /etc/e-smith/events/conf-userpanel ] ; then
    /sbin/e-smith/signal-event conf-userpanel
 fi
 
-#notice
-echo 'smeserver-mailsorting has procmail and maildrop'
-echo 'smeserver-vacation has vacation'
-
 %postun
 #uninstall
 if [ $1 = 0 ] ; then
-
  DBS=`find /home/e-smith/db/navigation -type f -name "navigation.*"`
  for db in $DBS ; do
           /sbin/e-smith/db $db delete userpanel-password 2>/dev/null