From 886ee397483a437bed53073b02719e3e96c789f5 Mon Sep 17 00:00:00 2001
From: Dominik Mierzejewski <dominik@greysector.net>
Date: Mon, 10 Jan 2011 12:54:19 +0000
Subject: [PATCH] * Mon Jan 10 2011 Dominik Mierzejewski <rpm@greysector.net>
 0.0.0-0.29.20110110 - 20110110 snapshot (ABI bump)

---
 .gitignore |  2 +-
 sources    |  2 +-
 x264.spec  | 11 ++++++-----
 3 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/.gitignore b/.gitignore
index 768cd02..8d0089b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1 @@
-x264-20100706.tar.bz2
+x264-20110110.tar.bz2
diff --git a/sources b/sources
index 8d14f28..bedcc5d 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-ea9eae8863f2a8c4728f39f666ae7c7a  x264-20100706.tar.bz2
+f34cfcf47656cb6bfe7052a113b0db8d  x264-20110110.tar.bz2
diff --git a/x264.spec b/x264.spec
index dee3bb3..234c313 100644
--- a/x264.spec
+++ b/x264.spec
@@ -1,10 +1,9 @@
-%global snapshot 20100706
-%global git d058f37
+%global snapshot 20110110
 
 Summary: H264/AVC video streams encoder
 Name: x264
 Version: 0.0.0
-Release: 0.28.%{snapshot}git%{git}%{?dist}
+Release: 0.29.%{snapshot}%{?dist}
 License: GPLv2+
 Group: System Environment/Libraries
 URL: http://developers.videolan.org/x264.html
@@ -57,9 +56,7 @@ This package contains the development files.
 	--bindir=%{_bindir} \\\
 	--includedir=%{_includedir} \\\
 	--extra-cflags="$RPM_OPT_FLAGS" \\\
-	%{!?_without_gpac:--enable-mp4-output} \\\
 	%{?_with_visualize:--enable-visualize} \\\
-	--enable-pthread \\\
 	--enable-debug \\\
 	--enable-shared \\\
 	--enable-pic
@@ -132,6 +129,7 @@ popd
 %defattr(644, root, root, 0755)
 %doc doc/*
 %{_includedir}/x264.h
+%{_includedir}/x264_config.h
 %{_libdir}/libx264.so
 %{_libdir}/pkgconfig/%{name}.pc
 %ifarch i686
@@ -139,6 +137,9 @@ popd
 %endif
 
 %changelog
+* Mon Jan 10 2011 Dominik Mierzejewski <rpm@greysector.net> 0.0.0-0.29.20110110
+- 20110110 snapshot (ABI bump)
+
 * Tue Jul 06 2010 Dominik Mierzejewski <rpm@greysector.net> 0.0.0-0.28.20100706gitd058f37
 - 20100706 snapshot (ABI bump)
 - drop old Obsoletes: