Author: hobbes1069 Update of /cvs/free/rpms/mjpegtools/EL-6 In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv20021 Modified Files: mjpegtools.spec Log Message: Sync spec with rawhide. Index: mjpegtools.spec =================================================================== RCS file: /cvs/free/rpms/mjpegtools/EL-6/mjpegtools.spec,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- mjpegtools.spec 1 May 2012 20:35:59 -0000 1.8 +++ mjpegtools.spec 1 May 2012 21:25:43 -0000 1.9 @@ -1,25 +1,22 @@ Name: mjpegtools Version: 2.0.0 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Tools to manipulate MPEG data Group: Applications/Multimedia License: GPLv2 URL: http://mjpeg.sourceforge.net/ Source0: http://downloads.sourceforge.net/mjpeg/%{name}-%{version}.tar.gz - Patch0: mjpegtools-2.0.0-no-config-in-public-header.h - BuildRequires: libjpeg-devel BuildRequires: nasm BuildRequires: libdv-devel BuildRequires: SDL-devel >= 1.1.3 BuildRequires: SDL_gfx-devel -#BuildRequires: libquicktime-devel >= 0.9.8 +BuildRequires: libquicktime-devel >= 0.9.8 BuildRequires: libpng-devel BuildRequires: gtk2-devel >= 2.4.0 - -Requires: %{name}-libs%{?_isa} = %{version}-%{release} -Requires: %{name}-lav%{?_isa} = %{version}-%{release} +Requires: %{name}-libs = %{version}-%{release} +Requires: %{name}-lav = %{version}-%{release} # mencoder for lav2avi.sh Requires: mencoder # ffmpeg main package, y4mscaler and which for anytovcd.sh @@ -39,7 +36,7 @@ %package gui Summary: GUI tools to manipulate MPEG data Group: Applications/Multimedia -Requires: %{name}%{?_isa} = %{version}-%{release} +Requires: %{name} = %{version}-%{release} %description gui The mjpeg programs are a set of tools that can do recording of videos @@ -62,7 +59,7 @@ %package lav Summary: MJPEGtools lavpipe libraries Group: System Environment/Libraries -Requires: %{name}-libs%{?_isa} = %{version}-%{release} +Requires: %{name}-libs = %{version}-%{release} %description lav The mjpeg programs are a set of tools that can do recording of videos @@ -74,7 +71,7 @@ %package devel Summary: Development files for mjpegtools libraries Group: Development/Libraries -Requires: %{name}-libs%{?_isa} = %{version}-%{release} +Requires: %{name}-libs = %{version}-%{release} %description devel The mjpeg programs are a set of tools that can do recording of videos @@ -86,8 +83,8 @@ %package lav-devel Summary: Development files for mjpegtools lavpipe libraries Group: Development/Libraries -Requires: %{name}-lav%{?_isa} = %{version}-%{release} -Requires: %{name}-devel%{?_isa} = %{version}-%{release} +Requires: %{name}-lav = %{version}-%{release} +Requires: %{name}-devel = %{version}-%{release} %description lav-devel The mjpeg programs are a set of tools that can do recording of videos @@ -112,10 +109,10 @@ %install -make install DESTDIR=%{buildroot} -rm -f %{buildroot}{%{_infodir}/dir,%{_libdir}/lib*.la} +make install DESTDIR=$RPM_BUILD_ROOT +rm -f $RPM_BUILD_ROOT{%{_infodir}/dir,%{_libdir}/lib*.la} # too broken/outdated to be useful in 1.[89].0 (and would come with dep chain) -rm %{buildroot}%{_bindir}/mpegtranscode +rm $RPM_BUILD_ROOT%{_bindir}/mpegtranscode %post @@ -126,13 +123,16 @@ /sbin/install-info --delete %{_infodir}/mjpeg-howto.info %{_infodir}/dir || : %post libs -p /sbin/ldconfig + %postun libs -p /sbin/ldconfig %post lav -p /sbin/ldconfig + %postun lav -p /sbin/ldconfig %files +%defattr(-,root,root,-) %doc CHANGES ChangeLog AUTHORS BUGS README.lavpipe NEWS TODO %{_bindir}/* %exclude %{_bindir}/glav @@ -146,6 +146,7 @@ %{_infodir}/mjpeg-howto.info* %files gui +%defattr(-,root,root,-) %doc README.glav %{_bindir}/glav # lavplay and yuvplay won't save console util users from X11 and SDL @@ -158,26 +159,33 @@ %{_mandir}/man1/yuvplay.1* %files libs +%defattr(-,root,root,-) %doc COPYING %{_libdir}/libm*.so.* %files lav +%defattr(-,root,root,-) %{_libdir}/liblav*.so.* %files devel +%defattr(-,root,root,-) %{_includedir}/%{name} %exclude %{_includedir}/%{name}/*lav*.h %{_libdir}/libm*.so %{_libdir}/pkgconfig/%{name}.pc %files lav-devel +%defattr(-,root,root,-) %{_includedir}/%{name}/*lav*.h %{_libdir}/liblav*.so %changelog -* Tue May 01 2012 Richard Shaw <hobbes1069(a)gmail.com&gt; - 2.0.0-2 -- Inital release for EL6. +* Fri Mar 02 2012 Nicolas Chauvet <kwizart(a)gmail.com&gt; - 2.0.0-3 +- Rebuilt for c++ ABI breakage + +* Wed Feb 08 2012 Nicolas Chauvet <kwizart(a)gmail.com&gt; - 2.0.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild * Mon Aug 1 2011 Hans de Goede <j.w.r.degoede(a)gmail.com&gt; - 2.0.0-1 - Update to new upstream 2.0.0 final release