rpms/openchange/devel doxygen_to_devhelp.xsl, NONE, 1.1 openchange-0.9-generate-xml-doc.patch, NONE, 1.1 openchange.spec, 1.13, 1.14
Matthew Barnes
mbarnes at fedoraproject.org
Sat Jan 9 13:29:14 UTC 2010
Author: mbarnes
Update of /cvs/pkgs/rpms/openchange/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13786
Modified Files:
openchange.spec
Added Files:
doxygen_to_devhelp.xsl openchange-0.9-generate-xml-doc.patch
Log Message:
* Sat Jan 09 2010 Matthew Barnes <mbarnes at redhat.com> - 0.9-2
- Add a devel-docs subpackage (RH bug #552984).
--- NEW FILE doxygen_to_devhelp.xsl ---
<xsl:stylesheet
xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
xmlns:fo="http://www.w3.org/1999/XSL/Format"
version="1.0">
<xsl:output method="xml" version="1.0" indent="yes"/>
<xsl:param name="prefix"></xsl:param>
<xsl:param name="booktitle"></xsl:param>
<xsl:param name="bookpart"></xsl:param>
<xsl:template match="/">
<book title="OpenChange: {$booktitle}"
name="openchange-{$bookpart}"
link="index.html">
<functions>
<xsl:apply-templates select="doxygenindex/compound[@kind='file']/member[@kind='function']"/>
<xsl:apply-templates select="doxygenindex/compound[@kind='class']/member[@kind='function']"/>
</functions>
</book>
</xsl:template>
<xsl:template match="member">
<xsl:param name="name"><xsl:value-of select="name"/></xsl:param>
<xsl:param name="refid"><xsl:value-of select="@refid"/></xsl:param>
<xsl:param name="before"><xsl:value-of select="substring-before($refid,'_1')"/></xsl:param>
<xsl:param name="after"><xsl:value-of select="substring-after($refid,'_1')"/></xsl:param>
<xsl:param name="link"><xsl:value-of select="$before"/>.html#<xsl:value-of select="$after"/></xsl:param>
<xsl:if test="contains($refid, '_8c_')">
<function name="{$name}" link="{$prefix}{$link}"/>
</xsl:if>
</xsl:template>
</xsl:stylesheet>
openchange-0.9-generate-xml-doc.patch:
Doxyfile.in | 6 +++---
Makefile | 1 +
libmapi++/Doxyfile.in | 6 +++---
libmapi/Doxyfile.in | 6 +++---
libmapiadmin/Doxyfile.in | 6 +++---
libocpf/Doxyfile.in | 6 +++---
mapiproxy/Doxyfile.in | 6 +++---
utils/mapitest/Doxyfile.in | 6 +++---
8 files changed, 22 insertions(+), 21 deletions(-)
--- NEW FILE openchange-0.9-generate-xml-doc.patch ---
diff -up libmapi-0.8.2-ROMULUS/Doxyfile.in.xml-doc libmapi-0.8.2-ROMULUS/Doxyfile.in
--- libmapi-0.8.2-ROMULUS/Doxyfile.in.xml-doc 2008-04-02 13:16:12.000000000 +0200
+++ libmapi-0.8.2-ROMULUS/Doxyfile.in 2010-01-06 19:12:49.000000000 +0100
@@ -231,7 +231,7 @@ SUBGROUPING = YES
# Private class members and static file members will be hidden unless
# the EXTRACT_PRIVATE and EXTRACT_STATIC tags are set to YES
-EXTRACT_ALL = NO
+EXTRACT_ALL = YES
# If the EXTRACT_PRIVATE tag is set to YES all private members of a class
# will be included in the documentation.
@@ -925,13 +925,13 @@ MAN_LINKS = YES
# generate an XML file that captures the structure of
# the code including all documentation.
-GENERATE_XML = NO
+GENERATE_XML = YES
# The XML_OUTPUT tag is used to specify where the XML pages will be put.
# If a relative path is entered the value of OUTPUT_DIRECTORY will be
# put in front of it. If left blank `xml' will be used as the default path.
-XML_OUTPUT = xml
+XML_OUTPUT = xml/overview
# The XML_SCHEMA tag can be used to specify an XML schema,
# which can be used by a validating XML parser to check the
diff -up libmapi-0.8.2-ROMULUS/libmapiadmin/Doxyfile.in.xml-doc libmapi-0.8.2-ROMULUS/libmapiadmin/Doxyfile.in
--- libmapi-0.8.2-ROMULUS/libmapiadmin/Doxyfile.in.xml-doc 2008-09-13 07:11:06.000000000 +0200
+++ libmapi-0.8.2-ROMULUS/libmapiadmin/Doxyfile.in 2010-01-06 19:13:04.000000000 +0100
@@ -231,7 +231,7 @@ SUBGROUPING = YES
# Private class members and static file members will be hidden unless
# the EXTRACT_PRIVATE and EXTRACT_STATIC tags are set to YES
-EXTRACT_ALL = NO
+EXTRACT_ALL = YES
# If the EXTRACT_PRIVATE tag is set to YES all private members of a class
# will be included in the documentation.
@@ -923,13 +923,13 @@ MAN_LINKS = YES
# generate an XML file that captures the structure of
# the code including all documentation.
-GENERATE_XML = NO
+GENERATE_XML = YES
# The XML_OUTPUT tag is used to specify where the XML pages will be put.
# If a relative path is entered the value of OUTPUT_DIRECTORY will be
# put in front of it. If left blank `xml' will be used as the default path.
-XML_OUTPUT = xml
+XML_OUTPUT = xml/libmapiadmin
# The XML_SCHEMA tag can be used to specify an XML schema,
# which can be used by a validating XML parser to check the
diff -up libmapi-0.8.2-ROMULUS/libmapi/Doxyfile.in.xml-doc libmapi-0.8.2-ROMULUS/libmapi/Doxyfile.in
--- libmapi-0.8.2-ROMULUS/libmapi/Doxyfile.in.xml-doc 2008-09-10 13:23:14.000000000 +0200
+++ libmapi-0.8.2-ROMULUS/libmapi/Doxyfile.in 2010-01-06 19:12:42.000000000 +0100
@@ -231,7 +231,7 @@ SUBGROUPING = YES
# Private class members and static file members will be hidden unless
# the EXTRACT_PRIVATE and EXTRACT_STATIC tags are set to YES
-EXTRACT_ALL = NO
+EXTRACT_ALL = YES
# If the EXTRACT_PRIVATE tag is set to YES all private members of a class
# will be included in the documentation.
@@ -929,13 +929,13 @@ MAN_LINKS = YES
# generate an XML file that captures the structure of
# the code including all documentation.
-GENERATE_XML = NO
+GENERATE_XML = YES
# The XML_OUTPUT tag is used to specify where the XML pages will be put.
# If a relative path is entered the value of OUTPUT_DIRECTORY will be
# put in front of it. If left blank `xml' will be used as the default path.
-XML_OUTPUT = xml
+XML_OUTPUT = xml/libmapi
# The XML_SCHEMA tag can be used to specify an XML schema,
# which can be used by a validating XML parser to check the
diff -up libmapi-0.8.2-ROMULUS/libmapi++/Doxyfile.in.xml-doc libmapi-0.8.2-ROMULUS/libmapi++/Doxyfile.in
--- libmapi-0.8.2-ROMULUS/libmapi++/Doxyfile.in.xml-doc 2008-12-14 03:27:25.000000000 +0100
+++ libmapi-0.8.2-ROMULUS/libmapi++/Doxyfile.in 2010-01-06 19:12:57.000000000 +0100
@@ -231,7 +231,7 @@ SUBGROUPING = YES
# Private class members and static file members will be hidden unless
# the EXTRACT_PRIVATE and EXTRACT_STATIC tags are set to YES
-EXTRACT_ALL = NO
+EXTRACT_ALL = YES
# If the EXTRACT_PRIVATE tag is set to YES all private members of a class
# will be included in the documentation.
@@ -908,13 +908,13 @@ MAN_LINKS = YES
# generate an XML file that captures the structure of
# the code including all documentation.
-GENERATE_XML = NO
+GENERATE_XML = YES
# The XML_OUTPUT tag is used to specify where the XML pages will be put.
# If a relative path is entered the value of OUTPUT_DIRECTORY will be
# put in front of it. If left blank `xml' will be used as the default path.
-XML_OUTPUT = xml
+XML_OUTPUT = xml/libmapi++
# The XML_SCHEMA tag can be used to specify an XML schema,
# which can be used by a validating XML parser to check the
diff -up libmapi-0.8.2-ROMULUS/libocpf/Doxyfile.in.xml-doc libmapi-0.8.2-ROMULUS/libocpf/Doxyfile.in
--- libmapi-0.8.2-ROMULUS/libocpf/Doxyfile.in.xml-doc 2008-09-10 13:23:14.000000000 +0200
+++ libmapi-0.8.2-ROMULUS/libocpf/Doxyfile.in 2010-01-06 19:13:12.000000000 +0100
@@ -231,7 +231,7 @@ SUBGROUPING = YES
# Private class members and static file members will be hidden unless
# the EXTRACT_PRIVATE and EXTRACT_STATIC tags are set to YES
-EXTRACT_ALL = NO
+EXTRACT_ALL = YES
# If the EXTRACT_PRIVATE tag is set to YES all private members of a class
# will be included in the documentation.
@@ -927,13 +927,13 @@ MAN_LINKS = YES
# generate an XML file that captures the structure of
# the code including all documentation.
-GENERATE_XML = NO
+GENERATE_XML = YES
# The XML_OUTPUT tag is used to specify where the XML pages will be put.
# If a relative path is entered the value of OUTPUT_DIRECTORY will be
# put in front of it. If left blank `xml' will be used as the default path.
-XML_OUTPUT = xml
+XML_OUTPUT = xml/libocpf
# The XML_SCHEMA tag can be used to specify an XML schema,
# which can be used by a validating XML parser to check the
diff -up libmapi-0.8.2-ROMULUS/Makefile.xml-doc libmapi-0.8.2-ROMULUS/Makefile
--- libmapi-0.8.2-ROMULUS/Makefile.xml-doc 2009-03-02 11:27:03.000000000 +0100
+++ libmapi-0.8.2-ROMULUS/Makefile 2010-01-06 18:18:45.000000000 +0100
@@ -1422,6 +1422,7 @@ doxygen:
echo "Doxify API documentation: HTML and man pages"; \
mkdir -p apidocs/html; \
mkdir -p apidocs/man; \
+ mkdir -p apidocs/xml; \
$(DOXYGEN) Doxyfile; \
$(DOXYGEN) libmapi/Doxyfile; \
$(DOXYGEN) libmapiadmin/Doxyfile; \
diff -up libmapi-0.8.2-ROMULUS/mapiproxy/Doxyfile.in.xml-doc libmapi-0.8.2-ROMULUS/mapiproxy/Doxyfile.in
--- libmapi-0.8.2-ROMULUS/mapiproxy/Doxyfile.in.xml-doc 2009-01-05 11:42:44.000000000 +0100
+++ libmapi-0.8.2-ROMULUS/mapiproxy/Doxyfile.in 2010-01-06 19:13:21.000000000 +0100
@@ -286,7 +286,7 @@ SYMBOL_CACHE_SIZE = 0
# Private class members and static file members will be hidden unless
# the EXTRACT_PRIVATE and EXTRACT_STATIC tags are set to YES
-EXTRACT_ALL = NO
+EXTRACT_ALL = YES
# If the EXTRACT_PRIVATE tag is set to YES all private members of a class
# will be included in the documentation.
@@ -1113,13 +1113,13 @@ MAN_LINKS = YES
# generate an XML file that captures the structure of
# the code including all documentation.
-GENERATE_XML = NO
+GENERATE_XML = YES
# The XML_OUTPUT tag is used to specify where the XML pages will be put.
# If a relative path is entered the value of OUTPUT_DIRECTORY will be
# put in front of it. If left blank `xml' will be used as the default path.
-XML_OUTPUT = xml
+XML_OUTPUT = xml/mapiproxy
# The XML_SCHEMA tag can be used to specify an XML schema,
# which can be used by a validating XML parser to check the
diff -up libmapi-0.8.2-ROMULUS/utils/mapitest/Doxyfile.in.xml-doc libmapi-0.8.2-ROMULUS/utils/mapitest/Doxyfile.in
--- libmapi-0.8.2-ROMULUS/utils/mapitest/Doxyfile.in.xml-doc 2008-12-14 03:27:25.000000000 +0100
+++ libmapi-0.8.2-ROMULUS/utils/mapitest/Doxyfile.in 2010-01-06 19:13:28.000000000 +0100
@@ -231,7 +231,7 @@ SUBGROUPING = YES
# Private class members and static file members will be hidden unless
# the EXTRACT_PRIVATE and EXTRACT_STATIC tags are set to YES
-EXTRACT_ALL = NO
+EXTRACT_ALL = YES
# If the EXTRACT_PRIVATE tag is set to YES all private members of a class
# will be included in the documentation.
@@ -921,13 +921,13 @@ MAN_LINKS = YES
# generate an XML file that captures the structure of
# the code including all documentation.
-GENERATE_XML = NO
+GENERATE_XML = YES
# The XML_OUTPUT tag is used to specify where the XML pages will be put.
# If a relative path is entered the value of OUTPUT_DIRECTORY will be
# put in front of it. If left blank `xml' will be used as the default path.
-XML_OUTPUT = xml
+XML_OUTPUT = xml/mapitest
# The XML_SCHEMA tag can be used to specify an XML schema,
# which can be used by a validating XML parser to check the
Index: openchange.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openchange/devel/openchange.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- openchange.spec 9 Jan 2010 01:32:24 -0000 1.13
+++ openchange.spec 9 Jan 2010 13:29:13 -0000 1.14
@@ -10,12 +10,13 @@
Name: openchange
Version: 0.9
-Release: 1%{?dist}
+Release: 2%{?dist}
Group: Applications/System
Summary: Provides access to Microsoft Exchange servers using native protocols
License: GPLv3+ and Public Domain
URL: http://www.openchange.org/
Source0: http://downloads.sourceforge.net/openchange/openchange-%{version}-%{nickname}.tar.gz
+Source1: doxygen_to_devhelp.xsl
BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
### Build Dependencies ###
@@ -28,6 +29,7 @@ BuildRequires: libldb-devel
BuildRequires: libtalloc-devel >= %{talloc_version}
BuildRequires: libtdb-devel
BuildRequires: pkgconfig
+BuildRequires: libxslt
BuildRequires: popt-devel
BuildRequires: python-devel
BuildRequires: samba4-devel >= %{samba4_version}
@@ -39,11 +41,15 @@ BuildRequires: zlib-devel
# OpenChange's libmapi conflicts with Zarafa's libmapi.
# Zarafa is older than OpenChange, so it wins.
-Patch1: libmapi-0.8.2-libmapi-conflict.patch
+Patch0: libmapi-0.8.2-libmapi-conflict.patch
+
+# RH bug #552984
+Patch1: openchange-0.9-generate-xml-doc.patch
%description
OpenChange provides libraries to access Microsoft Exchange servers
using native protocols.
+Requires: devhelp
%package devel
Summary: Developer tools for OpenChange libraries
@@ -55,6 +61,14 @@ This package provides the development to
OpenChange, providing libraries to access Microsoft Exchange servers
using native protocols.
+%package devel-docs
+Summary: Developer documentation for OpenChange libraries
+Group: Development/Libraries
+Requires: openchange = %{version}-%{release}
+
+%description devel-docs
+This package contains developer documentation for Openchange.
+
%package client
Summary: User tools for OpenChange libraries
Group: Applications/System
@@ -83,7 +97,8 @@ This package provides the server element
%prep
%setup -q -n %{name}-%{version}-%{nickname}
-%patch1 -p1 -b .libmapi-conflict
+%patch0 -p1 -b .libmapi-conflict
+%patch1 -p1 -b .generate-xml-doc
%build
%configure
@@ -92,6 +107,13 @@ This package provides the server element
make
make doxygen
+xsltproc -o openchange-libmapi.devhelp --stringparam "booktitle" "MAPI client library (libmapi)" --stringparam "bookpart" "libmapi" %{SOURCE1} apidocs/xml/libmapi/index.xml
+xsltproc -o openchange-libmapiadmin.devhelp --stringparam "booktitle" "MAPI administration libraries (libmapiadmin)" --stringparam "bookpart" "libmapiadmin" %{SOURCE1} apidocs/xml/libmapiadmin/index.xml
+xsltproc -o openchange-libocpf.devhelp --stringparam "booktitle" "OpenChange Property Files (libocpf)" --stringparam "bookpart" "libocpf" %{SOURCE1} apidocs/xml/libocpf/index.xml
+xsltproc -o openchange-mapitest.devhelp --stringparam "booktitle" "MA regression test framework (mapitest)" --stringparam "bookpart" "mapitest" %{SOURCE1} apidocs/xml/mapitest/index.xml
+xsltproc -o openchange-mapiproxy.devhelp --stringparam "booktitle" "MAPIProxy project (mapiproxy)" --stringparam "bookpart" "mapiproxy" %{SOURCE1} apidocs/xml/mapiproxy/index.xml
+xsltproc -o openchange-libmapi++.devhelp --stringparam "booktitle" "C++ bindings for libmapi (libmapi++)" --stringparam "bookpart" "libmapi++" %{SOURCE1} apidocs/xml/libmapi++/index.xml
+
%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT
@@ -112,6 +134,30 @@ mkdir $RPM_BUILD_ROOT%{_mandir}
cp -r doc/man/man1 $RPM_BUILD_ROOT%{_mandir}
cp -r apidocs/man/man3 $RPM_BUILD_ROOT%{_mandir}
+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
+
+mkdir -p $RPM_BUILD_ROOT%{_datadir}/devhelp/books/openchange-libmapiadmin
+cp openchange-libmapiadmin.devhelp $RPM_BUILD_ROOT%{_datadir}/devhelp/books/openchange-libmapiadmin
+cp -r apidocs/html/libmapiadmin/* $RPM_BUILD_ROOT%{_datadir}/devhelp/books/openchange-libmapiadmin
+
+mkdir -p $RPM_BUILD_ROOT%{_datadir}/devhelp/books/openchange-libocpf
+cp openchange-libocpf.devhelp $RPM_BUILD_ROOT%{_datadir}/devhelp/books/openchange-libocpf
+cp -r apidocs/html/libocpf/* $RPM_BUILD_ROOT%{_datadir}/devhelp/books/openchange-libocpf
+
+mkdir -p $RPM_BUILD_ROOT%{_datadir}/devhelp/books/openchange-mapitest
+cp openchange-mapitest.devhelp $RPM_BUILD_ROOT%{_datadir}/devhelp/books/openchange-mapitest
+cp -r apidocs/html/mapitest/* $RPM_BUILD_ROOT%{_datadir}/devhelp/books/openchange-mapitest
+
+mkdir -p $RPM_BUILD_ROOT%{_datadir}/devhelp/books/openchange-mapiproxy
+cp openchange-mapiproxy.devhelp $RPM_BUILD_ROOT%{_datadir}/devhelp/books/openchange-mapiproxy
+cp -r apidocs/html/mapiproxy/* $RPM_BUILD_ROOT%{_datadir}/devhelp/books/openchange-mapiproxy
+
+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++
+
%clean
rm -rf $RPM_BUILD_ROOT
@@ -128,14 +174,18 @@ rm -rf $RPM_BUILD_ROOT
%files devel
%defattr(-,root,root,-)
+%{_includedir}/*
%{_libdir}/*.so
%{_libdir}/pkgconfig/*
-%{_includedir}/*
+%{_mandir}/man3/*
%doc apidocs/html/libmapi
%doc apidocs/html/libocpf
%doc apidocs/html/overview
%doc apidocs/html/index.html
-%{_mandir}/man3/*
+
+%files devel-docs
+%defattr(-,root,root,-)
+%doc %{_datadir}/devhelp/books/*
%files client
%defattr(-,root,root,-)
@@ -153,6 +203,9 @@ rm -rf $RPM_BUILD_ROOT
%{_libdir}/mapistore_backends/mapistore_sqlite3.so
%changelog
+* Sat Jan 09 2010 Matthew Barnes <mbarnes at redhat.com> - 0.9-2
+- Add a devel-docs subpackage (RH bug #552984).
+
* Sat Dec 26 2009 Matthew Barnes <mbarnes at redhat.com> - 0.9-1
- Update to 0.9 (COCHRANE)
- Bump samba4 requirement to alpha10.
More information about the fedora-extras-commits
mailing list