commit 8d052b5d4b12a70a0f7023daf51df436f61145b0 Author: Nicolas Chauvet <kwizart(a)gmail.com&gt; Date: Tue Sep 27 17:18:48 2016 +0200 Revert "Update to 0.148-20160924-86b7198 version" This reverts commit 36ac6ae0d5cb72b37ba60a8dc69eae3b147e0935. .gitignore | 1 - sources | 2 +- x264.spec | 16 +++++----------- 3 files changed, 6 insertions(+), 13 deletions(-) --- diff --git a/.gitignore b/.gitignore index 227b5de..a40918d 100644 --- a/.gitignore +++ b/.gitignore @@ -1,4 +1,3 @@ x264-0.144-20150225-c8a773e.tar.bz2 x264-0.148-20160118-5c65704.tar.bz2 /x264-0.148-20160614-a5e06b9.tar.bz2 -/x264-0.148-20160924-86b7198.tar.bz2 diff --git a/sources b/sources index 46ab657..ebb5a07 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -5d3470475b238807a57d22d39c58277c x264-0.148-20160924-86b7198.tar.bz2 +504515ba14fed322ad89cf39f05e78ee x264-0.148-20160614-a5e06b9.tar.bz2 diff --git a/x264.spec b/x264.spec index 0a5ac90..3f60dfa 100644 --- a/x264.spec +++ b/x264.spec @@ -1,7 +1,7 @@ -# globals for x264-0.148-20160924-86b7198.tar.bz2 +# globals for x264-0.148-20160614-a5e06b9.tar.bz2 %global api 148 -%global gitdate 20160924 -%global gitversion 86b7198 +%global gitdate 20160614 +%global gitversion a5e06b9 %global snapshot %{gitdate}-%{gitversion} %global gver .%{gitdate}git%{gitversion} %global branch stable @@ -29,8 +29,8 @@ Summary: H264/AVC video streams encoder Name: x264 -Version: 0.%{api}%{?gver} -Release: 1%{?_with_bootstrap:_bootstrap}%{?dist} +Version: 0.%{api} +Release: 11%{?gver}%{?_with_bootstrap:_bootstrap}%{?dist} License: GPLv2+ URL: https://www.videolan.org/developers/x264.html Source0: %{name}-0.%{api}-%{snapshot}.tar.bz2 @@ -200,12 +200,6 @@ install -pm644 generic/{AUTHORS,COPYING} %{buildroot}%{_pkgdocdir}/ %endif %changelog -* Sat Sep 24 2016 Sérgio Basto <sergio(a)serjux.com&gt; - 0.148.20160924git86b7198-1 -- Update to 0.148-20160924-86b7198 version -- Change versioning of the package in order to have better information, now the - package version include date plus git short commit, as result we may reset the - release count. - * Fri Aug 26 2016 Dominik Mierzejewski <rpm(a)greysector.net&gt; - 0.148-11.20160614gita5e06b9 - rework asm treatment on i686 and ppc64 - fix adding the 10b suffix to the library name