Subversion Repositories pub

Compare Revisions

No changes between revisions

Ignore whitespace Rev 387 → Rev 388

/video-contact-sheet/trunk/rpm-package/vcs.spec.in
40,12 → 40,15
Release: 1%{?disttag},upstream
License: LGPL
Packager: @PACKAGER@
Group: Applications/Video
Group: Applications/Multimedia
Source0: http://p.outlyer.net/%{name}/files/%{name}-%{version}.tar.gz
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-build
BuildArch: noarch
# TODO: How to set alternative dependencies? i.e. mplayer/ffmpeg
Requires: mplayer / ffmpeg, bash >= 2.05b, ImageMagick >= 6.0, coreutils
Requires: mplayer / ffmpeg
Requires: bash >= 2.05b
Requires: ImageMagick >= 6.3.5-7
Requires: coreutils
URL: http://p.outlyer.net/vcs/
#BuildRequires:
#Prereq: /sbin/ldconfig
/video-contact-sheet/trunk/vcs
2337,9 → 2337,11
# When a "Seems..." line is printed the correct FPS can be obtained though.
[ -z "${VID_MPLAYER[$FPS]}" ] && VID[$FPS]=${VID_FFMPEG[$FPS]}
[ "${VID_MPLAYER[$FPS]}" ] && [ "${VID_FFMPEG[$FPS]}" ] && {
# Trust ffmpeg if it has three decimals only
# Trust ffmpeg if it has three decimals OR if mplayer is probably-wrong
local ffps=${VID_FFMPEG[$FPS]}
echo $ffps | grep -q '\.[0-9][0-9][0-9]' && VID[$FPS]=$ffps
echo $ffps | grep -q '\.[0-9][0-9][0-9]' && VID[$FPS]=$ffps || {
fptest "${VID_MPLAYER[$FPS]}" -gt 500 && VID[$FPS]=$ffps
}
}
# It doesn't appear to need any workarounds for num. channels either
[ "${VID_FFMPEG[$CHANS]}" ] && VID[$CHANS]=${VID_FFMPEG[$CHANS]}
/video-contact-sheet/trunk/Makefile
53,6 → 53,7
$(RM) vcs.spec
$(RM) -r rpm-package/vcs-$(VER)
cd rpm-package && fakeroot rpmbuild -tb vcs-$(VER).tar.gz
-ln -s ~/rpmbuild/RPMS/noarch/vcs-$(VER)-*.rpm .
$(RM) rpm-package/vcs-$(VER).tar.gz
 
vcs.spec: rpm-package/vcs.spec.in
/video-contact-sheet/trunk/.
Property changes:
Modified: svn:mergeinfo
Merged /video-contact-sheet/tags/1.11:r385-387