Author: glen Date: Sat Mar 5 20:31:03 2005 GMT
Module: SPECS Tag: HEAD
---- Log message:
- adapter friendly: define schemadir
- really apply schema horde.schema fix
- R: apache mod_access,mod_alias
---- Files affected:
SPECS:
horde.spec (1.84 -> 1.85)
---- Diffs:
================================================================
Index: SPECS/horde.spec
diff -u SPECS/horde.spec:1.84 SPECS/horde.spec:1.85
--- SPECS/horde.spec:1.84 Mon Feb 28 22:12:12 2005
+++ SPECS/horde.spec Sat Mar 5 21:30:58 2005
@@ -13,7 +13,7 @@
Summary(pt_BR): Componentes comuns do Horde usados por todos os módulos
Name: horde
Version: 3.0.3
-Release: 2.42
+Release: 2.50
License: LGPL
Vendor: The Horde Project
Group: Development/Languages/PHP
@@ -32,6 +32,8 @@
Requires(triggerpostun): sed >= 4.0
Requires: apache >= 1.3.33-3
Requires: apache(mod_dir) >= 1.3.22
+Requires: apache(mod_access)
+Requires: apache(mod_alias)
Requires: php >= 4.1.0
Requires: php-gettext >= 4.1.0
Requires: php-imap >= 4.1.0
@@ -57,6 +59,7 @@
%define _appdir %{hordedir}
%define _apache1dir /etc/apache
%define _apache2dir /etc/httpd
+%define schemadir /usr/share/openldap/schema
%define _php5 %(rpm -q php | awk -F- '{print $2}' |
awk -F. '{print $1}')
%if "%{_php5}" == "5"
@@ -98,7 +101,7 @@
Summary: Horde LDAP schema
Summary(pl): Schemat LDAP dla Horde
Group: Networking/Daemons
-Requires(post,postun): sed >= 4.0
+Requires(post,postun): sed >= 4.0
Requires: openldap-servers
%description -n openldap-schema-horde
@@ -113,6 +116,7 @@
%patch1 -p1
%patch2 -p1
%patch3 -p0
+%patch4 -p1
# Described in documentation as dangerous file...
rm test.php
@@ -123,7 +127,7 @@
$RPM_BUILD_ROOT%{_appdir}/{admin,js,services} \
$RPM_BUILD_ROOT%{_appdir}/{docs,lib,locale,templates,themes} \
$RPM_BUILD_ROOT/var/log/%{name} \
- $RPM_BUILD_ROOT/usr/share/openldap/schema
+ $RPM_BUILD_ROOT%{schemadir}
cp -pR *.php $RPM_BUILD_ROOT%{_appdir}
for i in config/*.php.dist; do
@@ -150,7 +154,7 @@
> $RPM_BUILD_ROOT/var/log/%{name}/%{name}.log
-install scripts/ldap/horde.schema $RPM_BUILD_ROOT/usr/share/openldap/schema
+install scripts/ldap/horde.schema $RPM_BUILD_ROOT%{schemadir}
%clean
rm -rf $RPM_BUILD_ROOT
@@ -219,12 +223,13 @@
fi
%post -n openldap-schema-horde
-if ! grep -q /usr/share/openldap/schema/horde.schema /etc/openldap/slapd.conf;
then
+if ! grep -q %{schemadir}/horde.schema /etc/openldap/slapd.conf; then
sed -i -e '
/^include.*local.schema/{
i\
-include /usr/share/openldap/schema/horde.schema
- }' /etc/openldap/slapd.conf
+include %{schemadir}/horde.schema
+ }
+ ' /etc/openldap/slapd.conf
fi
if [ -f /var/lock/subsys/ldap ]; then
@@ -233,7 +238,7 @@
%postun -n openldap-schema-horde
if [ "$1" = "0" ]; then
- if grep -q /usr/share/openldap/schema/horde.schema
/etc/openldap/slapd.conf; then
+ if grep -q %{schemadir}/horde.schema /etc/openldap/slapd.conf; then
sed -i -e '
/^include.*\/usr\/share\/openldap\/schema\/horde.schema/d
' /etc/openldap/slapd.conf
@@ -321,7 +326,7 @@
%files -n openldap-schema-horde
%defattr(644,root,root,755)
-/usr/share/openldap/schema/*.schema
+%{schemadir}/*.schema
%define date %(echo `LC_ALL="C" date +"%a %b %d %Y"`)
%changelog
@@ -329,11 +334,16 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.85 2005/03/05 20:30:58 glen
+- adapter friendly: define schemadir
+- really apply schema horde.schema fix
+- R: apache mod_access,mod_alias
+
Revision 1.84 2005/02/28 21:12:12 qboosh
- pl for schema package
Revision 1.83 2005/02/27 22:13:45 glen
-- fix openlda-schema-horde deps and postun script
+- fix openldap-schema-horde deps and postun script
- fix broken horde.schema (missing choraPrefs)
Revision 1.82 2005/02/27 20:40:22 glen
================================================================
---- CVS-web:
http://cvs.pld-linux.org/SPECS/horde.spec?r1=1.84&r2=1.85&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
