gtk-doc fixes

Original commit message from CVS:
gtk-doc fixes

diff --git a/configure.ac b/configure.ac
index 2355518..59c3f03 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -553,7 +553,6 @@ examples/typefind/Makefile
 examples/xml/Makefile
 tools/Makefile
 docs/Makefile
-docs/devhelp/Makefile
 docs/faq/Makefile
 docs/gst/Makefile
 docs/gst/gstreamer.types

diff --git a/gstreamer.spec.in b/gstreamer.spec.in
index 27424af..faaaf56 100644 (file)
--- a/gstreamer.spec.in
+++ b/gstreamer.spec.in
@@ -112,10 +112,6 @@ fi
 
 %install  
 [ -n "$RPM_BUILD_ROOT" -a "$RPM_BUILD_ROOT" != / ] && rm -rf $RPM_BUILD_ROOT
-# adding devhelp stuff here for now, need to integrate better
-# when devhelp allows it
-mkdir -p $RPM_BUILD_ROOT/usr/share/devhelp/specs
-cp $RPM_BUILD_DIR/%{name}-%{version}/docs/devhelp/*.devhelp $RPM_BUILD_ROOT/usr/share/devhelp/specs
 
 %makeinstall
 # Clean out files that should not be part of the rpm. 
@@ -133,12 +129,6 @@ rm -f $RPM_BUILD_ROOT%{_libdir}/*.la
 /sbin/ldconfig
 %{_bindir}/gst-register --gst-mask=0 > /dev/null 2> /dev/null
 
-%post devel
-# adding devhelp links to work around different base not working
-mkdir -p %{_datadir}/devhelp/books
-ln -sf %{_datadir}/gtk-doc/html/gstreamer %{_datadir}/devhelp/books
-ln -sf %{_datadir}/gtk-doc/html/gstreamer-libs %{_datadir}/devhelp/books
-
 %postun
 /sbin/ldconfig
 
@@ -211,6 +201,7 @@ ln -sf %{_datadir}/gtk-doc/html/gstreamer-libs %{_datadir}/devhelp/books
 #  then we catch the rest with *, you can safely ignore the errors from this
 ## gstreamer API
 %dir %{_datadir}/gtk-doc/html/%{name}-%{majorminor}
+%{_datadir}/gtk-doc/html/%{name}-%{majorminor}/%{name}-%{majorminor}.devhelp
 %{_datadir}/gtk-doc/html/%{name}-%{majorminor}/autopluggers.html
 %{_datadir}/gtk-doc/html/%{name}-%{majorminor}/book1.html
 %{_datadir}/gtk-doc/html/%{name}-%{majorminor}/element-types.html
@@ -249,6 +240,7 @@ ln -sf %{_datadir}/gtk-doc/html/gstreamer-libs %{_datadir}/devhelp/books
 %{_datadir}/gtk-doc/html/%{name}-%{majorminor}/index.sgml
 ## gstreamer-libs API
 %dir %{_datadir}/gtk-doc/html/%{name}-libs-%{majorminor}
+%{_datadir}/gtk-doc/html/%{name}-%{majorminor}/%{name}-libs-%{majorminor}.devhelp
 %{_datadir}/gtk-doc/html/%{name}-libs-%{majorminor}/book1.html
 %{_datadir}/gtk-doc/html/%{name}-libs-%{majorminor}/%{name}-libs-gstcolorspace.html
 %{_datadir}/gtk-doc/html/%{name}-libs-%{majorminor}/%{name}-libs-gstgetbits.html
@@ -256,11 +248,12 @@ ln -sf %{_datadir}/gtk-doc/html/gstreamer-libs %{_datadir}/devhelp/books
 %{_datadir}/gtk-doc/html/%{name}-libs-%{majorminor}/index.sgml
 ## this catches all of the rest of the docs we might have forgotten
 %{_datadir}/gtk-doc/html/*
-%{_datadir}/devhelp/specs/%{name}-%{majorminor}.devhelp
-%{_datadir}/devhelp/specs/%{name}-libs-%{majorminor}.devhelp
 
 
 %changelog
+* Sun May 18 2003 Thomas Vander Stichele <thomas at apestaart dot org>
+- devhelp files are now generated by gtk-doc, changed accordingly
+
 * Sun Mar 16 2003 Christian F.K. Schaller <Uraeus@gnome.org>
 - Add gthread scheduler