|
@@ -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
|