SPECS: evolution-data-server.spec - restored lost changes on merge...

[freetz]

Author: freetz                       Date: Mon Sep  5 18:38:58 2005 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- restored lost changes on merge, fixed changelog mess

---- Files affected:
SPECS:
   evolution-data-server.spec (1.56 -> 1.57) 

---- Diffs:

================================================================
Index: SPECS/evolution-data-server.spec
diff -u SPECS/evolution-data-server.spec:1.56 SPECS/evolution-data-server.spec:1.57
--- SPECS/evolution-data-server.spec:1.56	Mon Sep  5 20:23:25 2005
+++ SPECS/evolution-data-server.spec	Mon Sep  5 20:38:50 2005
@@ -217,11 +217,14 @@
 %{_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
@@ -246,6 +249,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.57  2005/09/05 18:38:50  freetz
+- restored lost changes on merge, fixed changelog mess
+
 Revision 1.56  2005/09/05 18:23:25  freetz
 - merged from DEVEL and updated to 1.4.0
 
@@ -303,41 +309,41 @@
 Revision 1.50  2005/06/05 10:16:36  freetz
 - 1.2.3
 
-Revision %{basever}9  2005/04/29 18:48:37  qrczak
+Revision 1.49  2005/04/29 18:48:37  qrczak
 - evolution-data-server-gcc4.patch: a static function must have
   a prototype before it's called
 - Release 2
 
-Revision %{basever}8  2005/04/19 18:45:32  darekr
+Revision 1.48  2005/04/19 18:45:32  darekr
 - typo
 
-Revision %{basever}7  2005/04/13 15:40:27  paladine
+Revision 1.47  2005/04/13 15:40:27  paladine
 - updated to 1.2.2
 
-Revision %{basever}6  2005/04/12 19:23:21  freetz
+Revision 1.46  2005/04/12 19:23:21  freetz
 - reversed ldconfig changes
 
-Revision %{basever}5  2005/04/08 11:51:53  paladine
+Revision 1.45  2005/04/08 11:51:53  paladine
 - new style macros
 - STBR
 
-Revision %{basever}4  2005/04/06 00:08:57  paladine
+Revision 1.44  2005/04/06 00:08:57  paladine
 - proper R:
 
-Revision %{basever}3  2005/04/05 23:57:52  paladine
+Revision 1.43  2005/04/05 23:57:52  paladine
 - no GConf schemas so no R(post): GConf2 and no running
   %gconf_schema_install in %%post
 - run scrollkeeper-update in quiet mode
 - rel. 3
 
-Revision %{basever}2  2005/03/27 22:02:26  qboosh
+Revision 1.42  2005/03/27 22:02:26  qboosh
 - unified
 
-Revision %{basever}1  2005/03/27 08:44:23  averne
+Revision 1.41  2005/03/27 08:44:23  averne
 - added kerberos5 and ldap bconds
 - changes by Mariusz Krynski <mrk at sed.pl>
 
-Revision %{basever}0  2005/03/20 18:33:23  aflinta
+Revision 1.40  2005/03/20 18:33:23  aflinta
 - rebuild with howl 0.9.10, release 2
 
 Revision 1.39  2005/03/19 03:26:16  wrobell
@@ -365,7 +371,7 @@
 - updated to 1.1.5
 
 Revision 1.36.2.1  2005/02/07 16:16:06  grzegol
-- updated to 1.%{basever}.2
+- updated to 1.1.4.2
 
 Revision 1.36  2004/12/06 23:14:25  grzegol
 - updated to 1.0.3
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/evolution-data-server.spec?r1=1.56&r2=1.57&f=u