--- rpms/smeserver-userpanels/contribs7/smeserver-userpanels-1.0.spec	2007/12/23 01:15:48	1.5
+++ rpms/smeserver-userpanels/contribs7/smeserver-userpanels-1.0.spec	2007/12/23 21:07:39	1.6
@@ -2,18 +2,20 @@ Summary: Panels to let users to change s
 %define name smeserver-userpanels
 Name: %{name}
 %define version 1.0
-%define release 5
+%define release 6
 Version: %{version}
 Release: %{release}%{?dist}
+Distribution: SME Server
 License: GPL
 URL: http://www.dungog.net/sme
 Group: SMEserver/addon
 Source: %{name}-%{version}.tar.gz
+Patch0: smeserver-vacation-1.0-esLocalePasswd+Fwd.patch
+Patch1: smeserver-vacation-1.0-svLocalePasswd+Fwd.patch
 BuildArchitectures: noarch
 BuildRoot: /var/tmp/%{name}-%{version}
 Requires: e-smith-release >= 7.0
-BuildRequires: e-smith-devtools
-#Requires: smeserver-userpanel
+BuildRequires: e-smith-devtools >= 1.13.1-03
 AutoReqProv: no
 
 %description
@@ -22,13 +24,17 @@ Change password,Forward mail, Backup use
 Delegate creation of users with restrictions.
 
 %changelog
-* Wed Feb 28 2007 Stephen Noble <stephen@dungog.net> 
+* Thu Dec 6 2007 Stephen Noble <support@dungog.net> 1.0-6
+- swedish translation, thanks Chrille
+
+* Thu Dec 6 2007 Stephen Noble <support@dungog.net> 1.0-5
 - remove Requires: smeserver-userpanel
-- [1.0-5]
 
-* Sun Feb 18 2007 Stephen Noble <support@dungog.net>
-- swedish translation, thanks Chrille
-- [1.0-4]
+* Mon Oct 29 2007 Stephen Noble <support@dungog.net> 1.0-4
+- update spanish translations, thanks Normando Hall [SME 3503]
+
+* Sun Apr 29 2007 Shad L. Lords <slords@mail.com>
+- Clean up spec so package can be built by koji/plague
 
 * Mon Oct 30 2006  Stephen Noble <support@dungog.net>
 - forwarding lexicon updated for de
@@ -60,6 +66,8 @@ Delegate creation of users with restrict
 
 %prep
 %setup
+%patch0 -p1
+%patch1 -p1
 
 %build
 LEXICONS1=$(find root/etc/e-smith/web/functions/userpanel-password -type f )
@@ -98,7 +106,7 @@ if [ $1 = 1 ] ; 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
+/etc/e-smith/events/actions/navigation-conf 2>/dev/null
 
 fi
 
@@ -114,17 +122,16 @@ echo 'smeserver-vacation has vacation'
 
 %postun
 #uninstall
-#if [ $1 = 0 ] ; then
+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
- #         /sbin/e-smith/db $db delete userpanel-userbackup 2>/dev/null
- #         /sbin/e-smith/db $db delete userpanel-forwarding 2>/dev/null
- #         /sbin/e-smith/db $db delete userpanel-useraccounts   2>/dev/null
- #done
-#fi
+ 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
+          /sbin/e-smith/db $db delete userpanel-userbackup 2>/dev/null
+          /sbin/e-smith/db $db delete userpanel-forwarding 2>/dev/null
+          /sbin/e-smith/db $db delete userpanel-useraccounts   2>/dev/null
+ done
+fi
 
 %files -f %{name}-%{version}-filelist
 %defattr(-,root,root)
-