new upstream release

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

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

@@ -1,6 +1,6 @@
 %define pkgname vlc
 %define name    self-build-%{pkgname}
-%define version 2.0.1
+%define version 2.0.2
 %define release 1%{?_dist_release}
 
 %define with_mozilla	 		0
@@ -20,7 +20,8 @@ Release: 	%{release}
 Obsoletes:	self-build-vlc < %{version}-%{release}
 Obsoletes:	vlc < %{version}, vlc-devel < %{version}
 
-Source0:	%{pkgname}-vl.spec
+#Source0:	%{pkgname}-vl.spec
+Source0:	%{pkgname}-vl.spec.in
 
 Source100:      vlc-2.0.1-fftype.patch
 #Source105:         vlc-1.1.8-bugfix.opencv22.patch
@@ -232,9 +233,32 @@ mp3, ogg など）だけでなく，DVD や VCD，様々なストリーミング
 %clean
 %{__rm} -rf ${RPM_BUILD_ROOT}
 
+%post
+#set -x
+QUEDIR=/var/cache/self-build
+[ ! -d ${QUEDIR} ] && %__mkdir_p ${QUEDIR}
+
+# copy up0617.zip if you have
+[ ! -f %{_datadir}/%{name}/$(basename %{sourceurl10}) -a \
+  -f ${QUEDIR}/$(basename %{sourceurl10}) ] && \
+  %__cp -fav ${QUEDIR}/$(basename %{sourceurl10}) %{_datadir}/%{name}/
+
+USE_UP0617_ZIP=
+[ -f %{_datadir}/%{name}/$(basename %{sourceurl10}) ] && \
+  USE_UP0617_ZIP=1 || USE_UP0617_ZIP=0
+%__sed -e "s,@@USE_UP0617_ZIP@@,${USE_UP0617_ZIP}," %{_datadir}/%{name}/%{pkgname}-vl.spec.in > %{_datadir}/%{name}/%{pkgname}-vl.spec
+
+%postun
+%__rm -f %{_datadir}/%{name}/%{pkgname}-vl.spec
+
+
 %posttrans
-/usr/lib/rpm/self-build-rpm.sh %{name} %{pkgname}-vl.spec \
+## NOTE: stopped 2sen.dip.jp/cgi-bin/dtvup
-    %{sourceurl0} %{sourceurl10} 1556000
+# /usr/lib/rpm/self-build-rpm.sh %{name} %{pkgname}-vl.spec \
+#     %{sourceurl0} %{sourceurl10} 1556000
+
+/usr/lib/rpm/self-build-rpm.sh %{name} %{pkgname}-vl.spec %{sourceurl0} 1556000
+
 /usr/lib/rpm/pre-allocate-rpm.sh %{pkgname}-%{version}-%{release} \
                                  %{pkgname}-devel-%{version}-%{release}
 
@@ -244,6 +268,9 @@ mp3, ogg など）だけでなく，DVD や VCD，様々なストリーミング
 
 
 %changelog
+* Sat Jun 30 2012 Munehiro Yamamoto <munepi@vinelinux.org> 2.0.2-1
+- new upstream release
+
 * Sat May 26 2012 Munehiro Yamamoto <munepi@vinelinux.org> 2.0.1-1
 - new upstream release
 - dropped DC1394 and DV

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

@@ -1,6 +1,8 @@
 # -*- coding: utf-8-unix -*-
 # TODO: libdc1394(juju), libcaca, modularization (vlc-plugin-foo)
 
+%define use_up0617_zip @@USE_UP0617_ZIP@@
+
 #% define with_internal_live555 		0
 #% define live555_date	2008.07.25
 #% define vlc_git				0
@@ -12,7 +14,7 @@
 
 Summary:	Multi-platform MPEG, DVD, and DivX player
 Name:		vlc
-Version:	 2.0.1
+Version:	 2.0.2
 Release:	1%{?_dist_release}
 License:	GPLv2+
 Group:		Applications/Multimedia
@@ -20,9 +22,11 @@ URL:		http://www.videolan.org/
 Source0:	http://download.videolan.org/pub/videolan/vlc/%{version}/vlc-%{version}.tar.xz
 
 # vlc_patch_0.02/vlc118.diff
+%if %{use_up0617_zip}
 Source10: http://2sen.dip.jp/cgi-bin/dtvup/source/up0617.zip
+%endif
 
-Patch0:		vlc-2.0.1-fftype.patch
+#Patch0:		vlc-2.0.1-fftype.patch
 #Patch5:		vlc-1.1.8-bugfix.opencv22.patch
 
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root
@@ -215,10 +219,12 @@ IPv4 or IPv6 on a high-bandwidth network.
 %prep
 %setup -q -n %{name}-%{version}
 
-%patch0 -p1
+#%patch0 -p1
 
+%if %{use_up0617_zip}
 unzip %{SOURCE10}
 patch -p1 < vlc_patch_0.02/vlc118.diff || exit 1
+%endif
 
 %__rm aclocal.m4 m4/lib*.m4 m4/lt*.m4
 ./bootstrap
@@ -388,6 +394,9 @@ fi || :
 
 
 %changelog
+* Sat Jun 30 2012 Munehiro Yamamoto <munepi@vinelinux.org> 2.0.2-1
+- new upstream release
+
 * Sat May 26 2012 Munehiro Yamamoto <munepi@vinelinux.org> 2.0.1-1
 - new upstream release
 - dropped DC1394 and DV