this contains fixed needed to once again build rpms of CVS head. It disables doc building, dists the po stuff (not th...

Original commit message from CVS:
this contains fixed needed to once again build rpms of CVS head. It disables doc building, dists the po stuff (not the the way ds wanted, but the way I understood how to) and fixes latest additions/removals to the spec
This commit is contained in:
Christian Schaller 2003-08-19 18:25:53 +00:00
parent 13916dae8f
commit 7cd51262a7
2 changed files with 36 additions and 34 deletions

View file

@ -42,7 +42,7 @@ DIST_SUBDIRS = include libs gst \
EXTRA_DIST = gstreamer.spec.in gst-element-check.m4 \
configure.ac autogen.sh depcomp \
REQUIREMENTS ABOUT-NLS RELEASE DOCBUILDING DEVEL \
idiottest.mak common
idiottest.mak common po/Makefile.in.in po/POTFILES.in po/de.po
dist-hook:
cp gstreamer.spec $(distdir)

View file

@ -101,8 +101,8 @@ FFLAGS="${FFLAGS:-%optflags}" ; export FFLAGS ; \
--infodir=%{_infodir} \
--enable-debug \
--with-cachedir=%{_localstatedir}/cache/gstreamer-%{majorminor} \
--disable-tests --disable-examples \
--enable-docs-build --with-html-dir=$RPM_BUILD_ROOT%{_datadir}/gtk-doc/html
--disable-tests --disable-examples
# --enable-docs-build --with-html-dir=$RPM_BUILD_ROOT%{_datadir}/gtk-doc/html
if [ "$SMP" != "" ]; then
(make "MAKE=make -k -j $SMP"; exit 0)
@ -144,8 +144,6 @@ rm -f $RPM_BUILD_ROOT%{_libdir}/*.la
%{_libdir}/gstreamer-%{majorminor}/libgstbasicomega*.so*
%{_libdir}/gstreamer-%{majorminor}/libgstoptscheduler.so*
%{_libdir}/gstreamer-%{majorminor}/libgstoptomega*.so*
%{_libdir}/gstreamer-%{majorminor}/libgstbasicwingo*.so*
%{_libdir}/gstreamer-%{majorminor}/libgstoptwingoscheduler*.so
%{_libdir}/gstreamer-%{majorminor}/libgstbasicgthreadscheduler*.so
%{_libdir}/gstreamer-%{majorminor}/libgstoptgthreadscheduler*.so
%{_libdir}/gstreamer-%{majorminor}/libgstelements*.so*
@ -153,30 +151,30 @@ rm -f $RPM_BUILD_ROOT%{_libdir}/*.la
%{_libdir}/gstreamer-%{majorminor}/libgststaticautoplug*.so*
%{_libdir}/gstreamer-%{majorminor}/libgstbytestream*.so*
%{_libdir}/gstreamer-%{majorminor}/libgstgetbits*.so*
%{_libdir}/gstreamer-%{majorminor}/libgstputbits*.so*
%{_libdir}/gstreamer-%{majorminor}/libgstspider*.so*
%{_libdir}/gstreamer-%{majorminor}/libgstindexers.so
%{_datadir}/locale/*
%files tools
%defattr(-, root, root, -)
%{_bindir}/gst-xmlinspect
%{_bindir}/gst-complete
%{_bindir}/gst-compprep
%{_bindir}/gst-inspect
%{_bindir}/gst-launch
%{_bindir}/gst-md5sum
%{_bindir}/gst-register
%{_bindir}/gst-feedback
%{_bindir}/gst-xmllaunch
%{_bindir}/gst-typefind
%{_mandir}/man1/gst-feedback.*
%{_mandir}/man1/gst-xmllaunch.*
%{_mandir}/man1/gst-complete.*
%{_mandir}/man1/gst-compprep.*
%{_mandir}/man1/gst-inspect.*
%{_mandir}/man1/gst-launch.*
%{_mandir}/man1/gst-md5sum.*
%{_mandir}/man1/gst-register.*
%{_bindir}/gst-xmlinspect-%{majorminor}
%{_bindir}/gst-complete-%{majorminor}
%{_bindir}/gst-compprep-%{majorminor}
%{_bindir}/gst-inspect-%{majorminor}
%{_bindir}/gst-launch-%{majorminor}
%{_bindir}/gst-md5sum-%{majorminor}
%{_bindir}/gst-register-%{majorminor}
%{_bindir}/gst-feedback-%{majorminor}
%{_bindir}/gst-xmllaunch-%{majorminor}
%{_bindir}/gst-typefind-%{majorminor}
%{_mandir}/man1/gst-feedback-%{majorminor}.*
%{_mandir}/man1/gst-xmllaunch-%{majorminor}.*
%{_mandir}/man1/gst-complete-%{majorminor}.*
%{_mandir}/man1/gst-compprep-%{majorminor}.*
%{_mandir}/man1/gst-inspect-%{majorminor}.*
%{_mandir}/man1/gst-launch-%{majorminor}.*
%{_mandir}/man1/gst-md5sum-%{majorminor}.*
%{_mandir}/man1/gst-register-%{majorminor}.*
%files devel
%defattr(-, root, root, -)
@ -189,8 +187,6 @@ rm -f $RPM_BUILD_ROOT%{_libdir}/*.la
%{_includedir}/%{name}-%{majorminor}/gst/bytestream/bytestream.h
%dir %{_includedir}/%{name}-%{majorminor}/gst/getbits
%{_includedir}/%{name}-%{majorminor}/gst/getbits/getbits.h
%dir %{_includedir}/%{name}-%{majorminor}/gst/putbits
%{_includedir}/%{name}-%{majorminor}/gst/putbits/putbits.h
# %{_libdir}/libgstreamer.a
%{_libdir}/libgstreamer-%{majorminor}.so
%{_libdir}/libgstcontrol-%{majorminor}.so
@ -202,19 +198,25 @@ rm -f $RPM_BUILD_ROOT%{_libdir}/*.la
# we list all of the files we really need to trap incomplete doc builds
# 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}/element-types.html
%{_datadir}/gtk-doc/html/%{name}-%{majorminor}/gstreamer.html
%{_datadir}/gtk-doc/html/%{name}-%{majorminor}/index.sgml
# %dir %{_datadir}/gtk-doc/html/%{name}-%{majorminor}
# %{_datadir}/gtk-doc/html/%{name}-%{majorminor}/%{name}-%{majorminor}.devhelp
# %{_datadir}/gtk-doc/html/%{name}-%{majorminor}/element-types.html
# %{_datadir}/gtk-doc/html/%{name}-%{majorminor}/gstreamer.html
# %{_datadir}/gtk-doc/html/%{name}-%{majorminor}/index.sgml
## gstreamer-libs API
%dir %{_datadir}/gtk-doc/html/%{name}-libs-%{majorminor}
%{_datadir}/gtk-doc/html/%{name}-libs-%{majorminor}/index.sgml
# %dir %{_datadir}/gtk-doc/html/%{name}-libs-%{majorminor}
# %{_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}/gtk-doc/html/*
%changelog
* Sun Aug 17 2003 Christian Schaller <uraeus@gnome.org>
- Remove docs build from RPM as the build is broken
- Fix stuff since more files are versioned now
- Remove wingo schedulers
- Remove putbits stuff
* Sun May 18 2003 Thomas Vander Stichele <thomas at apestaart dot org>
- devhelp files are now generated by gtk-doc, changed accordingly