Hello community, here is the log from the commit of package mjpegtools for openSUSE:Factory checked in at 2014-12-06 13:47:22 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/mjpegtools (Old) and /work/SRC/openSUSE:Factory/.mjpegtools.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "mjpegtools" Changes: -------- --- /work/SRC/openSUSE:Factory/mjpegtools/mjpegtools.changes 2013-09-25 14:33:03.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.mjpegtools.new/mjpegtools.changes 2014-12-06 13:47:11.000000000 +0100 @@ -1,0 +2,14 @@ +Mon Dec 1 12:53:29 UTC 2014 - [email protected] + +- Added baselibs.conf as a source in the spec file (to avoid error + message from the Factory check script). + +------------------------------------------------------------------- +Sat Nov 29 20:11:00 UTC 2013 - Led <[email protected]> + +- fix bashisms in shell scripts +- fix shebang in lavtc.sh that contains bash-specific constructions +- add patches: + * mjpegtools-2.0.0-fix-bashisms.patch + +------------------------------------------------------------------- New: ---- mjpegtools-2.0.0-fix-bashisms.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ mjpegtools.spec ++++++ --- /var/tmp/diff_new_pack.TcB2D0/_old 2014-12-06 13:47:13.000000000 +0100 +++ /var/tmp/diff_new_pack.TcB2D0/_new 2014-12-06 13:47:13.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package mjpegtools # -# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -31,6 +31,7 @@ Source0: %{name}-%{version}-patched.tar.gz %endif Source1: mjpegtools-codecpatch.sh +Source2: baselibs.conf Patch0: mjpegtools-cpuinfo.patch Patch1: mjpegtools-vector_alignment.patch Patch2: mjpegtools-getopt.patch @@ -39,6 +40,7 @@ Patch5: mjpegtools-config_h.patch Patch6: mjpegtools-v4l-2.6.38.patch Patch7: mjpegtools-gcc47.patch +Patch8: mjpegtools-2.0.0-fix-bashisms.patch Patch100: mjpegtools-codecpatch.patch BuildRequires: gcc-c++ BuildRequires: libjpeg-devel @@ -103,6 +105,7 @@ %patch6 %endif %patch7 -p1 +%patch8 -p1 %if ! 0%{?BUILD_ORIG} # remove references to files removed by %%{name}-codecpatch.sh %patch100 ++++++ mjpegtools-2.0.0-fix-bashisms.patch ++++++ diff -Ndur mjpegtools-2.0.0/scripts/lav2avi.sh mjpegtools-2.0.0-fix-bashisms/scripts/lav2avi.sh --- mjpegtools-2.0.0/scripts/lav2avi.sh 2004-08-07 05:51:14.000000000 +0300 +++ mjpegtools-2.0.0-fix-bashisms/scripts/lav2avi.sh 2014-11-29 22:02:38.363918541 +0200 @@ -72,7 +72,11 @@ } if [ $usage -eq 1 ]; then - echo -e "USAGE:\t`basename $0` filename.eli" - echo -e "\n\tfilename - MJPEG Tools lav editing file\n" - echo -e "EXAMPLE:\n\t`basename $0` SecondFilm.eli\n" + echo "USAGE: `basename $0` filename.eli" + echo + echo " filename - MJPEG Tools lav editing file" + echo + echo "EXAMPLE:" + echo " `basename $0` SecondFilm.eli" + echo fi diff -Ndur mjpegtools-2.0.0/scripts/lav2mpeg mjpegtools-2.0.0-fix-bashisms/scripts/lav2mpeg --- mjpegtools-2.0.0/scripts/lav2mpeg 2009-01-23 17:52:25.000000000 +0200 +++ mjpegtools-2.0.0-fix-bashisms/scripts/lav2mpeg 2014-11-29 22:03:59.200913072 +0200 @@ -252,7 +252,7 @@ ;; esac done -let MOPTIND=OPTIND-LAVRC_COUNT +MOPTIND=$((OPTIND - LAVRC_COUNT)) shift `expr $MOPTIND - 1` if [ "${QUIETLOG}" != "" ]; then diff -Ndur mjpegtools-2.0.0/scripts/lavtc.sh mjpegtools-2.0.0-fix-bashisms/scripts/lavtc.sh --- mjpegtools-2.0.0/scripts/lavtc.sh 2009-01-23 17:52:24.000000000 +0200 +++ mjpegtools-2.0.0-fix-bashisms/scripts/lavtc.sh 2014-11-29 22:04:07.719912496 +0200 @@ -1,4 +1,4 @@ -#!/bin/sh +#!/bin/bash # # lav2tc.bash - use transcode to convert MJPEG avi files to another # video/audio format. ++++++ mjpegtools-codecpatch.sh ++++++ --- /var/tmp/diff_new_pack.TcB2D0/_old 2014-12-06 13:47:13.000000000 +0100 +++ /var/tmp/diff_new_pack.TcB2D0/_new 2014-12-06 13:47:13.000000000 +0100 @@ -10,7 +10,7 @@ trap "rm -vrf \"$TMPDIR\" \"${1}/${2}\"" ERR cd $TMPDIR tar -xzf "${1}/${2}" - rm -Rf mjpegtools-2.0.0/{aenc,mpeg2enc} + rm -Rf mjpegtools-2.0.0/aenc mjpegtools-2.0.0/mpeg2enc tar -czf "${1}/${3}" mjpegtools-2.0.0 cd - 1>/dev/null rm -Rf $TMPDIR ++++++ pre_checkin.sh ++++++ --- /var/tmp/diff_new_pack.TcB2D0/_old 2014-12-06 13:47:13.000000000 +0100 +++ /var/tmp/diff_new_pack.TcB2D0/_new 2014-12-06 13:47:13.000000000 +0100 @@ -2,7 +2,8 @@ for i in mjpegtools-*tar.bz2 ; do case $i in *patched*) continue ;; esac - test -f ${i//.tar./-patched.tar.} && continue - bash mjpegtools-codecpatch.sh $PWD $i ${i//.tar./-patched.tar.} + f="$(echo "$i" | sed 's|\.tar\.|-patched&|g')" + test -f "$f" && continue + sh mjpegtools-codecpatch.sh $PWD $i "$f" done -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
