From 6d8181b431d2d475804d064f4aecbb0da7c5135a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=A9rgio=20M=2E=20Basto?= <sergio@serjux.com>
Date: Mon, 12 Mar 2012 00:59:40 +0000
Subject: [PATCH] =?UTF-8?q?*=20Sat=20Mar=203=202012=20S=C3=A9rgio=20Basto?=
 =?UTF-8?q?=20<sergio@serjux.com>=20-=200.120-1.20120303=20-=20Change=20re?=
 =?UTF-8?q?lease=20number,=20upstream=20have=20release=20numbers=20at=20le?=
 =?UTF-8?q?ast=20on=20stable=20branch=20and=20as=20ffmpeg=20=20=20reported?=
 =?UTF-8?q?.=20-=20Update=20to=2020120303=20-=20Update=20x264-nover.patch,?=
 =?UTF-8?q?=20as=20suggest=20by=20Joseph=20D.=20Wagner=20<joe@josephdwagne?=
 =?UTF-8?q?r.info>=20-=20Dropped=20obsolete=20Buildroot=20and=20Clean.=20-?=
 =?UTF-8?q?=20add=20BuildRequires:=20zlib-devel=20to=20enable=20gpac.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .gitignore       |  2 +-
 sources          |  2 +-
 x264-nover.patch |  4 ++--
 x264.spec        | 22 +++++++++++++---------
 4 files changed, 17 insertions(+), 13 deletions(-)

diff --git a/.gitignore b/.gitignore
index 22aecb2..6e9999c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1 @@
-x264-stable-20120125.tar.bz2
+x264-stable-20120303.tar.bz2
diff --git a/sources b/sources
index 853f266..cff4da4 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-2770fa3d5b54a54f996eb4064eef2fdf  x264-stable-20120125.tar.bz2
+096fcd4708acc6e01b8944df73499e59  x264-stable-20120303.tar.bz2
diff --git a/x264-nover.patch b/x264-nover.patch
index 24a9535..5963b99 100644
--- a/x264-nover.patch
+++ b/x264-nover.patch
@@ -5,8 +5,8 @@ diff -up x264-stable-20110811/configure.nover x264-stable-20110811/configure
  echo "LDFLAGSCLI = $LDFLAGSCLI" >> config.mak
  echo "CLI_LIBX264 = $CLI_LIBX264" >> config.mak
  
--./version.sh >> x264_config.h
-+cat version.h >> x264_config.h
+-${SRCPATH}/version.sh "${SRCPATH}" >> x264_config.h
++cat ${SRCPATH}/version.h >> ${SRCPATH}/x264_config.h
  
  pclibs="-L$libdir -lx264 $libpthread"
  
diff --git a/x264.spec b/x264.spec
index ac65d59..829ae66 100644
--- a/x264.spec
+++ b/x264.spec
@@ -1,11 +1,11 @@
-%global snapshot 20120125
+%global snapshot 20120303
 %global branch   stable
-%global _without_gpac 1
+#global _without_gpac 0
 
 Summary: H264/AVC video streams encoder
 Name: x264
-Version: 0.0.0
-Release: 0.34.%{snapshot}%{?dist}
+Version: 0.120
+Release: 1.%{snapshot}%{?dist}
 License: GPLv2+
 Group: System Environment/Libraries
 URL: http://developers.videolan.org/x264.html
@@ -13,8 +13,7 @@ Source0: %{name}-%{branch}-%{snapshot}.tar.bz2
 Source1: x264-snapshot.sh
 # don't remove config.h and don't re-run version.sh
 Patch0: x264-nover.patch
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(id -u -n)
-%{!?_without_gpac:BuildRequires: gpac-devel-static}
+%{!?_without_gpac:BuildRequires: gpac-devel-static zlib-devel}
 %{?_with_libavformat:BuildRequires: ffmpeg-devel}
 %{?_with_ffmpegsource:BuildRequires: ffmpegsource-devel}
 %{?_with_visualize:BuildRequires: libX11-devel}
@@ -106,9 +105,6 @@ popd
 touch -r version.h %{buildroot}%{_includedir}/x264.h %{buildroot}%{_includedir}/x264_config.h
 
 
-%clean
-%{__rm} -rf %{buildroot}
-
 %post libs -p /sbin/ldconfig
 
 %postun libs -p /sbin/ldconfig
@@ -137,6 +133,14 @@ touch -r version.h %{buildroot}%{_includedir}/x264.h %{buildroot}%{_includedir}/
 %endif
 
 %changelog
+* Sat Mar 3 2012 Sérgio Basto <sergio@serjux.com> - 0.120-1.20120303
+- Change release number, upstream have release numbers at least on stable branch and as ffmpeg
+  reported.
+- Update to 20120303
+- Update x264-nover.patch, as suggest by Joseph D. Wagner <joe@josephdwagner.info> 
+- Dropped obsolete Buildroot and Clean.
+- add BuildRequires: zlib-devel to enable gpac.
+
 * Wed Feb 22 2012 Nicolas Chauvet <kwizart@gmail.com> - 0.0.0-0.34.20120125
 - Rebuilt for F-17 inter branch