Meego Specs: comparison mjpegtools/mjpegtools.spec

-:85164847c8a7
+:a4e10030bd8f
 Name:           mjpegtools
+Summary:        Tools to manipulate MPEG data
+Vendor:         Europalab Software
+Packager:       Michael Schloh von Bennewitz
+Distribution:   MeeGo Thirdparty
 Version:        1.9.0
-Release:        3%{?dist}
+Release:        20101201
-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
+Source0:        http://downloads.sourceforge.net/mjpeg/%{version}/%{name}-%{version}.tar.gz
 Patch0:         %{name}-1.9.0rc1-anytovcd-ffmpegver.patch
 Patch1:         mjpegtools-1.9.0-gcc44.patch
 Patch2:         mjpegtools-1.9.0-png-memleak.patch
-BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root
-BuildRequires:  libjpeg-devel
 BuildRequires:  nasm
 BuildRequires:  libdv-devel
-BuildRequires:  SDL-devel >= 1.1.3
+BuildRequires:  libjpeg-devel
+BuildRequires:  libquicktime-devel
+BuildRequires:  libpng-devel
+BuildRequires:  SDL-devel
 BuildRequires:  SDL_gfx-devel
-BuildRequires:  libquicktime-devel >= 0.9.8
-BuildRequires:  libpng-devel
-BuildRequires:  gtk2-devel >= 2.4.0
 Requires:       %{name}-libs = %{version}-%{release}
-# mencoder for lav2avi.sh
 Requires:       mencoder
-# ffmpeg main package, y4mscaler and which for anytovcd.sh
 Requires:       ffmpeg
 Requires:       y4mscaler
 Requires:       which
 Requires(post): /sbin/install-info
 Requires(preun): /sbin/install-info
 %description
 The mjpeg programs are a set of tools that can do recording of videos
 and playback, simple cut-and-paste editing and the MPEG compression of
-audio and video under Linux.  This package contains mjpegtools console
+audio and video under Linux. This package contains mjpegtools console
-utilities.
-%package        gui
-Summary:        GUI tools to manipulate MPEG data
-Group:          Applications/Multimedia
-Requires:       %{name} = %{version}-%{release}
-%description    gui
-The mjpeg programs are a set of tools that can do recording of videos
-and playback, simple cut-and-paste editing and the MPEG compression of
-audio and video under Linux.  This package contains mjpegtools GUI
 utilities.
 %package        libs
 Summary:        Libraries used by mjpegtools
+Vendor:         Europalab Software
+Packager:       Michael Schloh von Bennewitz
+Distribution:   MeeGo Thirdparty
 Group:          System Environment/Libraries
 Requires:       libquicktime >= 0.9.8
 %description    libs
 The mjpeg programs are a set of tools that can do recording of videos
 and playback, simple cut-and-paste editing and the MPEG compression of
-audio and video under Linux.  This package contains libraries used by
+audio and video under Linux. This package contains libraries used by
 mjpegtools.
 %package        devel
 Summary:        Development files for mjpegtools libraries
+Vendor:         Europalab Software
+Packager:       Michael Schloh von Bennewitz
+Distribution:   MeeGo Thirdparty
 Group:          Development/Libraries
 Requires:       %{name}-libs = %{version}-%{release}
 Requires:       pkgconfig
 %description    devel
 The mjpeg programs are a set of tools that can do recording of videos
 and playback, simple cut-and-paste editing and the MPEG compression of
-audio and video under Linux.  This package contains development files
+audio and video under Linux. This package contains development files
 for building applications that use mjpegtools libraries.
 %prep
 %setup -q
 %patch0 -p1
 %patch1 -p1
 %patch2 -p1
 sed -i -e 's/ARCHFLAGS=.*/ARCHFLAGS=/' configure*
-sed -i -e 's|/lib /usr/lib|/%{_lib} %{_libdir}|' configure # lib64 rpaths
+sed -i -e 's|/lib /usr/lib|/%{_lib} %{_libdir}|' configure
-for f in docs/yuvfps.1 ; do
-iconv -f iso-8859-1 -t utf-8 $f > $f.utf8 ; mv $f.utf8 $f
-done
 %build
-%configure --disable-dependency-tracking --disable-static
+%configure
-make # %{?_smp_mflags}
+make %{?_smp_mflags}
 %install
 rm -rf $RPM_BUILD_ROOT
 make install DESTDIR=$RPM_BUILD_ROOT
-rm -f $RPM_BUILD_ROOT{%{_infodir}/dir,%{_libdir}/lib*.la}
+rm -f $RPM_BUILD_ROOT%{_infodir}/dir
-# too broken/outdated to be useful in 1.[89].0 (and would come with dep chain)
 rm -f $RPM_BUILD_ROOT%{_bindir}/mpegtranscode
 %clean
 rm -rf $RPM_BUILD_ROOT
 %post libs -p /sbin/ldconfig
 %postun libs -p /sbin/ldconfig
-%post
-/sbin/install-info %{_infodir}/mjpeg-howto.info %{_infodir}/dir || :
-%preun
-[ $1 -eq 0 ] && \
-/sbin/install-info --delete %{_infodir}/mjpeg-howto.info %{_infodir}/dir || :
 %files
 %defattr(-,root,root,-)
 %doc COPYING CHANGES ChangeLog AUTHORS BUGS README.lavpipe NEWS TODO
 %{_bindir}/*
-%exclude %{_bindir}/glav
-%exclude %{_bindir}/lavplay
-%exclude %{_bindir}/y4mhist
-%exclude %{_bindir}/yuvplay
 %{_mandir}/man1/*.1*
-%exclude %{_mandir}/man1/lavplay.1*
-%exclude %{_mandir}/man1/yuvplay.1*
 %{_mandir}/man5/yuv4mpeg.5*
-%{_infodir}/mjpeg-howto.info*
+%{_infodir}/mjpeg-howto.info.gz
-%files gui
-%defattr(-,root,root,-)
-%doc README.glav
-%{_bindir}/glav
-# lavplay and yuvplay won't save -libs/console util users from X11 and SDL
-# dependencies as long as liblavplay is in -libs, but they're inherently
-# GUI tools -> include them here
-%{_bindir}/lavplay
-%{_bindir}/y4mhist
-%{_bindir}/yuvplay
-%{_mandir}/man1/lavplay.1*
-%{_mandir}/man1/yuvplay.1*
 %files libs
 %defattr(-,root,root,-)
 %doc COPYING
 %{_libdir}/lib*.so.*
 %files devel
 %defattr(-,root,root,-)
 %{_includedir}/%{name}
+%{_libdir}/lib*.a
+%{_libdir}/lib*.la
 %{_libdir}/lib*.so
 %{_libdir}/pkgconfig/%{name}.pc
 %changelog
+* Wed Dec 1 2010 Michael Schloh von Bennewitz <michael@schloh.com> - 1.9.0-20101201
+- Adjust packaging and patch logic
 * Mon Nov 1 2010 Kozinov Ivan <kozinov@gmail.com> - 1.9.0-3
-- Build for MeeGo 1.1
+- Package for MeeGo 1.1
 * Fri Sep  3 2010 Hans de Goede <j.w.r.degoede@hhs.nl> 1.9.0-2
 - Fix a memleak which is causing issues for LiVES
 * Wed Apr 15 2009 Hans de Goede <j.w.r.degoede@hhs.nl> 1.9.0-1

Meego Specs / file comparison

comparison: mjpegtools/mjpegtools.spec

mjpegtools/mjpegtools.spec