updated self-build-vl.spec: new upstream release; applied vlc_patch_0.02/vlc118.diff in up0617.zip on 2sen.dip.jp/dtv

git-svn-id: http://trac.vinelinux.org/repos/projects/specs@3523 ec354946-7b23-47d6-9f5a-488ba84defc7

nonfree/self-build-vlc/self-build-vlc-vl.spec

@@ -1,15 +1,15 @@
 %define pkgname vlc
 %define name    self-build-%{pkgname}
-%define version 1.1.8
+%define version 1.1.9
 %define release 1%{?_dist_release}
 
 %define with_mozilla	 		0
 %define with_dc1394			0
-%define with_directfb			1
 
 %define with_samba			0
 
 %define sourceurl0	http://download.videolan.org/pub/videolan/%{pkgname}/%{version}/%{pkgname}-%{version}.tar.bz2
+%define sourceurl10	http://2sen.dip.jp/cgi-bin/dtvup/source/up0617.zip
 
 
 Summary:	Package to automatically build %{pkgname} rpm package
@@ -263,7 +263,8 @@ mp3, ogg など）だけでなく，DVD や VCD，様々なストリーミング
 %{__rm} -rf ${RPM_BUILD_ROOT}
 
 %posttrans
-/usr/lib/rpm/self-build-rpm.sh %{name} %{pkgname}-vl.spec "%{sourceurl0}" 1216000
+/usr/lib/rpm/self-build-rpm.sh %{name} %{pkgname}-vl.spec \
+    %{sourceurl0} %{sourceurl10} 1216000
 /usr/lib/rpm/pre-allocate-rpm.sh %{pkgname}-%{version}-%{release} \
                                  %{pkgname}-devel-%{version}-%{release}
 
@@ -273,6 +274,10 @@ mp3, ogg など）だけでなく，DVD や VCD，様々なストリーミング
 
 
 %changelog
+* Sun Apr 17 2011 Munehiro Yamamoto <munepi@vinelinux.org> 1.1.9-1
+- new upstream release
+- applied vlc_patch_0.02/vlc118.diff in up0617.zip on 2sen.dip.jp/dtv
+
 * Sat Mar 26 2011 Munehiro Yamamoto <munepi@vinelinux.org> 1.1.8-1
 - new upstream release
 - added Requires(post):

nonfree/self-build-vlc/vlc-vl.spec

@@ -13,7 +13,7 @@
 
 Summary:	Multi-platform MPEG, DVD, and DivX player
 Name:		vlc
-Version:	1.1.8
+Version:	1.1.9
 Release:	1%{?_dist_release}
 License:	GPLv2+
 Group:		Applications/Multimedia
@@ -22,9 +22,14 @@ Source0:	http://download.videolan.org/pub/videolan/vlc/%{version}/vlc-%{version}
 # %if %with_internal_live555
 # Source2:	http://www.live555.com/liveMedia/public/live.%{live555_date}.tar.gz
 # %endif
+
+# vlc_patch_0.02/vlc118.diff
+Source10: http://2sen.dip.jp/cgi-bin/dtvup/source/up0617.zip
+
 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
 
 ## vine
 Patch50:	vlc-1.1.7-revert-pulse-c.patch
@@ -263,6 +268,9 @@ VLC plugins for libdc1394
 %patch4 -p1 -b .tls_path
 #%patch5 -p1 -b .opencv22
 
+unzip %{SOURCE10}
+patch -p1 < vlc_patch_0.02/vlc118.diff || exit 1
+
 ## vine
 %if %{?_dist_release} == "vl5"
 %patch50 -p1 -b .pulse
@@ -374,8 +382,8 @@ VLC plugins for libdc1394
 %__rm -rf $RPM_BUILD_ROOT
 
 %__make install DESTDIR=$RPM_BUILD_ROOT INSTALL="install -p" CPPROG="cp -p"
-find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} ';'
-find $RPM_BUILD_ROOT -name '*.a' -exec rm -f {} ';'
+find $RPM_BUILD_ROOT -name '*.la' -exec %__rm -f {} ';'
+find $RPM_BUILD_ROOT -name '*.a' -exec %__rm -f {} ';'
 
 desktop-file-install --vendor vine			\
 	--dir $RPM_BUILD_ROOT%{_datadir}/applications	\
@@ -468,6 +476,12 @@ fi || :
 
 
 %changelog
+* Sun Apr 17 2011 Munehiro Yamamoto <munepi@vinelinux.org> 1.1.9-1
+- new upstream release
+
+* Sat Apr 16 2011 Munehiro Yamamoto <munepi@vinelinux.org> 1.1.8-2
+- applied vlc_patch_0.02/vlc118.diff in up0617.zip on 2sen.dip.jp/dtv
+
 * Sat Mar 26 2011 Munehiro Yamamoto <munepi@vinelinux.org> 1.1.8-1
 - new upstream release
 - added BuildRequires: