--- rpms/phpki/contribs7/phpki.spec	2009/03/03 18:36:43	1.3
+++ rpms/phpki/contribs7/phpki.spec	2010/03/18 15:29:18	1.6
@@ -1,10 +1,10 @@
-# $Id: phpki.spec,v 1.2 2009/03/02 23:53:29 slords Exp $
+# $Id: phpki.spec,v 1.5 2009/08/26 17:49:59 vip-ire Exp $
 # Authority: vip-ire
 # Name: Daniel Berteaud
 
 %define 	name phpki
 %define 	version 0.82
-%define 	release 8
+%define 	release 11
 Summary: 	Phpki is a simple certificate management suite
 Name: 		%{name}
 Version: 	%{version}
@@ -26,6 +26,8 @@ Patch9: 	phpki-0.82-display_root_pem.pat
 Patch10:	phpki-0.82-disable_download_after_create.patch
 Patch11:	phpki-0.82-remove_security_warning.patch
 Patch12:	phpki-0.82-remove_email_from_upload_file_name.patch2
+Patch13:	phpki-0.82-ca_help.patch
+Patch14:	phpki-0.82-empty_pass_php_5.2.patch
 
 BuildArch: 	noarch
 BuildRoot: 	/var/tmp/%{name}-%{version}
@@ -45,6 +47,16 @@ With it, you may create and centrally ma
 e-mail clients, SSL servers, and VPN applications.
 
 %changelog
+* Thu Mar 18 2010 Daniel B. <daniel@firewall-services.com> [0.82-11]
+- Fixe empty password with PHP 5.2 (SME 8b5)
+
+* Wed Aug 26 2009 Daniel B. <daniel@firewall-services.com> [0.82-10]
+- Fixe links for CA help page
+
+* Mon Mar 23 2009 Daniel B. <daniel@firewall-services.com> [0.82-9]
+- Remove links after uninstall so you can easily re-install the contrib
+  later [SME: 5091]
+
 * Tue Mar 03 2009 Daniel B. <daniel@firewall-services.com> [0.82-8]
 - Add e-smith-devtools as a dependencie
 
@@ -93,6 +105,8 @@ e-mail clients, SSL servers, and VPN app
 %patch10 -p1
 %patch11 -p1
 %patch12 -p1
+%patch13 -p1
+%patch14 -p1
 
 %build
 #drop in an unchanged .tgz, if required rename directory here, eg remove version number.
@@ -145,9 +159,15 @@ if [ $1 == 1 ]; then
 header(\"Location: ./../index.php\");
 ?>
 " > /opt/phpki/html/ca/index.php
-
 fi
 
 %postun
+# Remove the links to index.php after uninstall
+if [ $1 == 0 ]; then
+    %{__rm} -f /opt/phpki/html/index.php
+    %{__rm} -f /opt/phpki/html/setup.php
+    %{__rm} -f /opt/phpki/html/ca/index.php
+fi
+
 
 true