new upstream release

git-svn-id: http://trac.vinelinux.org/repos/projects/specs@8045 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.1.0
+%define version 2.1.2
 %define release 1%{?_dist_release}
 
 %define with_mozilla	 		0
@@ -19,8 +19,8 @@ Name:		%{name}
 Version:	%{version}
 Release: 	%{release}
 
+Obsoletes:	vlc < %{version}-%{release}, vlc-devel < %{version}-%{release}
 Obsoletes:	self-build-vlc < %{version}-%{release}
-Obsoletes:	vlc < %{version}, vlc-devel < %{version}
 
 #Source0:	%{pkgname}-vl.spec
 Source0:	%{pkgname}-vl.spec.in
@@ -52,7 +52,9 @@ Requires(post):	fribidi-devel
 Requires(post):  gnome-vfs2-devel
 Requires(post):	gnutls-devel >= 1.0.17
 Requires(post):	gsm-devel
+%if %{?_dist_release} >= "vl7"
 Requires(post):	jack-audio-connection-kit-devel
+%endif
 %{?with_dc1394:Requires(post):  libavc1394-devel}
 Requires(post):	libass-devel >= 0.9.7
 ##!! Requires(post):	libcaca-devel
@@ -269,6 +271,12 @@ USE_UP0617_ZIP=
 
 
 %changelog
+* Sat Dec 14 2013 Munehiro Yamamoto <munepi@vinelinux.org> 2.1.2-1
+- new upstream release
+
+* Wed Oct  2 2013 Munehiro Yamamoto <munepi@vinelinux.org> 2.1.0-2
+- added Obsoletes: vlc < %{version}-%{release}, vlc-devel < %{version}-%{release}
+
 * Sun Sep 29 2013 Munehiro Yamamoto <munepi@vinelinux.org> 2.1.0-1
 - new upstream release
 - built with new x264 (ABI 0.136) and ffmpeg (1.2.x)

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

@@ -17,7 +17,7 @@
 
 Summary:	Multi-platform MPEG, DVD, and DivX player
 Name:		vlc
-Version:	2.1.0
+Version:	2.1.2
 Release:	1%{?_dist_release}
 License:	GPLv2+
 Group:		Applications/Multimedia
@@ -34,6 +34,8 @@ Source10: http://2sen.dip.jp/cgi-bin/dtvup/source/up0617.zip
 
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root
 
+Obsoletes: vlc < %{version}-%{release}, vlc-devel < %{version}-%{release}
+
 BuildRequires:	unzip
 BuildRequires:	desktop-file-utils
 BuildRequires:	gettext
@@ -61,7 +63,9 @@ BuildRequires:	fribidi-devel
 BuildRequires:  gnome-vfs2-devel
 BuildRequires:	gnutls-devel >= 1.0.17
 BuildRequires:	gsm-devel
+%if %{?_dist_release} >= "vl7"
 BuildRequires:	jack-audio-connection-kit-devel
+%endif
 %{?with_dc1394:BuildRequires:  libavc1394-devel >= 0.5.3}
 %{?with_dc1394:BuildRequires:  libraw1394-devel >= 2.0.1}
 BuildRequires:	libass-devel >= 0.9.7
@@ -282,7 +286,9 @@ patch -p1 < vlc_patch_0.02/vlc118.diff || exit 1
 	--enable-directfb			\
 	--enable-aa				\
 	%{?_with_caca:--enable-caca}	\
+%if %{?_dist_release} >= "vl7"
 	--enable-jack				\
+%endif
     %{?_with_portaudio:--enable-portaudio} \
 	--enable-pulse				\
 %if %with_ncurses
@@ -403,6 +409,12 @@ fi || :
 
 
 %changelog
+* Sat Dec 14 2013 Munehiro Yamamoto <munepi@vinelinux.org> 2.1.2-1
+- new upstream release
+
+* Wed Oct  2 2013 Munehiro Yamamoto <munepi@vinelinux.org> 2.1.0-2
+- added Obsoletes: vlc < %{version}-%{release}, vlc-devel < %{version}-%{release}
+
 * Sun Sep 29 2013 Munehiro Yamamoto <munepi@vinelinux.org> 2.1.0-1
 - new upstream release
 - built with new x264 (ABI 0.136) and ffmpeg (1.2.x)