rpms/ffmpeg/devel .cvsignore, 1.36, 1.37 ffmpeg.spec, 1.66, 1.67 sources, 1.36, 1.37 ffmpeg-0.10.4-backport-libv4l2.patch, 1.1, NONE

Julian Sikorski belegdol at rpmfusion.org
Thu Oct 4 22:39:34 CEST 2012


Author: belegdol

Update of /cvs/free/rpms/ffmpeg/devel
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv18626

Modified Files:
	.cvsignore ffmpeg.spec sources 
Removed Files:
	ffmpeg-0.10.4-backport-libv4l2.patch 
Log Message:
* Thu Oct 04 2012 Julian Sikorski <belegdol at fedoraproject.org> - 1.0-1
- Updated to 1.0
- Dropped obsolete Group, Buildroot, %clean and %defattr
- Dropped the included patch



Index: .cvsignore
===================================================================
RCS file: /cvs/free/rpms/ffmpeg/devel/.cvsignore,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -r1.36 -r1.37
--- .cvsignore	14 Jun 2012 17:21:18 -0000	1.36
+++ .cvsignore	4 Oct 2012 20:39:33 -0000	1.37
@@ -1 +1 @@
-ffmpeg-0.11.1.tar.bz2
+ffmpeg-1.0.tar.bz2


Index: ffmpeg.spec
===================================================================
RCS file: /cvs/free/rpms/ffmpeg/devel/ffmpeg.spec,v
retrieving revision 1.66
retrieving revision 1.67
diff -u -r1.66 -r1.67
--- ffmpeg.spec	5 Sep 2012 22:15:48 -0000	1.66
+++ ffmpeg.spec	4 Oct 2012 20:39:33 -0000	1.67
@@ -11,14 +11,13 @@
 
 Summary:        Digital VCR and streaming server
 Name:           ffmpeg
-Version:        0.11.1
-Release:        3%{?date}%{?date:git}%{?rel}%{?dist}
+Version:        1.0
+Release:        1%{?date}%{?date:git}%{?rel}%{?dist}
 %if 0%{?_with_amr:1}
 License:        GPLv3+
 %else
 License:        GPLv2+
 %endif
-Group:          Applications/Multimedia
 URL:            http://ffmpeg.org/
 %if 0%{?date}
 Source0:        ffmpeg-%{?branch}%{date}.tar.bz2
@@ -26,8 +25,6 @@
 Source0:        http://ffmpeg.org/releases/ffmpeg-%{version}.tar.bz2
 %endif
 Source1:        ffmpeg-snapshot-oldabi.sh
-Patch0:         ffmpeg-0.10.4-backport-libv4l2.patch
-BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Requires:       %{name}-libs = %{version}-%{release}
 BuildRequires:  bzip2-devel
 %{!?_without_celt:BuildRequires: celt-devel}
@@ -80,7 +77,6 @@
 
 %package        libs
 Summary:        Libraries for %{name}
-Group:          System Environment/Libraries
 
 %description    libs
 FFmpeg is a complete and free Internet live audio and video
@@ -91,7 +87,6 @@
 
 %package        devel
 Summary:        Development package for %{name}
-Group:          Development/Libraries
 Requires:       %{name}-libs%{_isa} = %{version}-%{release}
 Requires:       pkgconfig
 
@@ -158,7 +153,6 @@
 %else
 %setup -q -n ffmpeg-%{version}
 %endif
-%patch0 -p1
 
 %build
 mkdir generic
@@ -233,9 +227,6 @@
 popd
 %endif
 
-%clean
-rm -rf $RPM_BUILD_ROOT
-
 
 %post libs -p /sbin/ldconfig
 
@@ -243,7 +234,6 @@
 
 %if 0%{!?ffmpegsuffix:1}
 %files
-%defattr(-,root,root,-)
 %doc COPYING.* CREDITS README doc/ffserver.conf
 %{_bindir}/ffmpeg
 %{_bindir}/ffplay
@@ -258,7 +248,6 @@
 %endif
 
 %files libs
-%defattr(-,root,root,-)
 %{_libdir}/lib*.so.*
 %if 0%{!?ffmpegsuffix:1}
 %ifarch sparc sparc64
@@ -267,7 +256,6 @@
 %endif
 
 %files devel
-%defattr(-,root,root,-)
 %doc MAINTAINERS doc/APIchanges doc/*.txt
 %{_includedir}/ffmpeg
 %{_libdir}/pkgconfig/lib*.pc
@@ -280,6 +268,11 @@
 
 
 %changelog
+* Thu Oct 04 2012 Julian Sikorski <belegdol at fedoraproject.org> - 1.0-1
+- Updated to 1.0
+- Dropped obsolete Group, Buildroot, %%clean and %%defattr
+- Dropped the included patch
+
 * Wed Sep 05 2012 Nicolas Chauvet <kwizart at gmail.com> - 0.11.1-3
 - Rebuilt for x264 ABI 125
 


Index: sources
===================================================================
RCS file: /cvs/free/rpms/ffmpeg/devel/sources,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -r1.36 -r1.37
--- sources	14 Jun 2012 17:21:18 -0000	1.36
+++ sources	4 Oct 2012 20:39:33 -0000	1.37
@@ -1 +1 @@
-ff8cb914f657e164dd60ea1008b555a8  ffmpeg-0.11.1.tar.bz2
+3ed526cea20c1bffb5a37f7730f710bd  ffmpeg-1.0.tar.bz2


--- ffmpeg-0.10.4-backport-libv4l2.patch DELETED ---


More information about the rpmfusion-commits mailing list