[phpldapadmin/f15] update to 1.2.1.1
Dmitry Butskoy
buc at fedoraproject.org
Fri Jul 22 16:20:49 UTC 2011
commit e9283db1d33a74e11d57fe53ae9e6d6f9cf79adb
Author: Dmitry Butskoy <Dmitry at Butskoy.name>
Date: Fri Jul 22 20:20:12 2011 +0400
update to 1.2.1.1
phpldapadmin-1.2.0.5-addattr.patch | 12 ---
phpldapadmin-1.2.0.5-closecomment.patch | 24 -------
phpldapadmin-1.2.0.5-php53.patch | 73 --------------------
...nfig.patch => phpldapadmin-1.2.1.1-config.patch | 16 ++--
phpldapadmin.spec | 20 ++---
sources | 2 +-
6 files changed, 17 insertions(+), 130 deletions(-)
---
diff --git a/phpldapadmin-1.2.0.3-config.patch b/phpldapadmin-1.2.1.1-config.patch
similarity index 82%
rename from phpldapadmin-1.2.0.3-config.patch
rename to phpldapadmin-1.2.1.1-config.patch
index d1ecb0b..b39a602 100644
--- a/phpldapadmin-1.2.0.3-config.patch
+++ b/phpldapadmin-1.2.1.1-config.patch
@@ -1,7 +1,7 @@
-diff -Nrbu phpldapadmin-1.2.0.3/config/config.php phpldapadmin-1.2.0.3-OK/config/config.php
---- phpldapadmin-1.2.0.3/config/config.php 2009-09-16 17:50:36.000000000 +0400
-+++ phpldapadmin-1.2.0.3-OK/config/config.php 2009-09-16 17:48:19.000000000 +0400
-@@ -72,6 +72,11 @@
+diff -Nrbu phpldapadmin-1.2.1.1/config/config.php phpldapadmin-1.2.1.1-OK/config/config.php
+--- phpldapadmin-1.2.1.1/config/config.php 2011-07-22 19:48:38.000000000 +0400
++++ phpldapadmin-1.2.1.1-OK/config/config.php 2011-07-22 19:52:24.000000000 +0400
+@@ -76,6 +76,11 @@
30 seconds or the setting of max_exection_time if this is null. */
// $config->custom->session['timelimit'] = 30;
@@ -13,7 +13,7 @@ diff -Nrbu phpldapadmin-1.2.0.3/config/config.php phpldapadmin-1.2.0.3-OK/config
/* Our local timezone
This is to make sure that when we ask the system for the current time, we
get the right local time. If this is not set, all time() calculations will
-@@ -265,7 +270,7 @@
+@@ -279,7 +284,7 @@
/* A convenient name that will appear in the tree viewer and throughout
phpLDAPadmin to identify this LDAP server to users. */
@@ -22,7 +22,7 @@ diff -Nrbu phpldapadmin-1.2.0.3/config/config.php phpldapadmin-1.2.0.3-OK/config
/* Examples:
'ldap.example.com',
-@@ -359,6 +364,7 @@
+@@ -373,6 +378,7 @@
/* Default password hashing algorithm. One of md5, ssha, sha, md5crpyt, smd5,
blowfish, crypt or leave blank for now default algorithm. */
// $servers->setValue('appearance','password_hash','md5');
@@ -30,9 +30,9 @@ diff -Nrbu phpldapadmin-1.2.0.3/config/config.php phpldapadmin-1.2.0.3-OK/config
/* 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
-@@ -368,6 +374,7 @@
+@@ -382,6 +388,7 @@
your LDAP server requires you to login to perform searches, you can enter the
- DN to use when searching in 'bind_id' and 'bind_pass' above.
+ DN to use when searching in 'bind_id' and 'bind_pass' above. */
// $servers->setValue('login','attr','dn');
+$servers->setValue('login','attr','uid');
diff --git a/phpldapadmin.spec b/phpldapadmin.spec
index 91d314c..593558d 100644
--- a/phpldapadmin.spec
+++ b/phpldapadmin.spec
@@ -1,15 +1,12 @@
Name: phpldapadmin
Summary: Web-based tool for managing LDAP servers
-Version: 1.2.0.5
-Release: 3%{?dist}
+Version: 1.2.1.1
+Release: 1%{?dist}
Group: Applications/Internet
License: GPLv2+
URL: http://phpldapadmin.sourceforge.net
Source: http://dl.sourceforge.net/sourceforge/phpldapadmin/phpldapadmin-%{version}.tgz
-Patch0: phpldapadmin-1.2.0.3-config.patch
-Patch1: phpldapadmin-1.2.0.5-addattr.patch
-Patch2: phpldapadmin-1.2.0.5-closecomment.patch
-Patch3: phpldapadmin-1.2.0.5-php53.patch
+Patch0: phpldapadmin-1.2.1.1-config.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch: noarch
@@ -40,9 +37,6 @@ access by remote web-clients.
cp config/config.php.example config/config.php
%patch0 -p1
-%patch1 -p1
-%patch2 -p1
-%patch3 -p1
%build
@@ -60,7 +54,7 @@ cp -a * $RPM_BUILD_ROOT%{_datadir}/%{name}
pushd $RPM_BUILD_ROOT%{_datadir}/%{name}
-rm -rf doc/ INSTALL LICENSE
+rm -rf doc/ INSTALL LICENSE config/config.php.example
rm -rf tools/
find locale -name "*.po" -print0 | xargs -0 rm -f
popd
@@ -115,13 +109,15 @@ fi
%defattr(-,root,root,-)
%config %dir %{_sysconfdir}/%{name}
%attr(640,root,apache) %config(noreplace) %{_sysconfdir}/%{name}/*.php
-%{_sysconfdir}/%{name}/*.example
%config(noreplace) %{_sysconfdir}/httpd/conf.d/*.conf
%{_datadir}/%{name}
-%doc INSTALL LICENSE
+%doc INSTALL LICENSE config/config.php.example
%changelog
+* Fri Jul 22 2011 Dmitry Butskoy <Dmitry at Butskoy.name> - 1.2.1.1-1
+- update to 1.2.1.1
+
* Wed Feb 09 2011 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.2.0.5-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
diff --git a/sources b/sources
index da519f0..832f5b5 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-d75f043686da4c1e333ca160b0d26c01 phpldapadmin-1.2.0.5.tgz
+9455d33186236059ea6c230841cb48b2 phpldapadmin-1.2.1.1.tgz
More information about the scm-commits
mailing list