SPEC and build fixes, should be possible to make tarballs and make RPMS again now

Original commit message from CVS:
SPEC and build fixes, should be possible to make tarballs and make RPMS again now

diff --git a/common b/common
index 2a3efdc..f12ad60 160000 (submodule)
--- a/common
+++ b/common
@@ -1 +1 @@
-Subproject commit 2a3efdc282fb1ecfd2720dea40523b3441f10fed
+Subproject commit f12ad60f50de84a39e26901b3ac29c15c1bf954e

diff --git a/gstreamer.spec.in b/gstreamer.spec.in
index 1ded883..d960fd9 100644 (file)
--- a/gstreamer.spec.in
+++ b/gstreamer.spec.in
@@ -168,6 +168,7 @@ rm -f $RPM_BUILD_ROOT%{_libdir}/*.la
 %{_bindir}/gst-register
 %{_bindir}/gst-feedback
 %{_bindir}/gst-xmllaunch
+%{_bindir}/gst-typefind
 %{_mandir}/man1/gst-feedback.*
 %{_mandir}/man1/gst-xmllaunch.*
 %{_mandir}/man1/gst-complete.*
@@ -195,6 +196,7 @@ rm -f $RPM_BUILD_ROOT%{_libdir}/*.la
 %{_libdir}/libgstcontrol-%{majorminor}.so
 %{_datadir}/aclocal/gst-element-check-%{majorminor}.m4
 %{_libdir}/pkgconfig/gstreamer-%{majorminor}.pc
+%{_libdir}/pkgconfig/gstreamer-control-%{majorminor}.pc
 ## we specify the API docs as regular files since %docs doesn't fail when
 #  files aren't found anymore for RPM >= 4
 #  we list all of the files we really need to trap incomplete doc builds
@@ -202,49 +204,11 @@ rm -f $RPM_BUILD_ROOT%{_libdir}/*.la
 ## 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
-%{_datadir}/gtk-doc/html/%{name}-%{majorminor}/gstautoplugfactory.html
-%{_datadir}/gtk-doc/html/%{name}-%{majorminor}/gstautoplug.html
-%{_datadir}/gtk-doc/html/%{name}-%{majorminor}/gstbin.html
-%{_datadir}/gtk-doc/html/%{name}-%{majorminor}/gstclock.html
-%{_datadir}/gtk-doc/html/%{name}-%{majorminor}/gstelement.html
-%{_datadir}/gtk-doc/html/%{name}-%{majorminor}/gst-index.html
-%{_datadir}/gtk-doc/html/%{name}-%{majorminor}/gstobject.html
-%{_datadir}/gtk-doc/html/%{name}-%{majorminor}/gstpad.html
-%{_datadir}/gtk-doc/html/%{name}-%{majorminor}/gstpipeline.html
-%{_datadir}/gtk-doc/html/%{name}-%{majorminor}/gstpluginfeature.html
-# %{_datadir}/gtk-doc/html/%{name}-%{majorminor}/gstreamer-cothreads.html
-%{_datadir}/gtk-doc/html/%{name}-%{majorminor}/gstreamer-gstbuffer.html
-%{_datadir}/gtk-doc/html/%{name}-%{majorminor}/gstreamer-gstbufferpool.html
-%{_datadir}/gtk-doc/html/%{name}-%{majorminor}/gstreamer-gstcaps.html
-%{_datadir}/gtk-doc/html/%{name}-%{majorminor}/gstreamer-gstcpu.html
-%{_datadir}/gtk-doc/html/%{name}-%{majorminor}/gstreamer-gstdata.html
-%{_datadir}/gtk-doc/html/%{name}-%{majorminor}/gstreamer-gstevent.html
-%{_datadir}/gtk-doc/html/%{name}-%{majorminor}/gstreamer-gst.html
-%{_datadir}/gtk-doc/html/%{name}-%{majorminor}/gstreamer-gstinfo.html
-%{_datadir}/gtk-doc/html/%{name}-%{majorminor}/gstreamer-gstparse.html
-%{_datadir}/gtk-doc/html/%{name}-%{majorminor}/gstreamer-gstplugin.html
-%{_datadir}/gtk-doc/html/%{name}-%{majorminor}/gstreamer-gstprops.html
-%{_datadir}/gtk-doc/html/%{name}-%{majorminor}/gstreamer-gststaticautoplug.html
-%{_datadir}/gtk-doc/html/%{name}-%{majorminor}/gstreamer-gststaticautoplugrender.html
-%{_datadir}/gtk-doc/html/%{name}-%{majorminor}/gstreamer-gsttype.html
-%{_datadir}/gtk-doc/html/%{name}-%{majorminor}/gstreamer-gstutils.html
 %{_datadir}/gtk-doc/html/%{name}-%{majorminor}/gstreamer.html
-%{_datadir}/gtk-doc/html/%{name}-%{majorminor}/gstschedulerfactory.html
-%{_datadir}/gtk-doc/html/%{name}-%{majorminor}/gstscheduler.html
-%{_datadir}/gtk-doc/html/%{name}-%{majorminor}/gstthread.html
-%{_datadir}/gtk-doc/html/%{name}-%{majorminor}/gsttypefactory.html
-%{_datadir}/gtk-doc/html/%{name}-%{majorminor}/gstxml.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}-%{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
-%{_datadir}/gtk-doc/html/%{name}-libs-%{majorminor}/%{name}-libs.html
 %{_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/*

diff --git a/tests/old/testsuite/Makefile.am b/tests/old/testsuite/Makefile.am
index 45130bd..3dbaa23 100644 (file)
--- a/tests/old/testsuite/Makefile.am
+++ b/tests/old/testsuite/Makefile.am
@@ -11,7 +11,7 @@ GST_DEBUG_DIRS = debug
 endif
 
 # FIXME : threads bytestream
-SUBDIRS = caps plugin elements clock refcounting threads indexers $(GST_PARSE_DIRS) $(GST_DEBUG_DIRS) ## cleanup dynparams
+SUBDIRS = caps plugin elements clock refcounting threads indexers debug $(GST_PARSE_DIRS) $(GST_DEBUG_DIRS) ## cleanup dynparams
 
 TOP_BUILDDIR=$(shell cd $(top_builddir) && pwd)
 TESTS_ENVIRONMENT = GST_PLUGIN_PATH=$(TOP_BUILDDIR) GST_REGISTRY=$(TOP_BUILDDIR)/testsuite/test-registry.xml
@@ -39,6 +39,6 @@ AM_CFLAGS = $(GST_CFLAGS)
 CLEANFILES = test-registry.xml
 
 DIST_SUBDIRS = bytestream caps cleanup clock dynparams elements indexers \
-               plugin refcounting threads parse
+               plugin refcounting threads parse debug
 
 EXTRA_DIST = gst-inspect-check

diff --git a/testsuite/Makefile.am b/testsuite/Makefile.am
index 45130bd..3dbaa23 100644 (file)
--- a/testsuite/Makefile.am
+++ b/testsuite/Makefile.am
@@ -11,7 +11,7 @@ GST_DEBUG_DIRS = debug
 endif
 
 # FIXME : threads bytestream
-SUBDIRS = caps plugin elements clock refcounting threads indexers $(GST_PARSE_DIRS) $(GST_DEBUG_DIRS) ## cleanup dynparams
+SUBDIRS = caps plugin elements clock refcounting threads indexers debug $(GST_PARSE_DIRS) $(GST_DEBUG_DIRS) ## cleanup dynparams
 
 TOP_BUILDDIR=$(shell cd $(top_builddir) && pwd)
 TESTS_ENVIRONMENT = GST_PLUGIN_PATH=$(TOP_BUILDDIR) GST_REGISTRY=$(TOP_BUILDDIR)/testsuite/test-registry.xml
@@ -39,6 +39,6 @@ AM_CFLAGS = $(GST_CFLAGS)
 CLEANFILES = test-registry.xml
 
 DIST_SUBDIRS = bytestream caps cleanup clock dynparams elements indexers \
-               plugin refcounting threads parse
+               plugin refcounting threads parse debug
 
 EXTRA_DIST = gst-inspect-check