--- rpms/smeserver-phpldapadmin/contribs8/smeserver-phpldapadmin.spec	2013/05/27 02:45:51	1.2
+++ rpms/smeserver-phpldapadmin/contribs8/smeserver-phpldapadmin.spec	2013/11/05 00:21:58	1.4
@@ -1,4 +1,4 @@
-# $Id: smeserver-phpldapadmin.spec,v 1.1 2013/03/03 21:22:48 unnilennium Exp $
+# $Id: smeserver-phpldapadmin.spec,v 1.3 2013/05/28 03:01:16 unnilennium Exp $
 # Authority: nocvs
 # Name: Michel Van hees
 
@@ -6,13 +6,15 @@ Summary: PhpLdapAdmin for SME server
 %define name smeserver-phpldapadmin
 Name: %{name}
 %define version 1.2.3
-%define release 1
+%define release 2
 Version: %{version}
 Release: %{release}%{?dist}
 License: Freely distributable
 Group: Apache
 Source: %{name}-%{version}.tar.gz
-#Patch0: %{name}-%{version}.patch.yyyymmddnn
+Patch0: smeserver-phpldapadmin-1.2.3-dbinit.patch
+Patch1: smeserver-phpldapadmin-1.2.3-template.patch
+#{name}-%{version}.patch.yyyymmddnn
 BuildRoot: /var/tmp/e-smith-buildroot
 BuildRequires: e-smith-devtools
 BuildArchitectures: noarch
@@ -21,9 +23,14 @@ Requires: phpldapadmin >= 1.2.3
 AutoReqProv: no
 
 %changelog
+* Mon Nov 4 2013 JP Pialasse <tests@pialasse.com> 1.2.3-2.sme
+- wrong tempalte path for config file [SME: 7975]
+
 * Sun May 26 2013 JP Pialasse <tests@pialasse.com> 1.2.3-1.sme
 - remove phpldapadmin from package
 - added Requires phpldapadmin-1.2.3-1
+- clean spec file
+- added default db value (patch file)
 
 * Thu Jun  26 2007 Michel Van hees <michel@vanhees.cc>
 - Restart contrib from scratch
@@ -34,8 +41,8 @@ SME server - phpmyadmin multiuser for sm
 
 %prep
 %setup
-#%patch0 -p1
-#%patch1 -p1
+%patch0 -p1
+%patch1 -p1
 
 %build
 perl createlinks
@@ -55,45 +62,8 @@ rm -rf $RPM_BUILD_ROOT
 %preun
 
 %post
-/sbin/e-smith/db configuration set phpldapadmin service
-/sbin/e-smith/db configuration setprop phpldapadmin access private
-
-/sbin/e-smith/expand-template /opt/phpldapadmin/config/config.php
-/sbin/e-smith/expand-template /etc/httpd/conf/httpd.conf
-service httpd-e-smith sigusr1
-
-
-case "${LANG:0:2}" in
-    fr)
-        echo ""
-        echo "Vous pouvez maintenant acceder à phpldapadmin via un browser web de la maniere suivante https://nom_server/phpldapadmin"
-        echo "Vous pouvez vous connecter avec le login admin et le mot de passe du système"
-        echo ""
-        echo "Attention !!!!!"
-        echo "phpldapadmin est limité en accès au réseau interne, donc pas depuis internet"
-        echo "Vous pouvez changer cette option avec les commandes :"
-        echo "db configuration setprop phpldapadmin access public"
-        echo "signal-events console-save"
-        echo ""
-    ;;
-    *)
-        echo ""
-        echo "Now you can access phpldapadmin though your browser at  https://server_name/phpldapadmin"
-        echo "You can connect using system admin login and password"
-        echo ""
-        echo "BEWARE !!!"
-        echo "phpldapadmin is now limited to internal network, so it couldn't be access from internet"
-        echo "You can change this with the following command :"
-        echo "db configuration setprop phpldapadmin access public"
-        echo "signal-events console-save"
-        echo ""
-    ;;
-esac
 
 %postun
-/sbin/e-smith/db configuration delete phpldapadmin
-/sbin/e-smith/expand-template /etc/httpd/conf/httpd.conf
-service httpd-e-smith sigusr1
 
 %files -f %{name}-%{version}-filelist
 %defattr(-,root,root)