rpms/phpldapadmin/devel .cvsignore, 1.8, 1.9 phpldapadmin.spec, 1.14, 1.15 sources, 1.9, 1.10

[Dmitry Butskoy (buc)]

Author: buc

Update of /cvs/extras/rpms/phpldapadmin/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2626

Modified Files:
	.cvsignore phpldapadmin.spec sources 
Log Message:



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/phpldapadmin/devel/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- .cvsignore	19 Sep 2006 14:41:47 -0000	1.8
+++ .cvsignore	13 Feb 2008 16:06:30 -0000	1.9
@@ -1 +1 @@
-phpldapadmin-1.0.1.tar.gz
+phpldapadmin-1.1.0.5.tar.gz


Index: phpldapadmin.spec
===================================================================
RCS file: /cvs/extras/rpms/phpldapadmin/devel/phpldapadmin.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- phpldapadmin.spec	17 Aug 2007 12:51:37 -0000	1.14
+++ phpldapadmin.spec	13 Feb 2008 16:06:30 -0000	1.15
@@ -1,6 +1,6 @@
 Name: phpldapadmin
 Summary: Web-based tool for managing LDAP servers
-Version: 1.0.1
+Version: 1.1.0.5
 Release: 1%{?dist}
 Group: Applications/Internet
 License: GPLv2+
@@ -65,7 +65,9 @@
 mv $RPM_BUILD_ROOT%{_datadir}/%{name}/config/* \
 	$RPM_BUILD_ROOT%{_sysconfdir}/%{name}
 rmdir $RPM_BUILD_ROOT%{_datadir}/%{name}/config
-ln -s ../../../..%{_sysconfdir}/%{name} \
+
+UPS=$(echo %{_datadir}/%{name} | sed -e 's,^/,,' -e 's,[^/]*,..,g')
+ln -s $UPS%{_sysconfdir}/%{name} \
 	$RPM_BUILD_ROOT%{_datadir}/%{name}/config
 
 cat <<EOF >%{name}.conf
@@ -95,7 +97,10 @@
 %post
 if [ $1 -eq 1 ]; then
     set @@@ `dd bs=128 count=1 </dev/urandom 2>/dev/null | md5sum`
-    sed -i -e "/session\['blowfish'\] = '';/ s/'';/'$2';  # Autogenerated for `uname -n`/"  %{_sysconfdir}/%{name}/config.php
+    sed -i "/session\['blowfish'\] = null;/ {
+	s/^[^\$]*\\\$/\$/
+	s/null;/'$2';  # Autogenerated for `uname -n`/
+    }"  %{_sysconfdir}/%{name}/config.php
 fi
 
 
@@ -110,6 +115,9 @@
 
 
 %changelog
+* Wed Feb 13 2008 Dmitry Butskoy <Dmitry at Butskoy.name> - 1.1.0.5-1
+- upgrade to 1.1.0.5
+
 * Fri Aug 17 2007 Dmitry Butskoy <Dmitry at Butskoy.name>
 - Change License tag to GPLv2+
   (Note: most files do not specify any license information at all,


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/phpldapadmin/devel/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- sources	19 Sep 2006 14:41:47 -0000	1.9
+++ sources	13 Feb 2008 16:06:30 -0000	1.10
@@ -1 +1 @@
-1cfb80099229dd27090634a4781990b5  phpldapadmin-1.0.1.tar.gz
+5ea78a6758e347c77ef291882675f266  phpldapadmin-1.1.0.5.tar.gz