rpms/x264/devel x264.spec,1.23,1.24 x264-shared.patch,1.3,NONE

Author: kwizart Update of /cvs/free/rpms/x264/devel In directory se02.es.rpmfusion.net:/tmp/cvs-serv9851 Modified Files: x264.spec Removed Files: x264-shared.patch Log Message: Remove merged patch Index: x264.spec =================================================================== RCS file: /cvs/free/rpms/x264/devel/x264.spec,v retrieving revision 1.23 retrieving revision 1.24 diff -u -r1.23 -r1.24 --- x264.spec 27 Feb 2011 22:52:17 -0000 1.23 +++ x264.spec 10 Mar 2011 21:55:23 -0000 1.24 @@ -3,7 +3,7 @@ Summary: H264/AVC video streams encoder Name: x264 Version: 0.0.0 -Release: 0.29.%{snapshot}%{?dist} +Release: 0.30.%{snapshot}%{?dist} License: GPLv2+ Group: System Environment/Libraries URL: http://developers.videolan.org/x264.html @@ -11,8 +11,6 @@ Source1: x264-snapshot.sh # don't remove config.h and don't re-run version.sh Patch0: x264-nover.patch -# link with shared libx264 -Patch1: x264-shared.patch # don't strip if configured with --enable-debug Patch2: x264-nostrip.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(id -u -n) @@ -65,7 +63,6 @@ %prep %setup -q -n %{name}-%{snapshot} %patch0 -p1 -b .nover -%patch1 -p1 -b .shared %patch2 -p1 -b .nostrip # AUTHORS file is in iso-8859-1 iconv -f iso-8859-1 -t utf-8 -o AUTHORS.utf8 AUTHORS @@ -137,6 +134,9 @@ %endif %changelog +* Thu Mar 10 2011 Nicolas Chauvet <kwizart(a)gmail.com&gt; - 0.0.0-0.30.20110227 +- Remove merged x264-shared.patch + * Mon Jan 10 2011 Dominik Mierzejewski <rpm(a)greysector.net&gt; 0.0.0-0.29.20110227 - 20110227 snapshot (ABI bump) --- x264-shared.patch DELETED ---