- restored lost changes on merge, fixed changelog mess

Changed files:
    evolution-data-server.spec -> 1.57

diff --git a/evolution-data-server.spec b/evolution-data-server.spec
index f96edc53bd55359cbe4fea52d963762dd0f44a52..8e8f8361c9386d057ff725fd3944809674f8b087 100644 (file)
--- a/evolution-data-server.spec
+++ b/evolution-data-server.spec
@@ -216,11 +216,14 @@ fi
 %{_libdir}/bonobo/servers/*
 %{_datadir}/idl/*
 
+%if %{with ldap}
+%{_datadir}/%{name}-%{mver}/*.schema
+%endif
+
 %dir %{_datadir}/%{name}-%{basever}
 %{_datadir}/%{name}-%{basever}/glade
 %{_datadir}/%{name}-%{basever}/weather
 %{_datadir}/%{name}-%{basever}/zoneinfo
-%{_datadir}/%{name}-%{basever}/*.schema
 %{_pixmapsdir}/%{name}-%{basever}
 
 %files -n openldap-schema-evolutionperson