rpms/phpldapadmin/FC-3 phpldapadmin-0.9.7.2-config.patch, NONE, 1.1 phpldapadmin.spec, 1.7, 1.8 sources, 1.3, 1.4 phpldapadmin-0.9.7.1-config.patch, 1.1, NONE

[Dmitry Butskoy (buc)]

Author: buc

Update of /cvs/extras/rpms/phpldapadmin/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29146

Modified Files:
	phpldapadmin.spec sources 
Added Files:
	phpldapadmin-0.9.7.2-config.patch 
Removed Files:
	phpldapadmin-0.9.7.1-config.patch 
Log Message:


phpldapadmin-0.9.7.2-config.patch:

--- NEW FILE phpldapadmin-0.9.7.2-config.patch ---
diff -Nrbu phpldapadmin-0.9.7.2/config/config.php phpldapadmin-0.9.7.2-OK/config/config.php
--- phpldapadmin-0.9.7.2/config/config.php	2005-11-15 19:29:18.000000000 +0300
+++ phpldapadmin-0.9.7.2-OK/config/config.php	2005-11-15 19:29:06.000000000 +0300
@@ -34,6 +34,9 @@
 /* Useful important configuration overrides  */
 /*********************************************/
 
+#  $config->custom->appearance['language'] = 'en';
+#  $config->custom->appearance['show_clear_password'] = true;
+
 /* If you are asked to put pla in debug mode, this is how you do it: */
 #  $config->custom->debug['level'] = 2;
 #  $config->custom->debug['syslog'] = true;
@@ -64,7 +67,7 @@
 
 /* A convenient name that will appear in the tree viewer and throughout
    phpLDAPadmin to identify this LDAP server to users. */
-$ldapservers->SetValue($i,'server','name','My LDAP Server');
+$ldapservers->SetValue($i,'server','name','Local LDAP Server');
 
 /* Examples:
    'ldap.example.com',
@@ -93,6 +96,7 @@
    encrypted using blowfish and the secret your specify above as
    session['blowfish']. */
 // $ldapservers->SetValue($i,'server','auth_type','cookie');
+$ldapservers->SetValue($i,'server','auth_type','session');
 
 /* The DN of the user for phpLDAPadmin to bind with. For anonymous binds or
    'cookie' or 'session' auth_types, LEAVE THE LOGIN_DN AND LOGIN_PASS BLANK. If
@@ -118,6 +122,7 @@
 /* Default password hashing algorithm. One of md5, ssha, sha, md5crpyt, smd5,
    blowfish, crypt or leave blank for now default algorithm. */
 // $ldapservers->SetValue($i,'appearance','password_hash','md5');
+$ldapservers->SetValue($i,'appearance','password_hash','');
 
 /* If you specified 'cookie' or 'session' as the auth_type above, you can
    optionally specify here an attribute to use when logging in. If you enter
@@ -129,6 +134,7 @@
    specify 'string', in which case you can provide a string to use for logging
    users in. See 'login_string' directly below. */
 // $ldapservers->SetValue($i,'login','attr','dn');
+$ldapservers->SetValue($i,'login','attr','uid');
 
 /* If you specified 'cookie' or 'session' as the auth_type above, and you
    specified 'string' for 'login_attr' above, you must provide a string here for


Index: phpldapadmin.spec
===================================================================
RCS file: /cvs/extras/rpms/phpldapadmin/FC-3/phpldapadmin.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- phpldapadmin.spec	3 Nov 2005 13:14:08 -0000	1.7
+++ phpldapadmin.spec	23 Dec 2005 16:34:03 -0000	1.8
@@ -1,13 +1,13 @@
 Name: phpldapadmin
 Summary: Web-based tool for managing LDAP servers
-Version: 0.9.7.1
-Release: 1%{?dist}
+Version: 0.9.7.2
+Release: 2%{?dist}
 Group: Applications/Internet
 License: GPL
 URL: http://phpldapadmin.sourceforge.net
 Source: http://dl.sourceforge.net/sourceforge/phpldapadmin/phpldapadmin-%{version}.tar.gz
 Patch1: phpldapadmin-0.9.7.1-namingcontexts.patch
-Patch2: phpldapadmin-0.9.7.1-config.patch
+Patch2: phpldapadmin-0.9.7.2-config.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch: noarch
@@ -55,7 +55,7 @@
 cp -a * $RPM_BUILD_ROOT%{_datadir}/%{name}
 
 pushd $RPM_BUILD_ROOT%{_datadir}/%{name}
-rm -rf doc/ INSTALL LICENSE VERSION
+rm -rf doc/ INSTALL LICENSE
 popd
 
 
@@ -114,6 +114,13 @@
 
 
 %changelog
+* Fri Nov 18 2005 Dmitry Butskoy <Dmitry at Butskoy.name> - 0.9.7.2-2
+- update upstream's tarball (was changed without version increment)
+- don't treat VERSION as doc file (#173513)
+
+* Tue Nov 15 2005 Dmitry Butskoy <Dmitry at Butskoy.name> - 0.9.7.2-1
+- update to 0.9.7.2
+
 * Tue Nov  1 2005 Dmitry Butskoy <Dmitry at Butskoy.name> - 0.9.7.1-1
 - upgrade to 0.9.7.1
 - adapt patches and spec to new upstream layout.


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/phpldapadmin/FC-3/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	1 Nov 2005 16:36:11 -0000	1.3
+++ sources	23 Dec 2005 16:34:03 -0000	1.4
@@ -1 +1 @@
-7491767e6a6c1166217472daa9b4c45c  phpldapadmin-0.9.7.1.tar.gz
+ac9923e37bbc232b9ca537cfd9282691  phpldapadmin-0.9.7.2.tar.gz


--- phpldapadmin-0.9.7.1-config.patch DELETED ---