From b96cff07210e7ed9e72518e26bdde4a481dfdf5c Mon Sep 17 00:00:00 2001 From: Christian Schaller Date: Sun, 23 Nov 2003 15:32:14 +0000 Subject: [PATCH] commit my batch of build and spec fixes Original commit message from CVS: commit my batch of build and spec fixes --- configure.ac | 2 +- gst-plugins-ugly.spec.in | 4 +--- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/configure.ac b/configure.ac index 05395073b6..6bd05243de 100644 --- a/configure.ac +++ b/configure.ac @@ -255,7 +255,7 @@ AC_SUBST(GTK_CFLAGS) AC_SUBST(HAVE_GTK) AM_CONDITIONAL(HAVE_GDK_LOADERS, test "x$HAVE_GTK_22" = "xyes") -GDK_PIXBUF_LOADER_DIR="\$(libdir)/gtk-2.0/\$(GTK_VERSION)" +GDK_PIXBUF_LOADER_DIR="\$(libdir)/gtk-2.0/\$(GTK_VERSION)/\loaders" AC_ARG_WITH(gdk-pixbuf-loader-dir, AC_HELP_STRING([--with-gdk-pixbuf-loader-dir], [directory to install the gdk_pixbuf loader]), diff --git a/gst-plugins-ugly.spec.in b/gst-plugins-ugly.spec.in index 320ab69614..ee07782bba 100644 --- a/gst-plugins-ugly.spec.in +++ b/gst-plugins-ugly.spec.in @@ -63,7 +63,6 @@ BuildRequires: gstreamer-tools >= 0.6.1 @USE_GCONF_TRUE@BuildRequires: GConf2-devel # Snapshot plugin @USE_HERMES_TRUE@@USE_LIBPNG_TRUE@Requires: libpng -@USE_HERMES_TRUE@@USE_LIBPNG_TRUE@Requires: gstreamer-colorspace = %{version} Obsoletes: gstreamer-plugin-libs Obsoletes: gstreamer-arts @@ -164,6 +163,7 @@ rm -f $RPM_BUILD_ROOT%{_libdir}/*.a rm -f $RPM_BUILD_ROOT%{_libdir}/*.la rm -f $RPM_BUILD_ROOT%{_includedir}/gstreamer-%{majorminor}/gst/media-info/media-info.h rm -f $RPM_BUILD_ROOT%{_libdir}/libgstmedia-info*.so.0.0.0 +rm -f $RPM_BUILD_ROOT%{_libdir}/gtk-2.0/2.2.0/loaders/gst_loader.la %clean @@ -426,7 +426,6 @@ GStreamer support libraries header files. Summary: GStreamer plug-in for AVI movie playback. Group: Libraries/Multimedia Requires: gstreamer-plugins = %{version} -Requires: gstreamer-colorspace = %{version} %description -n gstreamer-avi Plug-ins for playback of AVI format media files. @@ -823,7 +822,6 @@ Plug-ins for playback of AVI format media files. Summary: GStreamer plug-in for asf video format. Group: Libraries/Multimedia Requires: gstreamer-plugins = %{version} -Requires: gstreamer-colorspace = %{version} %description -n gstreamer-asf Plug-in for playing ASF movies under GStreamer.