Browse Source

updated self-build-vlc

git-svn-id: http://trac.vinelinux.org/repos/projects/specs@5350 ec354946-7b23-47d6-9f5a-488ba84defc7
munepi 12 years ago
parent
commit
3fc156228f
2 changed files with 13 additions and 13 deletions
  1. 7 6
      nonfree/self-build-vlc/self-build-vlc-vl.spec
  2. 6 7
      nonfree/self-build-vlc/vlc-vl.spec

+ 7 - 6
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.12
-%define release 3%{?_dist_release}
+%define version 1.1.13
+%define release 1%{?_dist_release}
 
 %define with_mozilla	 		0
 %define with_dc1394			0
@@ -27,8 +27,6 @@ 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
 #Source105:         vlc-1.1.8-bugfix.opencv22.patch
-Source106:		0001-Fix-typo-in-vlc.desktop.patch
-#Source107:		0001-kate-do-not-access-the-renderer-if-it-fails-to-initi.patch
 
 ## vine
 Source150:	vlc-1.1.7-revert-pulse-c.patch
@@ -256,7 +254,7 @@ mp3, ogg など)だけでなく,DVD や VCD,様々なストリーミング
 %{__install} -m 644 %{SOURCE0} ${RPM_BUILD_ROOT}/%{_datadir}/%{name}
 
 %{__install} -m 644 \
-    %{SOURCE100} %{SOURCE103} %{SOURCE104} %{SOURCE106} \
+    %{SOURCE100} %{SOURCE103} %{SOURCE104} \
     %{SOURCE150} \
     ${RPM_BUILD_ROOT}/%{_datadir}/%{name}
 
@@ -266,7 +264,7 @@ mp3, ogg など)だけでなく,DVD や VCD,様々なストリーミング
 
 %posttrans
 /usr/lib/rpm/self-build-rpm.sh %{name} %{pkgname}-vl.spec \
-    %{sourceurl0} %{sourceurl10} 1216000
+    %{sourceurl0} %{sourceurl10} 1286000
 /usr/lib/rpm/pre-allocate-rpm.sh %{pkgname}-%{version}-%{release} \
                                  %{pkgname}-devel-%{version}-%{release}
 
@@ -276,6 +274,9 @@ mp3, ogg など)だけでなく,DVD や VCD,様々なストリーミング
 
 
 %changelog
+* Tue Jan  3 2012 Munehiro Yamamoto <munepi@vinelinux.org> 1.1.13-1
+- new upstream release
+
 * Sun Dec 18 2011 Munehiro Yamamoto <munepi@vinelinux.org> 1.1.12-3
 - rebuilt with new x264 and ffmpeg
 

+ 6 - 7
nonfree/self-build-vlc/vlc-vl.spec

@@ -13,8 +13,8 @@
 
 Summary:	Multi-platform MPEG, DVD, and DivX player
 Name:		vlc
-Version:	1.1.12
-Release:	3%{?_dist_release}
+Version:	1.1.13
+Release:	1%{?_dist_release}
 License:	GPLv2+
 Group:		Applications/Multimedia
 URL:		http://www.videolan.org/
@@ -30,8 +30,6 @@ 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:		0001-Fix-typo-in-vlc.desktop.patch
-#Patch7:		0001-kate-do-not-access-the-renderer-if-it-fails-to-initi.patch
 
 ## vine
 Patch50:	vlc-1.1.7-revert-pulse-c.patch
@@ -270,9 +268,7 @@ VLC plugins for libdc1394
 %patch3 -p1 -b .hardode_path
 %patch4 -p1 -b .tls_path
 #%patch5 -p1 -b .opencv22
-sed -i.dmo_pic -e 's/fno-PIC/fPIC/' libs/loader/Makefile.in
-%patch6 -p1
-#%patch7 -p1
+%__sed -i.dmo_pic -e 's/fno-PIC/fPIC/' libs/loader/Makefile.in
 
 unzip %{SOURCE10}
 patch -p1 < vlc_patch_0.02/vlc118.diff || exit 1
@@ -482,6 +478,9 @@ fi || :
 
 
 %changelog
+* Tue Jan  3 2012 Munehiro Yamamoto <munepi@vinelinux.org> 1.1.13-1
+- new upstream release
+
 * Sun Dec 18 2011 Munehiro Yamamoto <munepi@vinelinux.org> 1.1.12-3
 - rebuilt with new x264 and ffmpeg