fix some disting and rpm building issues

Original commit message from CVS:
fix some disting and rpm building issues

diff --git a/configure.ac b/configure.ac
index 0308969..bb63a3d 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -1074,6 +1074,7 @@ gst-libs/gst/video/Makefile
 examples/dynparams/Makefile
 examples/capsfilter/Makefile
 examples/seeking/Makefile
+examples/indexing/Makefile
 examples/Makefile
 testsuite/autoplug/Makefile
 testsuite/spider/Makefile

diff --git a/examples/Makefile.am b/examples/Makefile.am
index de3c7c4..6c582d9 100644 (file)
--- a/examples/Makefile.am
+++ b/examples/Makefile.am
@@ -11,4 +11,4 @@ GTK_SUBDIRS=
 endif
 
 SUBDIRS=$(GTK_SUBDIRS)
-DIST_SUBDIRS=capsfilter dynparams seeking
+DIST_SUBDIRS=capsfilter dynparams seeking indexing

diff --git a/ext/Makefile.am b/ext/Makefile.am
index bc3c15e..d31f7fe 100644 (file)
--- a/ext/Makefile.am
+++ b/ext/Makefile.am
@@ -244,6 +244,12 @@ else
 XMMS_DIR=
 endif
 
+if USE_LIBPNG
+SNAPSHOT_DIR=snapshot
+else
+SNAPSHOT_DIR=
+endif
+
 SUBDIRS=$(A52DEC_DIR) $(AALIB_DIR) $(ALSA_DIR) \
         $(ARTS_DIR) $(ARTSC_DIR) $(AUDIOFILE_DIR) \
        $(AVIFILE_DIR) $(CDPARANOIA_DIR) \
@@ -256,7 +262,7 @@ SUBDIRS=$(A52DEC_DIR) $(AALIB_DIR) $(ALSA_DIR) \
        $(OPENQUICKTIME_DIR) $(RAW1394_DIR) $(RTP_DIR) \
        $(SDL_DIR) $(SHOUT_DIR) $(SIDPLAY_DIR) \
        $(SMOOTHWAVE_DIR) $(SWFDEC_DIR) $(TARKIN_DIR) \
-       $(VORBIS_DIR) $(XMMS_DIR)
+       $(VORBIS_DIR) $(XMMS_DIR) $(SNAPSHOT_DIR)
 
 DIST_SUBDIRS=\
        a52dec aalib alsa \

diff --git a/gst-plugins.spec.in b/gst-plugins.spec.in
index 6c10d56..9ed4a3d 100644 (file)
--- a/gst-plugins.spec.in
+++ b/gst-plugins.spec.in
@@ -88,6 +88,8 @@ rm -f $RPM_BUILD_ROOT%{_libdir}/gst/*.la
 rm -f $RPM_BUILD_ROOT%{_libdir}/gst/*.a
 rm -f $RPM_BUILD_ROOT%{_libdir}/*.a
 rm -f $RPM_BUILD_ROOT%{_libdir}/*.la
+rm -f $RPM_BUILD_ROOT%{_includedir}/gst-plugins-%{version}/gst/media-info/media-info.h
+rm -f $RPM_BUILD_ROOT%{_libdir}/libgstmedia-info.so.0.0.0
 
 
 %clean
@@ -1119,6 +1121,7 @@ Plug-ins for playback of AVI format media files.
 Summary:       GStreamer audio effects plug-in.
 Group:                 Libraries/Multimedia
 Requires:      gstreamer-plugins = %{version}
+@USE_LIBPNG_TRUE@Requires:     libpng
 Obsoletes:     gstreamer-misc
 
 %description -n gstreamer-audio-effects
@@ -1149,6 +1152,7 @@ integer to float conversion, LAW conversion and level detection plug-ins.
 %{_libdir}/gst/libgstcutter.so
 %{_libdir}/gst/libgstfilter.so
 %{_libdir}/gst/libmixmatrix.so
+@USE_LIBPNG_TRUE@%{_libdir}/gst/libgstpng.so
 
 %post -n gstreamer-audio-effects
 %{_bindir}/gst-register --gst-mask=0 > /dev/null 2> /dev/null
@@ -1502,6 +1506,10 @@ This package contains a basic audio and video playback library.
 /sbin/ldconfig
 
 %changelog
+* Thu Nov 28 2002 Christian Schaller <Uraeus@linuxrising.org>
+- Put in libgstpng plugin
+- rm the libgstmedia-info stuff until thomas think they are ready
+
 * Fri Nov 01 2002 Thomas Vander Stichele <thomas at apestaart dot org>
 - don't use compprep until ABI issues can be fixed
 

diff --git a/gst/udp/Makefile.am b/gst/udp/Makefile.am
index 3c60993..50c9b18 100644 (file)
--- a/gst/udp/Makefile.am
+++ b/gst/udp/Makefile.am
@@ -7,6 +7,6 @@ libgstudp_la_CFLAGS = $(GST_CFLAGS)
 libgstudp_la_LIBADD =
 libgstudp_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
 
-noinst_HEADERS = gstudpsink.h gstudpsrc.h 
+noinst_HEADERS = gstudpsink.h gstudpsrc.h gstudp.h
 
 EXTRA_DIST = README

diff --git a/tests/old/examples/Makefile.am b/tests/old/examples/Makefile.am
index de3c7c4..6c582d9 100644 (file)
--- a/tests/old/examples/Makefile.am
+++ b/tests/old/examples/Makefile.am
@@ -11,4 +11,4 @@ GTK_SUBDIRS=
 endif
 
 SUBDIRS=$(GTK_SUBDIRS)
-DIST_SUBDIRS=capsfilter dynparams seeking
+DIST_SUBDIRS=capsfilter dynparams seeking indexing