rpms/openchange/F-13 openchange.spec,1.14,1.15

[Matthew Barnes]

Author: mbarnes

Update of /cvs/pkgs/rpms/openchange/F-13
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv15320

Modified Files:
	openchange.spec 
Log Message:

* Mon May 24 2010 Matthew Barnes <mbarnes at redhat.com> - 0.9.3
- Avoid a file conflict with man-pages package.



Index: openchange.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openchange/F-13/openchange.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -p -r1.14 -r1.15
--- openchange.spec	9 Jan 2010 13:29:13 -0000	1.14
+++ openchange.spec	24 May 2010 12:05:57 -0000	1.15
@@ -10,7 +10,7 @@
 
 Name: openchange
 Version: 0.9
-Release: 2%{?dist}
+Release: 3%{?dist}
 Group: Applications/System
 Summary: Provides access to Microsoft Exchange servers using native protocols
 License: GPLv3+ and Public Domain
@@ -134,6 +134,10 @@ mkdir $RPM_BUILD_ROOT%{_mandir}
 cp -r doc/man/man1 $RPM_BUILD_ROOT%{_mandir}
 cp -r apidocs/man/man3 $RPM_BUILD_ROOT%{_mandir}
 
+# Avoid a file conflict with man-pages package.
+# Page is still reachable as "mapi_obj_bookmark".
+rm -rf $RPM_BUILD_ROOT%{_mandir}/man3/index.3.gz
+
 mkdir -p $RPM_BUILD_ROOT%{_datadir}/devhelp/books/openchange-libmapi
 cp openchange-libmapi.devhelp $RPM_BUILD_ROOT%{_datadir}/devhelp/books/openchange-libmapi
 cp -r apidocs/html/libmapi/* $RPM_BUILD_ROOT%{_datadir}/devhelp/books/openchange-libmapi
@@ -203,6 +207,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/mapistore_backends/mapistore_sqlite3.so
 
 %changelog
+* Mon May 24 2010 Matthew Barnes <mbarnes at redhat.com> - 0.9.3
+- Avoid a file conflict with man-pages package.
+
 * Sat Jan 09 2010 Matthew Barnes <mbarnes at redhat.com> - 0.9-2
 - Add a devel-docs subpackage (RH bug #552984).