From 26118ab0637f120df489866e1f0563e46103bf76 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=A9rgio=20M=2E=20Basto?= <sergio@serjux.com>
Date: Sat, 19 Jan 2013 11:26:02 +0000
Subject: [PATCH] =?UTF-8?q?*=20Sat=20Jan=2019=202013=20S=C3=A9rgio=20Basto?=
 =?UTF-8?q?=20<sergio@serjux.com>=20-=200.129-1.20130119git9c4ba4b=20-=20U?=
 =?UTF-8?q?pdate=20to=209c4ba4bde8965571159eae2d79f85cabbb47416c,=20soname?=
 =?UTF-8?q?=20bump.=20-=20Changed=20branch=20name=20by=20api=20number,=20i?=
 =?UTF-8?q?s=20more=20readable.=20-=20Drop=20upstreamed=20patch.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 x264-snapshot.sh |  3 ++-
 x264.spec        | 32 ++++++++++++++++++--------------
 2 files changed, 20 insertions(+), 15 deletions(-)

diff --git a/x264-snapshot.sh b/x264-snapshot.sh
index fdb4ca8..3f29af0 100755
--- a/x264-snapshot.sh
+++ b/x264-snapshot.sh
@@ -24,7 +24,8 @@ tag=$(git rev-list HEAD -n 1 | cut -c 1-7)
 git checkout ${commit}
 git checkout -b rpmfusion
 ./version.sh > version.h
+API=`grep '#define X264_BUILD' < x264.h | sed -e 's/.* \([1-9][0-9]*\).*/\1/'`
 git add version.h
 git commit -m "generated version.h" version.h
-git archive --prefix="${package}-${branch}-${date}-${tag}/" --format=tar rpmfusion | bzip2 > "$pwd"/${package}-${branch}-${date}-${tag}.tar.bz2
+git archive --prefix="${package}-0.$API-${date}-${tag}/" --format=tar rpmfusion | bzip2 > "$pwd"/${package}-0.$API-${date}-${tag}.tar.bz2
 popd >/dev/null
diff --git a/x264.spec b/x264.spec
index e7e67a4..c7d0296 100644
--- a/x264.spec
+++ b/x264.spec
@@ -1,5 +1,6 @@
-%global gitdate 20121118
-%global gitversion f6a8615
+%global api 129
+%global gitdate 20130119
+%global gitversion 9c4ba4b
 %global snapshot %{gitdate}-%{gitversion}
 %global gver .%{gitdate}git%{gitversion}
 %global branch stable
@@ -22,18 +23,16 @@
 
 Summary: H264/AVC video streams encoder
 Name: x264
-Version: 0.128
-Release: 2%{?gver}%{?dist}
+Version: 0.%{api}
+Release: 1%{?gver}%{?dist}
 License: GPLv2+
 Group: System Environment/Libraries
 URL: http://developers.videolan.org/x264.html
-Source0: %{name}-%{branch}-%{snapshot}.tar.bz2
+Source0: %{name}-0.%{api}-%{snapshot}.tar.bz2
 Source1: x264-snapshot.sh
 
 # don't remove config.h and don't re-run version.sh
 Patch0: x264-nover.patch
-#upstreamable patches
-Patch100: x264-gf_malloc.patch
 
 %{!?_without_gpac:BuildRequires: gpac-devel-static zlib-devel}
 %{!?_without_libavformat:BuildRequires: ffmpeg-devel}
@@ -87,18 +86,18 @@ This package contains the development files.
 
 
 %prep
-%setup -q -c -n %{name}-%{branch}-%{snapshot}
-pushd %{name}-%{branch}-%{snapshot}
+%setup -q -c -n %{name}-0.%{api}-%{snapshot}
+pushd %{name}-0.%{api}-%{snapshot}
 %patch0 -p1 -b .nover
-%patch100 -p1 -b .gf_malloc
 popd
+
 variants="generic generic10"
 %ifarch i686
 variants="$variants simd"
 %endif
 for variant in $variants ; do
   rm -rf ${variant}
-  cp -pr %{name}-%{branch}-%{snapshot} ${variant}
+  cp -pr %{name}-0.%{api}-%{snapshot} ${variant}
 done
 
 
@@ -170,11 +169,11 @@ touch -r generic/version.h %{buildroot}%{_includedir}/x264.h %{buildroot}%{_incl
 
 %files libs
 %defattr(644, root, root, 0755)
-%{_libdir}/libx264.so.*
+%{_libdir}/libx264.so.%{api}
 %ifarch i686
-%{_libdir}/sse2/libx264.so.*
+%{_libdir}/sse2/libx264.so.%{api}
 %endif
-%{_libdir}/libx26410b.so.*
+%{_libdir}/libx26410b.so.%{api}
 
 %files devel
 %defattr(644, root, root, 0755)
@@ -189,6 +188,11 @@ touch -r generic/version.h %{buildroot}%{_includedir}/x264.h %{buildroot}%{_incl
 %{_libdir}/libx26410b.so
 
 %changelog
+* Sat Jan 19 2013 Sérgio Basto <sergio@serjux.com> - 0.129-1.20130119git9c4ba4b
+- Update to 9c4ba4bde8965571159eae2d79f85cabbb47416c, soname bump.
+- Changed branch name by api number, is more readable.
+- Drop upstreamed patch.
+
 * Fri Nov 23 2012 Sérgio Basto <sergio@serjux.com> - 0.128-2.20121118gitf6a8615
 - unbootstrap on F18.