diff options
| author | Christian Schaller <uraeus@gnome.org> | 2003-11-23 15:32:14 +0000 |
|---|---|---|
| committer | Christian Schaller <uraeus@gnome.org> | 2003-11-23 15:32:14 +0000 |
| commit | fbcc4e0bd783a8e631b40de28c83c9d6f1d09093 (patch) | |
| tree | 5a82008ab14962e43fc1aae392782b69dd1de44b | |
| parent | 874cd0ea4f8869f7c04e67cc7a1a1bd1d905f5d7 (diff) | |
commit my batch of build and spec fixes
Original commit message from CVS:
commit my batch of build and spec fixes
| -rw-r--r-- | configure.ac | 2 | ||||
| -rw-r--r-- | ext/gdk_pixbuf/Makefile.am | 2 | ||||
| -rw-r--r-- | gst-plugins.spec.in | 4 |
3 files changed, 3 insertions, 5 deletions
diff --git a/configure.ac b/configure.ac index 05395073..6bd05243 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/ext/gdk_pixbuf/Makefile.am b/ext/gdk_pixbuf/Makefile.am index 7b19e3de..b017fa56 100644 --- a/ext/gdk_pixbuf/Makefile.am +++ b/ext/gdk_pixbuf/Makefile.am @@ -8,7 +8,7 @@ libgstgdkpixbuf_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) if HAVE_GDK_LOADERS -loaderdir = $(GDK_PIXBUF_LOADER_DIR)/gtk-2.0/$(GTK_VERSION)/loaders +loaderdir = $(GDK_PIXBUF_LOADER_DIR) loader_LTLIBRARIES = gst_loader.la gst_loader_la_CFLAGS = $(GST_CFLAGS) $(GTK_CFLAGS) -DGDK_PIXBUF_ENABLE_BACKEND diff --git a/gst-plugins.spec.in b/gst-plugins.spec.in index 320ab696..ee07782b 100644 --- a/gst-plugins.spec.in +++ b/gst-plugins.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. |