Author: glen Date: Sun Feb 27 22:13:50 2005 GMT
Module: SPECS Tag: HEAD
---- Log message:
- fix openlda-schema-horde deps and postun script
- fix broken horde.schema (missing choraPrefs)
---- Files affected:
SPECS:
horde.spec (1.82 -> 1.83)
---- Diffs:
================================================================
Index: SPECS/horde.spec
diff -u SPECS/horde.spec:1.82 SPECS/horde.spec:1.83
--- SPECS/horde.spec:1.82 Sun Feb 27 21:40:22 2005
+++ SPECS/horde.spec Sun Feb 27 23:13:45 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.40
+Release: 2.42
License: LGPL
Vendor: The Horde Project
Group: Development/Languages/PHP
@@ -24,6 +24,7 @@
Patch1: %{name}-shell.disabled.patch
Patch2: %{name}-util-h3.patch
Patch3: %{name}-blank-admins.patch
+Patch4: %{name}-ldap-choraprefs.patch
URL: http://www.horde.org/
BuildRequires: rpmbuild(macros) >= 1.177
BuildRequires: rpm-php-pearprov >= 4.0.2-98
@@ -96,7 +97,7 @@
%package -n openldap-schema-horde
Summary: Horde LDAP schema
Group: Networking/Daemons
-Requires(post,pre): sed >= 4.0
+Requires(post,postun): sed >= 4.0
Requires: openldap-servers
%description -n openldap-schema-horde
@@ -226,15 +227,17 @@
/etc/rc.d/init.d/ldap restart >&2
fi
-%preun -n openldap-schema-horde
-if grep -q /usr/share/openldap/schema/horde.schema /etc/openldap/slapd.conf;
then
- sed -i -e '
- /^include.*\/usr\/share\/openldap\/schema\/horde.schema/d
- ' /etc/openldap/slapd.conf
-fi
+%postun -n openldap-schema-horde
+if [ "$1" = "0" ]; then
+ if grep -q /usr/share/openldap/schema/horde.schema
/etc/openldap/slapd.conf; then
+ sed -i -e '
+ /^include.*\/usr\/share\/openldap\/schema\/horde.schema/d
+ ' /etc/openldap/slapd.conf
+ fi
-if [ -f /var/lock/subsys/ldap ]; then
- /etc/rc.d/init.d/ldap restart >&2 || :
+ if [ -f /var/lock/subsys/ldap ]; then
+ /etc/rc.d/init.d/ldap restart >&2 || :
+ fi
fi
%triggerpostun -- horde <= 2.2.7-2
@@ -322,6 +325,10 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.83 2005/02/27 22:13:45 glen
+- fix openlda-schema-horde deps and postun script
+- fix broken horde.schema (missing choraPrefs)
+
Revision 1.82 2005/02/27 20:40:22 glen
- create openldap-schema-horde package
================================================================
---- CVS-web:
http://cvs.pld-linux.org/SPECS/horde.spec?r1=1.82&r2=1.83&f=u
_______________________________________________
pld-cvs-commit mailing list
pld-cvs-commit@pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
