Browse Source

updated self-build-vlc

git-svn-id: http://trac.vinelinux.org/repos/projects/specs@4175 ec354946-7b23-47d6-9f5a-488ba84defc7
munepi 13 years ago
parent
commit
51acade64b

+ 8 - 3
nonfree/self-build-vlc/self-build-vlc-vl.spec

@@ -1,7 +1,7 @@
 %define pkgname vlc
 %define name    self-build-%{pkgname}
-%define version 1.1.9
-%define release 2%{?_dist_release}
+%define version 1.1.10
+%define release 1%{?_dist_release}
 
 %define with_mozilla	 		0
 %define with_dc1394			0
@@ -26,6 +26,7 @@ Source0:	%{pkgname}-vl.spec
 Source100:      vlc-1.1.0-vlc-cache-gen_noerror.patch
 Source103:	vlc-1.1.6-hardode_font_patch.patch
 Source104:	vlc-1.1.4-tls_path.patch
+Source106:	vlc-1.1-backport_20110607.patch
 
 ## vine
 Source150:	vlc-1.1.7-revert-pulse-c.patch
@@ -255,7 +256,7 @@ mp3, ogg など)だけでなく,DVD や VCD,様々なストリーミング
 %{__install} -m 644 %{SOURCE0} ${RPM_BUILD_ROOT}/%{_datadir}/%{name}
 
 %{__install} -m 644 \
-    %{SOURCE100} %{SOURCE103} %{SOURCE104} \
+    %{SOURCE100} %{SOURCE103} %{SOURCE104} %{SOURCE106} \
     %{SOURCE150} \
     ${RPM_BUILD_ROOT}/%{_datadir}/%{name}
 
@@ -275,6 +276,10 @@ mp3, ogg など)だけでなく,DVD や VCD,様々なストリーミング
 
 
 %changelog
+* Fri Jun 17 2011 Munehiro Yamamoto <munepi@vinelinux.org> 1.1.10-1
+- new upstream release
+- backport from 1.1-bugfix from RPM Fusion development
+
 * Mon Apr 18 2011 Munehiro Yamamoto <munepi@vinelinux.org> 1.1.9-2
 - added Requires(post): unzip
 

+ 8 - 2
nonfree/self-build-vlc/vlc-vl.spec

@@ -13,8 +13,8 @@
 
 Summary:	Multi-platform MPEG, DVD, and DivX player
 Name:		vlc
-Version:	1.1.9
-Release:	2%{?_dist_release}
+Version:	1.1.10
+Release:	1%{?_dist_release}
 License:	GPLv2+
 Group:		Applications/Multimedia
 URL:		http://www.videolan.org/
@@ -30,6 +30,7 @@ Patch0:		vlc-1.1.0-vlc-cache-gen_noerror.patch
 Patch3:		vlc-1.1.6-hardode_font_patch.patch
 Patch4:		vlc-1.1.4-tls_path.patch
 #Patch5:         vlc-1.1.8-bugfix.opencv22.patch
+Patch6:         vlc-1.1-backport_20110607.patch
 
 ## vine
 Patch50:	vlc-1.1.7-revert-pulse-c.patch
@@ -268,6 +269,7 @@ VLC plugins for libdc1394
 %patch3 -p1 -b .hardode_path
 %patch4 -p1 -b .tls_path
 #%patch5 -p1 -b .opencv22
+%patch6 -p1
 
 unzip %{SOURCE10}
 patch -p1 < vlc_patch_0.02/vlc118.diff || exit 1
@@ -477,6 +479,10 @@ fi || :
 
 
 %changelog
+* Fri Jun 17 2011 Munehiro Yamamoto <munepi@vinelinux.org> 1.1.10-1
+- new upstream release
+- backport from 1.1-bugfix from RPM Fusion development
+
 * Mon Apr 18 2011 Munehiro Yamamoto <munepi@vinelinux.org> 1.1.9-2
 - added BuildRequires: unzip