Browse Source

new upstream release

git-svn-id: http://trac.vinelinux.org/repos/projects/specs@6325 ec354946-7b23-47d6-9f5a-488ba84defc7
munepi 12 years ago
parent
commit
8e5d37ae5e

+ 7 - 2
nonfree/self-build-ffmpeg/ffmpeg-vl.spec

@@ -10,9 +10,11 @@
 
 %define use_prebuilt_man 1
 
+%global major_version 0.11
+
 Summary:	Digital VCR and streaming server
 Name:		ffmpeg
-Version:	0.11
+Version:	%{major_version}.1
 Release:	1%{?svndate:.%svndate}%{?_dist_release}
 Source:		http://ffmpeg.org/releases/%{name}-%{?svndate:%svndate}%{!?svndate:%version}.tar.bz2
 
@@ -71,7 +73,7 @@ Requires:	%{name}-libs = %{version}-%{release}
 
 BuildRoot:	%{_tmppath}/%{name}-%{version}-root
 
-Obsoletes:      ffmpeg < %{version}, ffmpeg-libs < %{version}, ffmpeg-devel < %{version}
+Obsoletes:      ffmpeg < %{major_version}, ffmpeg-libs < %{major_version}, ffmpeg-devel < %{major_version}
 
 %description
 FFMpeg is a complete and free Internet live audio and video
@@ -225,6 +227,9 @@ export RPM_OPT_FLAGS="$RPM_OPT_FLAGS -mlongcall"
 
 
 %changelog
+* Mon Jun 11 2012 Munehiro Yamamoto <munepi@vinelinux.org> 0.11.1-1
+- new upstream release
+
 * Sat May 26 2012 Munehiro Yamamoto <munepi@vinelinux.org> 0.11-1
 - new upstream release
 

+ 7 - 3
nonfree/self-build-ffmpeg/self-build-ffmpeg-vl.spec

@@ -6,7 +6,8 @@
 
 %global pkgname ffmpeg
 %global name	self-build-%{pkgname}
-%global version 0.11
+%global major_version 0.11
+%global version %{major_version}.1
 #% define svndate	20110326
 %global release	1%{?svndate:.%svndate}%{?_dist_release}
 
@@ -33,8 +34,8 @@ Source0:	%{pkgname}-vl.spec
 License:	GPLv2+
 Group:		Restricted Software
 
-Obsoletes:      ffmpeg < %{version}, ffmpeg-libs < %{version}, ffmpeg-devel < %{version}
-Obsoletes:      self-build-ffmpeg < %{version}
+Obsoletes:      ffmpeg < %{major_version}, ffmpeg-libs < %{major_version}, ffmpeg-devel < %{major_version}
+Obsoletes:      self-build-ffmpeg < %{major_version}
 
 Requires(post):		self-build-setup >= 0.9.9
 #Requires(post):		subversion
@@ -193,6 +194,9 @@ Rebuild_gpac_$LOCALE
 %{_datadir}/%{name}
 
 %changelog
+* Mon Jun 11 2012 Munehiro Yamamoto <munepi@vinelinux.org> 0.11.1-1
+- new upstream release
+
 * Sat May 26 2012 Munehiro Yamamoto <munepi@vinelinux.org> 0.11-1
 - new upstream release