[Libwpd-cvs] libwpd2 libwpd.spec.in,1.13,1.14

[Fridrich S. <str...@us...>]

Update of /cvsroot/libwpd/libwpd2
In directory sfp-cvsdas-2.v30.ch3.sourceforge.com:/tmp/cvs-serv24542

Modified Files:
	libwpd.spec.in 
Log Message:
Making the _readFontName private member function and making getFontName return const reference to the WPXString

Index: libwpd.spec.in
===================================================================
RCS file: /cvsroot/libwpd/libwpd2/libwpd.spec.in,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -d -r1.13 -r1.14
--- libwpd.spec.in	27 Jul 2008 20:00:04 -0000	1.13
+++ libwpd.spec.in	12 Jun 2010 10:39:58 -0000	1.14
@@ -13,6 +13,8 @@
 BuildRoot: %{_tmppath}/%{name}-%{version}-buildroot
 License: LGPL
 BuildRequires: gcc-c++, libstdc++-devel
+Provides: %{name}-@WPD_MAJOR_VERSION@_@WPD_MINOR_VERSION@-@WPD_MINOR_VERSION@
+Obsoletes: %{name}-@WPD_MAJOR_VERSION@_@WPD_MINOR_VERSION@-@WPD_MINOR_VERSION@ < %{version}-%{release}
 
 %description
 Library that handles Word Perfect documents.
@@ -38,8 +40,9 @@
 
 %if %{!?_without_docs:1}%{?_without_docs:0}
 %package docs
-Requires: libwpd
 BuildRequires: doxygen
+Provides: %{name}-devel-doc
+Obsoletes: %{name}-devel-doc < %{version}-%{release}
 Summary: Documentation of libwpd API
 Group: Development/Documentation
 
@@ -84,7 +87,7 @@
 %{_libdir}/libwpd*-@WPD_MAJOR_VERSION@.@WPD_MINOR_VERSION@.so
 #%{_libdir}/libwpd*-@WPD_MAJOR_VERSION@.@WPD_MINOR_VERSION@.*a
 %{_libdir}/pkgconfig/libwpd*-@WPD_MAJOR_VERSION@.@WPD_MINOR_VERSION@.pc
-%{_includedir}/libwpd-@WPD_MAJOR_VERSION@.@WPD_MINOR_VERSION@/libwpd
+%{_includedir}/libwpd-@WPD_MAJOR_VERSION@.@WPD_MINOR_VERSION@/libwpd*
 
 %if %{!?_without_docs:1}%{?_without_docs:0}
 %files docs