packages: phpldapadmin/phpldapadmin-paths.patch, phpldapadmin/phpldapadmin....

[gotar]

Author: gotar                        Date: Tue Aug 23 09:10:36 2011 GMT
Module: packages                      Tag: HEAD
---- Log message:
- upgraded to 1.2.1.1, 
- more specific License, more accurate Group,
- s/R/S/ webserver(indexfile) (access and alias are not obligate too),
- set open_basedir to %{_sysconfdir}:%{_appdir},
- packaged hooks directory

---- Files affected:
packages/phpldapadmin:
   phpldapadmin-paths.patch (1.1 -> 1.2) , phpldapadmin.spec (1.35 -> 1.36) 

---- Diffs:

================================================================
Index: packages/phpldapadmin/phpldapadmin-paths.patch
diff -u packages/phpldapadmin/phpldapadmin-paths.patch:1.1 packages/phpldapadmin/phpldapadmin-paths.patch:1.2
--- packages/phpldapadmin/phpldapadmin-paths.patch:1.1	Thu Apr  6 10:03:02 2006
+++ packages/phpldapadmin/phpldapadmin-paths.patch	Tue Aug 23 11:10:31 2011
@@ -6,6 +6,6 @@
  define('LANGDIR',sprintf('%s/',realpath(LIBDIR.'../locale/')));
 -define('CONFDIR',sprintf('%s/',realpath(LIBDIR.'../config')));
 +define('CONFDIR','/etc/webapps/phpldapadmin/');
+ define('QUERYDIR',sprintf('%s/',realpath(LIBDIR.'../queries/')));
  define('TMPLDIR',sprintf('%s/',realpath(LIBDIR.'../templates/')));
  define('DOCDIR',sprintf('%s/',realpath(LIBDIR.'../doc/')));
- define('HOOKSDIR',sprintf('%s/',realpath(LIBDIR.'../hooks/')));

================================================================
Index: packages/phpldapadmin/phpldapadmin.spec
diff -u packages/phpldapadmin/phpldapadmin.spec:1.35 packages/phpldapadmin/phpldapadmin.spec:1.36
--- packages/phpldapadmin/phpldapadmin.spec:1.35	Fri Jul 24 12:44:07 2009
+++ packages/phpldapadmin/phpldapadmin.spec	Tue Aug 23 11:10:31 2011
@@ -2,12 +2,12 @@
 Summary:	phpldapadmin - a web-based LDAP client
 Summary(pl.UTF-8):	phpldapadmin - klient WWW dla LDAP
 Name:		phpldapadmin
-Version:	1.1.0.6
+Version:	1.2.1.1
 Release:	1
-License:	GPL
-Group:		Applications/Networking
-Source0:	http://dl.sourceforge.net/phpldapadmin/%{name}-%{version}.tar.gz
-# Source0-md5:	f763977c46d09c5801d9af4ebde07a4f
+License:	GPL v2
+Group:		Applications/Databases/Interfaces
+Source0:	http://dl.sourceforge.net/phpldapadmin/%{name}-%{version}.tgz
+# Source0-md5:	9455d33186236059ea6c230841cb48b2
 Patch0:		%{name}-paths.patch
 URL:		http://phpldapadmin.sourceforge.net/
 BuildRequires:	rpmbuild(macros) >= 1.268
@@ -18,8 +18,8 @@
 Requires:	webapps
 Requires:	webserver(access)
 Requires:	webserver(alias)
-Requires:	webserver(indexfile)
 Requires:	webserver(php)
+Suggests:	webserver(indexfile)
 BuildArch:	noarch
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -55,8 +55,11 @@
 
 cat > apache.conf <<'EOF'
 Alias /ldapadmin %{_appdir}/htdocs
+
 <Directory %{_appdir}/htdocs>
-	allow from all
+	AllowOverride None
+	Allow from all
+	php_admin_value open_basedir "%{_sysconfdir}:%{_appdir}"
 </Directory>
 EOF
 
@@ -64,8 +67,7 @@
 rm -rf $RPM_BUILD_ROOT
 install -d $RPM_BUILD_ROOT{%{_sysconfdir},%{_appdir}}
 
-cp -a htdocs $RPM_BUILD_ROOT%{_appdir}
-cp -a lib locale templates $RPM_BUILD_ROOT%{_appdir}
+cp -a htdocs hooks lib locale queries templates $RPM_BUILD_ROOT%{_appdir}
 cp -a VERSION $RPM_BUILD_ROOT%{_appdir}
 cp -a config/config.php.example	$RPM_BUILD_ROOT%{_sysconfdir}/config.php
 cp -a apache.conf $RPM_BUILD_ROOT%{_sysconfdir}/apache.conf
@@ -101,6 +103,13 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.36  2011/08/23 09:10:31  gotar
+- upgraded to 1.2.1.1,
+- more specific License, more accurate Group,
+- s/R/S/ webserver(indexfile) (access and alias are not obligate too),
+- set open_basedir to %{_sysconfdir}:%{_appdir},
+- packaged hooks directory
+
 Revision 1.35  2009/07/24 10:44:07  glen
 - release 1
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/phpldapadmin/phpldapadmin-paths.patch?r1=1.1&r2=1.2&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/phpldapadmin/phpldapadmin.spec?r1=1.35&r2=1.36&f=u