From 227af9b8b6ecb41443dcbf3c7fd6153f8358c408 Mon Sep 17 00:00:00 2001 From: Christian Schaller Date: Mon, 8 Aug 2005 16:30:17 +0000 Subject: [PATCH] update spec file and fix some disting omissions Original commit message from CVS: update spec file and fix some disting omissions --- ext/Makefile.am | 4 +++- gst-plugins-ugly.spec.in | 12 ++++++------ 2 files changed, 9 insertions(+), 7 deletions(-) diff --git a/ext/Makefile.am b/ext/Makefile.am index 92a468efbc..3487bc2cf6 100644 --- a/ext/Makefile.am +++ b/ext/Makefile.am @@ -451,4 +451,6 @@ DIST_SUBDIRS=\ dv \ amrnb \ faad \ - mpeg2dec + mpeg2dec \ + jpeg \ + libpng diff --git a/gst-plugins-ugly.spec.in b/gst-plugins-ugly.spec.in index ac517a4648..c1d53448cb 100644 --- a/gst-plugins-ugly.spec.in +++ b/gst-plugins-ugly.spec.in @@ -54,10 +54,10 @@ BuildRequires: XFree86-devel # @USE_GNOME_VFS_TRUE@BuildRequires: gnome-vfs2-devel > 1.9.4.00 # @USE_HERMES_TRUE@Requires: Hermes >= 1.3.0 # @USE_HERMES_TRUE@BuildRequires: Hermes-devel >= 1.3.0 -# @USE_JPEG_TRUE@Requires: libjpeg -# @USE_JPEG_TRUE@BuildRequires: libjpeg-devel -# @USE_LIBPNG_TRUE@Requires: libpng >= 1.2.0 -# @USE_LIBPNG_TRUE@BuildRequires: libpng-devel >= 1.2.0 +@USE_JPEG_TRUE@Requires: libjpeg +@USE_JPEG_TRUE@BuildRequires: libjpeg-devel +@USE_LIBPNG_TRUE@Requires: libpng >= 1.2.0 +@USE_LIBPNG_TRUE@BuildRequires: libpng-devel >= 1.2.0 # @USE_MIKMOD_TRUE@Requires: mikmod # @USE_MIKMOD_TRUE@BuildRequires: mikmod @USE_OSS_TRUE@BuildRequires: glibc-devel @@ -152,12 +152,12 @@ rm -rf $RPM_BUILD_ROOT # @USE_FLAC_TRUE@%{_libdir}/gstreamer-%{majorminor}/libgstflac.so # @USE_HERMES_TRUE@%{_libdir}/gstreamer-%{majorminor}/libgsthermescolorspace.so # @USE_SMOOTHWAVE_TRUE@%{_libdir}/gstreamer-%{majorminor}/libgstsmoothwave.so -# @USE_JPEG_TRUE@%{_libdir}/gstreamer-%{majorminor}/libgstjpeg.so +@USE_JPEG_TRUE@%{_libdir}/gstreamer-%{majorminor}/libgstjpeg.so # @USE_MIKMOD_TRUE@%{_libdir}/gstreamer-%{majorminor}/libgstmikmod.so # @USE_SDL_TRUE@%{_libdir}/gstreamer-%{majorminor}/libgstsdlvideosink.so # @USE_VORBIS_TRUE@%{_libdir}/gstreamer-%{majorminor}/libgstvorbis.so # @USE_VORBIS_TRUE@%{_libdir}/gstreamer-%{majorminor}/libgstogg.so -# @USE_LIBPNG_TRUE@%{_libdir}/gstreamer-%{majorminor}/libgstpng.so +@USE_LIBPNG_TRUE@%{_libdir}/gstreamer-%{majorminor}/libgstpng.so @USE_OSS_TRUE@%{_libdir}/gstreamer-%{majorminor}/libgstossaudio.so # @USE_GST_V4L_TRUE@%{_libdir}/gstreamer-%{majorminor}/libgstvideo4linux.so ## @USE_RAW1394_TRUE@%{_libdir}/gstreamer-%{majorminor}/libgst1394.so