new upstream release

git-svn-id: http://trac.vinelinux.org/repos/projects/specs@7865 ec354946-7b23-47d6-9f5a-488ba84defc7

nonfree/self-build-ffmpeg/ffmpeg-vl.spec

@@ -14,7 +14,7 @@
 
 Summary:	Digital VCR and streaming server
 Name:		ffmpeg
-Version:	%{major_version}.3
+Version:	%{major_version}.4
 Release:	1%{?svndate:.%svndate}%{?_dist_release}
 Source:		http://ffmpeg.org/releases/%{name}-%{?svndate:%svndate}%{!?svndate:%version}.tar.bz2
 ## prebuilt man pages
@@ -228,6 +228,9 @@ export RPM_OPT_FLAGS="$RPM_OPT_FLAGS -mlongcall"
 
 
 %changelog
+* Fri Oct  4 2013 Munehiro Yamamoto <munepi@vinelinux.org> 1.2.4-1
+- new upstream release
+
 * Sun Sep 29 2013 Munehiro Yamamoto <munepi@vinelinux.org> 1.2.3-1
 - new upstream release
 

nonfree/self-build-ffmpeg/self-build-ffmpeg-vl.spec

@@ -1,20 +1,20 @@
 %global gpac_postinstall     \
-    gpac_postinstall_sh=$(mktemp) && \
+    gpac_postinstall_sh=$(mktemp) ; \
     rpm -q --scripts self-build-gpac | \
-    /bin/sed -e 's|posttrans[[:blank:]].*|\#!/bin/bash|' > ${gpac_postinstall_sh} && \
-    /bin/bash ${gpac_postinstall_sh} && /bin/rm -f ${gpac_postinstall_sh}
+    /bin/sed -e 's|posttrans[[:blank:]].*|\#!/bin/bash|' > ${gpac_postinstall_sh} ; \
+    /bin/bash ${gpac_postinstall_sh} ; /bin/rm -f ${gpac_postinstall_sh}
 
 %global x264_postinstall     \
-    x264_postinstall_sh=$(mktemp) && \
+    x264_postinstall_sh=$(mktemp) ; \
     rpm -q --scripts self-build-x264 | \
-    /bin/sed -e 's|posttrans[[:blank:]].*|\#!/bin/bash|' > ${x264_postinstall_sh} && \
-    /bin/bash ${x264_postinstall_sh} && /bin/rm -f ${x264_postinstall_sh}
+    /bin/sed -e 's|posttrans[[:blank:]].*|\#!/bin/bash|' > ${x264_postinstall_sh} ; \
+    /bin/bash ${x264_postinstall_sh} ; /bin/rm -f ${x264_postinstall_sh}
 
 
 %global pkgname ffmpeg
 %global name	self-build-%{pkgname}
 %global major_version 1.2
-%global version %{major_version}.3
+%global version %{major_version}.4
 #% define svndate	20110326
 %global release	1%{?svndate:.%svndate}%{?_dist_release}
 
@@ -41,7 +41,7 @@ License:	GPLv2+
 Group:		Restricted Software
 
 Obsoletes:      ffmpeg < %{major_version}, ffmpeg-libs < %{major_version}, ffmpeg-devel < %{major_version}
-Obsoletes:      self-build-ffmpeg < %{major_version}
+Obsoletes:      self-build-ffmpeg < %{version}
 
 Requires(post):		self-build-setup >= 0.9.9
 #Requires(post):		subversion
@@ -221,6 +221,9 @@ Rebuild_x264_$LOCALE
 %{_datadir}/%{name}
 
 %changelog
+* Fri Oct  4 2013 Munehiro Yamamoto <munepi@vinelinux.org> 1.2.4-1
+- new upstream release
+
 * Sun Sep 29 2013 Munehiro Yamamoto <munepi@vinelinux.org> 1.2.3-1
 - new upstream release
 - added %%{x264_postinstall} in %%post