From fc27d4b9fec715438b61c2e25ac73d72a770050a Mon Sep 17 00:00:00 2001 From: Thomas Vander Stichele Date: Sun, 18 May 2003 15:08:17 +0000 Subject: [PATCH] gtk-doc fixes Original commit message from CVS: gtk-doc fixes --- configure.ac | 1 - gstreamer.spec.in | 17 +++++------------ 2 files changed, 5 insertions(+), 13 deletions(-) diff --git a/configure.ac b/configure.ac index 23555181db..59c3f03dcc 100644 --- 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 27424afa5e..faaaf56090 100644 --- 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 +- devhelp files are now generated by gtk-doc, changed accordingly + * Sun Mar 16 2003 Christian F.K. Schaller - Add gthread scheduler