Author: rathann Update of /cvs/free/rpms/x264/F-13 In directory se02.es.rpmfusion.net:/tmp/cvs-serv2312 Modified Files: .cvsignore sources x264-snapshot.sh x264.spec Log Message: * Thu Apr 29 2010 Dominik Mierzejewski <rpm(a)greysector.net&gt; 0.0.0-0.27.20100130git3659b81 - 20100130 snapshot (last before next major version bump) - s/%{ix86}/i686 (rfbz #1075) - ship more docs in -devel Index: .cvsignore =================================================================== RCS file: /cvs/free/rpms/x264/F-13/.cvsignore,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- .cvsignore 16 Jan 2010 14:55:48 -0000 1.11 +++ .cvsignore 29 Apr 2010 22:51:18 -0000 1.12 @@ -1 +1 @@ -x264-20100116.tar.bz2 +x264-20100130.tar.bz2 Index: sources =================================================================== RCS file: /cvs/free/rpms/x264/F-13/sources,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- sources 16 Jan 2010 14:55:48 -0000 1.11 +++ sources 29 Apr 2010 22:51:18 -0000 1.12 @@ -1 +1 @@ -e3e2f2150f240dfaf5abfb1832bb23d7 x264-20100116.tar.bz2 +6392d160808f243164efddacb7c9292a x264-20100130.tar.bz2 Index: x264-snapshot.sh =================================================================== RCS file: /cvs/free/rpms/x264/F-13/x264-snapshot.sh,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- x264-snapshot.sh 3 Aug 2008 17:53:20 -0000 1.1 +++ x264-snapshot.sh 29 Apr 2010 22:51:18 -0000 1.2 @@ -13,10 +13,12 @@ unset CDPATH pwd=$(pwd) git=$(date +%Y%m%d) +git=20100130 pushd "$tmp" git clone git://git.videolan.org/x264.git x264-$git pushd x264-$git +git checkout 3659b8124a809c39d61a28bdf1b235e81c02b06d ./version.sh . find . -type d -name .git -print0 | xargs -0r rm -rf popd Index: x264.spec =================================================================== RCS file: /cvs/free/rpms/x264/F-13/x264.spec,v retrieving revision 1.17 retrieving revision 1.18 diff -u -r1.17 -r1.18 --- x264.spec 16 Jan 2010 14:55:48 -0000 1.17 +++ x264.spec 29 Apr 2010 22:51:18 -0000 1.18 @@ -1,5 +1,5 @@ -%global snapshot 20100116 -%global git 3d0f110 +%global snapshot 20100130 +%global git 3659b81 Summary: H264/AVC video streams encoder Name: x264 @@ -19,7 +19,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(id -u -n) %{!?_without_gpac:BuildRequires: gpac-devel-static} %{?_with_visualize:BuildRequires: libX11-devel} -%ifarch x86_64 %{ix86} +%ifarch x86_64 i686 BuildRequires: yasm %endif Requires: %{name}-libs = %{version}-%{release} @@ -75,7 +75,7 @@ # AUTHORS file is in iso-8859-1 iconv -f iso-8859-1 -t utf-8 -o AUTHORS.utf8 AUTHORS mv -f AUTHORS.utf8 AUTHORS -%ifarch %{ix86} +%ifarch i686 mkdir simd cp -a `ls -1|grep -v simd` simd/ %endif @@ -84,7 +84,7 @@ %{x_configure}\ --host=%{_target_platform} \ --libdir=%{_libdir} \ -%ifarch %{ix86} +%ifarch i686 --disable-asm \ %endif @@ -102,7 +102,7 @@ %install %{__rm} -rf %{buildroot} %{__make} DESTDIR=%{buildroot} install -%ifarch %{ix86} +%ifarch i686 pushd simd %{__make} DESTDIR=%{buildroot} install rm %{buildroot}%{_libdir}/*/pkgconfig/x264.pc @@ -132,15 +132,20 @@ %files devel %defattr(644, root, root, 0755) -%doc doc/ratecontrol.txt doc/vui.txt +%doc doc/* %{_includedir}/x264.h %{_libdir}/libx264.so %{_libdir}/pkgconfig/%{name}.pc -%ifarch %{ix86} +%ifarch i686 %{_libdir}/sse2/libx264.so %endif %changelog +* Thu Apr 29 2010 Dominik Mierzejewski <rpm(a)greysector.net&gt; 0.0.0-0.27.20100130git3659b81 +- 20100130 snapshot (last before next major version bump) +- s/%%{ix86}/i686 (rfbz #1075) +- ship more docs in -devel + * Sat Jan 16 2010 Dominik Mierzejewski <rpm(a)greysector.net&gt; 0.0.0-0.26.20100116git3d0f110 - 20100116 snapshot (SO version bump) - don't remove config.h and don't re-run version.sh