rpms/ffmpeg/devel .cvsignore, 1.21, 1.22 ffmpeg.spec, 1.40, 1.41 sources, 1.21, 1.22
Author: rathann
Update of /cvs/free/rpms/ffmpeg/devel
In directory se02.es.rpmfusion.net:/tmp/cvs-serv25379
Modified Files:
.cvsignore ffmpeg.spec sources
Log Message:
* 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
Index: .cvsignore
===================================================================
RCS file: /cvs/free/rpms/ffmpeg/devel/.cvsignore,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- .cvsignore 27 Feb 2011 23:38:24 -0000 1.21
+++ .cvsignore 4 Apr 2011 15:26:35 -0000 1.22
@@ -1 +1 @@
-ffmpeg-20110227.tar.bz2
+ffmpeg-0.6.90-rc0.tar.bz2
Index: ffmpeg.spec
===================================================================
RCS file: /cvs/free/rpms/ffmpeg/devel/ffmpeg.spec,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -r1.40 -r1.41
--- ffmpeg.spec 10 Mar 2011 12:48:13 -0000 1.40
+++ ffmpeg.spec 4 Apr 2011 15:26:35 -0000 1.41
@@ -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 @@
%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 @@
%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 @@
%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
Index: sources
===================================================================
RCS file: /cvs/free/rpms/ffmpeg/devel/sources,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- sources 27 Feb 2011 23:38:24 -0000 1.21
+++ sources 4 Apr 2011 15:26:35 -0000 1.22
@@ -1 +1 @@
-97a4485c7373faaa7df70f218867d20d ffmpeg-20110227.tar.bz2
+d2e701a363c6ecebc47fdb917a164bb3 ffmpeg-0.6.90-rc0.tar.bz2