From 7a75c75b7923e0c53b0afb45a6c4e647bc0e3025 Mon Sep 17 00:00:00 2001
From: Dominik Mierzejewski <dominik@greysector.net>
Date: Mon, 4 Apr 2011 15:26:35 +0000
Subject: [PATCH] * Mon Apr 04 2011 Dominik Mierzejewski <rpm at
 greysector.net> - 0.6.90-0.1.rc0 - updated to 0.6.90-rc0 release - ensure
 main package is version-locked to the -libs subpackage

---
 .gitignore  |  2 +-
 ffmpeg.spec | 20 +++++++++++++++++---
 sources     |  2 +-
 3 files changed, 19 insertions(+), 5 deletions(-)

diff --git a/.gitignore b/.gitignore
index a26a4f9..d014abb 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1 @@
-ffmpeg-20110227.tar.bz2
+ffmpeg-0.6.90-rc0.tar.bz2
diff --git a/ffmpeg.spec b/ffmpeg.spec
index dca89e1..9869e56 100644
--- a/ffmpeg.spec
+++ b/ffmpeg.spec
@@ -1,11 +1,13 @@
 # TODO: add make test to %%check section
 
+%global git 0
 %global date    20110227
+%global rel     rc0
 
 Summary:        Digital VCR and streaming server
 Name:           ffmpeg
-Version:        0.6.1
-Release:        1.%{date}git%{?dist}
+Version:        0.6.90
+Release:        0.1.%{rel}%{?dist}
 %if 0%{?_with_amr:1}
 License:        GPLv3+
 %else
@@ -13,10 +15,14 @@ License:        GPLv2+
 %endif
 Group:          Applications/Multimedia
 URL:            http://ffmpeg.org/
+%if %{git}
 Source0:        ffmpeg-%{date}.tar.bz2
+%else
+Source0:        http://ffmpeg.org/releases/ffmpeg-%{version}-%{rel}.tar.bz2
+%endif
 Source1:        ffmpeg-snapshot.sh
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
+Requires:       %{name}-libs = %{version}-%{release}
 BuildRequires:  bzip2-devel
 BuildRequires:  dirac-devel
 %{?_with_faac:BuildRequires: faac-devel}
@@ -111,8 +117,12 @@ This package contains development files for %{name}
 
 
 %prep
+%if %{git}
 %setup -q -n ffmpeg-%{date}
 echo "git-snapshot-%{date}-RPMFusion" > VERSION
+%else
+%setup -q -n ffmpeg-%{version}-%{rel}
+%endif
 
 %build
 mkdir generic
@@ -228,6 +238,10 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Mon Apr 04 2011 Dominik Mierzejewski <rpm at greysector.net> - 0.6.90-0.1.rc0
+- updated to 0.6.90-rc0 release
+- ensure main package is version-locked to the -libs subpackage
+
 * Sun Feb 27 2011 Dominik Mierzejewski <rpm at greysector.net> - 0.6.1-1.20110227git
 - 20110227 snapshot
 - bump version to post-0.6.1 to allow stable 0.6.1 update in older branches
diff --git a/sources b/sources
index acc6a40..d1b5777 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-97a4485c7373faaa7df70f218867d20d  ffmpeg-20110227.tar.bz2
+d2e701a363c6ecebc47fdb917a164bb3  ffmpeg-0.6.90-rc0.tar.bz2