[svn] r5074 - in trunk/rpms: libmpeg3 libquicktime smilutils transcode

[packagers at lists.rpmforge.net]

Author: dag
Date: 2007-01-15 07:39:36 +0100 (Mon, 15 Jan 2007)
New Revision: 5074

Modified:
   trunk/rpms/libmpeg3/libmpeg3.spec
   trunk/rpms/libquicktime/libquicktime.spec
   trunk/rpms/smilutils/smilutils.spec
   trunk/rpms/transcode/transcode.spec
Log:
Updates

Modified: trunk/rpms/libmpeg3/libmpeg3.spec
===================================================================
--- trunk/rpms/libmpeg3/libmpeg3.spec	2007-01-15 05:56:09 UTC (rev 5073)
+++ trunk/rpms/libmpeg3/libmpeg3.spec	2007-01-15 06:39:36 UTC (rev 5074)
@@ -86,13 +86,17 @@
 %files utils
 %defattr(-, root, root, 0755)
 %doc COPYING
-%{_bindir}/*
+%{_bindir}/mpeg3cat
+%{_bindir}/mpeg3dump
+%{_bindir}/mpeg3peek
+%{_bindir}/mpeg3toc
 
 %files devel
 %defattr(-, root, root, 0755)
 %doc docs/*
-%{_libdir}/*.a
-%{_includedir}/*.h
+%{_libdir}/libmpeg3.a
+%{_includedir}/libmpeg3.h
+%{_includedir}/mpeg3private.h
 
 
 %changelog

Modified: trunk/rpms/libquicktime/libquicktime.spec
===================================================================
--- trunk/rpms/libquicktime/libquicktime.spec	2007-01-15 05:56:09 UTC (rev 5073)
+++ trunk/rpms/libquicktime/libquicktime.spec	2007-01-15 06:39:36 UTC (rev 5074)
@@ -10,13 +10,23 @@
 %{?fc5:%define _with_modxorg 1}
 
 %{?fc1:%define _without_alsa 1}
+%{?fc1:%define _without_gtk24 1}
 %{?el3:%define _without_alsa 1}
+%{?el3:%define _without_gtk24 1}
 %{?rh9:%define _without_alsa 1}
+%{?rh9:%define _without_gtk24 1}
+%{?rh9:%define _without_x264 1}
 %{?rh8:%define _without_alsa 1}
+%{?rh8:%define _without_gtk24 1}
+%{?rh8:%define _without_x264 1}
+%{?rh7:%define _without_1394 1}
 %{?rh7:%define _without_alsa 1}
-%{?rh7:%define _without_1394 1}
+%{?rh7:%define _without_gtk24 1}
+%{?rh7:%define _without_x264 1}
+%{?el2:%define _without_1394 1}
 %{?el2:%define _without_alsa 1}
-%{?el2:%define _without_1394 1}
+%{?el2:%define _without_gtk24 1}
+%{?el2:%define _without_x264 1}
 %{?yd3:%define _without_alsa 1}
 
 #define prever pre1
@@ -33,8 +43,9 @@
 Patch1: libquicktime-0.9.10-x264.patch
 Patch2: libquicktime-0.9.10-faad2.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
-BuildRequires: gtk2-devel, libdv-devel, libvorbis-devel, lame-devel
+BuildRequires: libdv-devel, libvorbis-devel, lame-devel
 BuildRequires: libpng-devel >= 1.0.8, libjpeg-devel, gcc-c++
+%{?!_without_gtk24:BuildRequires: gtk2-devel >= 2.4}
 %{?!_without_1394:BuildRequires: libraw1394-devel, libavc1394-devel}
 %{?!_without_alsa:BuildRequires: alsa-lib-devel}
 %{?!_without_ffmpeg:BuildRequires: ffmpeg-devel}
@@ -118,7 +129,7 @@
 
 %files devel
 %defattr(-, root, root, 0755)
-%{_bindir}/libquicktime_config
+%{?!_without_gtk24:%{_bindir}/libquicktime_config}
 %{_bindir}/lqt-config
 %{_includedir}/lqt/
 %{_includedir}/quicktime

Modified: trunk/rpms/smilutils/smilutils.spec
===================================================================
--- trunk/rpms/smilutils/smilutils.spec	2007-01-15 05:56:09 UTC (rev 5073)
+++ trunk/rpms/smilutils/smilutils.spec	2007-01-15 06:39:36 UTC (rev 5074)
@@ -1,5 +1,4 @@
 # $Id$
-
 # Authority: dag
 
 Summary: Collection of command line tools for SMIL manipulation
@@ -13,7 +12,6 @@
 Source: http://kino.schirmacher.de/filemanager/download/14/smilutils-%{version}.tar.gz
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 
-
 BuildRequires: libxml2-devel, gtk+-devel, gdk-pixbuf-devel, gcc-c++
 Buildrequires: libraw1394-devel, libavc1394-devel, libdv-devel
 BuildRequires: libquicktime-devel, SDL-devel, imlib2-devel, libpng-devel
@@ -40,30 +38,25 @@
 
 %install
 %{__rm} -rf %{buildroot}
-%makeinstall
+%{__make} install DESTDIR="%{buildroot}"
 
-### Clean up buildroot
-%{__rm} -f %{buildroot}%{_libdir}/*.la
-
 %clean
 %{__rm} -rf %{buildroot}
 
 %files
 %defattr(-, root, root, 0755)
 %doc AUTHORS ChangeLog NEWS README*
-%doc %{_mandir}/man?/*
+%doc %{_mandir}/man1/*.1*
 %{_bindir}/*
 %{_libdir}/*.so.*
 
 %files devel
 %defattr(-, root, root, 0755)
 %{_libdir}/*.a
+%exclude %{_libdir}/*.la
 %{_libdir}/*.so
 
 %changelog
-* Sat Apr 08 2006 Dries Verachtert <dries at ulyssis.org> - 0.3.0-1.2
-- Rebuild for Fedora Core 5.
-
 * Fri Dec 19 2003 Dag Wieers <dag at wieers.com> - 0.3.0-1
 - Fixed a problem with the shared libraries. (Miguel Lemos)
 

Modified: trunk/rpms/transcode/transcode.spec
===================================================================
--- trunk/rpms/transcode/transcode.spec	2007-01-15 05:56:09 UTC (rev 5073)
+++ trunk/rpms/transcode/transcode.spec	2007-01-15 06:39:36 UTC (rev 5074)
@@ -90,6 +90,7 @@
 %build
 # This is required to get "#include <postprocess.h>" to work
 export CFLAGS="%{optflags} -I%{_includedir}/postproc -DSDL_VIDEO_DRIVER_X11"
+export LDFLAGS="-L%{_usr}/X11R6/%{_lib}"
 %configure \
     --enable-netstream \
     --enable-v4l \