- use %openldap_schema_{un,}register macros

[packages/evolution-data-server.git] / evolution-data-server.spec

diff --git a/evolution-data-server.spec b/evolution-data-server.spec
index 093b37a7aaa2981f2182eec0daa68dc485804c77..0f9fd7bbe4a662cbd6aed4c9278740b22b1080d4 100644 (file)
--- a/evolution-data-server.spec
+++ b/evolution-data-server.spec
@@ -11,18 +11,18 @@
 Summary:       Evolution data server
 Summary(pl):   Serwer danych Evolution
 Name:          evolution-data-server
-Version:       1.6.0
-Release:       2
+Version:       1.6.1
+Release:       3
 License:       GPL
 Group:         Libraries
 Source0:       http://ftp.gnome.org/pub/gnome/sources/evolution-data-server/1.6/%{name}-%{version}.tar.bz2
-# Source0-md5: 1d775148a4f88559cb375924b9f7b79f
+# Source0-md5: d4def6cad1dc3508b8df55e7e794db49
 Patch0:                %{name}-system_db.patch
 Patch1:                %{name}-GG-IM.patch
 Patch2:                %{name}-workaround-cal-backend-leak.patch
 Patch3:                %{name}-gcc4.patch
 URL:           http://www.ximian.com/products/ximian_evolution/
-BuildRequires: ORBit2-devel >= 1:2.12.1
+BuildRequires: ORBit2-devel >= 1:2.14.0
 BuildRequires: autoconf >= 2.52
 BuildRequires: automake
 BuildRequires: bison
@@ -31,15 +31,15 @@ BuildRequires:      gnome-common >= 2.8.0
 %{?with_kerberos5:BuildRequires:       heimdal-devel >= 0.7}
 BuildRequires: intltool
 BuildRequires: libglade2-devel >= 1:2.5.1
-BuildRequires: libgnomeui-devel >= 2.11.2-2
-BuildRequires: libsoup-devel >= 2.2.5
+BuildRequires: libgnomeui-devel >= 2.14.0
+BuildRequires: libsoup-devel >= 2.2.92
 BuildRequires: libstdc++-devel
 BuildRequires: libtool
 BuildRequires: nspr-devel
 BuildRequires: nss-devel
 %{?with_ldap:BuildRequires:    openldap-devel >= 2.3.0}
 BuildRequires: pkgconfig
-BuildRequires: rpmbuild(macros) >= 1.197
+BuildRequires: rpmbuild(macros) >= 1.304
 Requires(post,postun): scrollkeeper
 Requires:      %{name}-libs = %{version}-%{release}
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -69,6 +69,7 @@ Ten pakiet zawiera evolutionperson.schema dla serwera openldap.
 Summary:       Evolution Data Server library
 Summary(pl):   Biblioteka Evolution Data Server
 Group:         Libraries
+Requires:      libgnomeui >= 2.14.0
 Requires:      libsoup >= 2.2.3
 
 %description libs
@@ -84,14 +85,14 @@ Group:              Development/Libraries
 Requires:      %{name}-libs = %{version}-%{release}
 %{?with_kerberos5:Requires:    heimdal-devel >= 0.7}
 # for all but libegroupwise
-Requires:      GConf2-devel >= 2.10.0
-Requires:      ORBit2-devel >= 1:2.12.1
+Requires:      GConf2-devel >= 2.14.0
+Requires:      ORBit2-devel >= 1:2.14.0
 Requires:      glib2-devel >= 1:2.6.4
-Requires:      libbonobo-devel >= 2.8.1
-Requires:      libgnomeui-devel >= 2.11.2-2
+Requires:      libbonobo-devel >= 2.14.0
+Requires:      libgnomeui-devel >= 2.14.0
 Requires:      libxml2-devel
 # for libegroupwise
-Requires:      libsoup-devel >= 2.2.5
+Requires:      libsoup-devel >= 2.2.92
 
 %description devel
 This package contains the files necessary to develop applications
@@ -185,30 +186,13 @@ rm -rf $RPM_BUILD_ROOT
 %postun        libs -p /sbin/ldconfig
 
 %post -n openldap-schema-evolutionperson
-if ! grep -q %{schemadir}/evolutionperson.schema /etc/openldap/slapd.conf; then
-       sed -i -e '
-               /^include.*local.schema/{
-                       i\
-include                %{schemadir}/evolutionperson.schema
-               }
-       ' /etc/openldap/slapd.conf
-fi
-
-if [ -f /var/lock/subsys/ldap ]; then
-       /etc/rc.d/init.d/ldap restart >&2
-fi
+%openldap_schema_register %{schemadir}/evolutionperson.schema
+%service -q ldap restart
 
 %postun -n openldap-schema-evolutionperson
 if [ "$1" = "0" ]; then
-       if grep -q %{schemadir}/evolutionperson.schema /etc/openldap/slapd.conf; then
-               sed -i -e '
-               /^include.*\/usr\/share\/openldap\/schema\/evolutionperson.schema/d
-               ' /etc/openldap/slapd.conf
-       fi
-
-       if [ -f /var/lock/subsys/ldap ]; then
-               /etc/rc.d/init.d/ldap restart >&2 || :
-       fi
+       %openldap_schema_unregister %{schemadir}/evolutionperson.schema
+       %service -q ldap restart
 fi
 
 %files -f %{name}.lang