Browse Source

updated self-build-x264-vl.spec, self-build-libmpeg2-vl.spec

git-svn-id: http://trac.vinelinux.org/repos/projects/specs@4695 ec354946-7b23-47d6-9f5a-488ba84defc7
munepi 12 years ago
parent
commit
64a5f7b63e

+ 4 - 6
nonfree/self-build-libmpeg2/self-build-libmpeg2-vl.spec

@@ -1,7 +1,7 @@
 %define pkgname libmpeg2
 %define name	self-build-%{pkgname}
 %define version 0.5.1
-%define release	4%{?_dist_release}
+%define release	5%{?_dist_release}
 
 %define sourceurl0	http://libmpeg2.sourceforge.net/files/%{pkgname}-%{version}.tar.gz
 
@@ -18,13 +18,8 @@ Group:		Restricted Software
 Requires(post):		self-build-setup >= 0.9.9
 
 Requires(post):		SDL-devel
-%if %{?_dist_release} == "vl5" || %{?_dist_release} == "vl6"
 Requires(post):		libXt-devel
 Requires(post):		libXv-devel
-%endif
-%if %{?_dist_release} == "vl4"
-Requires(post):		XOrg-devel
-%endif
 
 BuildArch:	noarch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-root
@@ -112,6 +107,9 @@ libmpeg2 はmpeg-1/2ビデオストリームをデコードするための
 %{_datadir}/%{name}/*
 
 %changelog
+* Thu Sep 1 2011 Munehiro Yamamoto <munepi@vinelinux.org> 0.5.1-5
+- do not support vl4
+
 * Sun Mar 21 2010 Munehiro Yamamoto <munepi@vinelinux.org> 0.5.1-4
 - renamed %%{Source0} to libmpeg2-vl.spec
 

+ 8 - 5
nonfree/self-build-x264/self-build-x264-vl.spec

@@ -3,7 +3,7 @@
 %define version 0.0.0
 %define date	20110322
 %define time	2245
-%define release	15.%{date}%{?_dist_release}
+%define release	16.%{date}%{?_dist_release}
 
 #define sourceurl0	ftp://ftp.videolan.org/pub/videolan/x264/snapshots/%{pkgname}-snapshot-%{date}-%{time}.tar.bz2
 %define sourceurl0	http://www.videolan.org/pub/videolan/x264/snapshots/%{pkgname}-snapshot-%{date}-%{time}.tar.bz2
@@ -21,17 +21,16 @@ Source112:	%{pkgname}-nostrip.patch
 License:	GPLv2+
 Group:		Restricted Software
 
-Obsoletes:      x264 < %{version}-%{release}
-Obsoletes:      self-build-x264 < %{version}-%{release}
+Obsoletes:      x264 < %{version}
+Obsoletes:      self-build-x264 < %{version}
 
 Requires(post):		self-build-setup >= 0.9.9
 
 # (build)requies of target package.
-%ifarch x86_64 %{ix86}
 Requires(post):	yasm
-%endif
 Requires(post): self-build-gpac
 
+BuildArch:	noarch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-root
 
 Packager:	munepi
@@ -120,6 +119,10 @@ x264 はスクラッチから書かれた H264/AVC ビデオストリームを
 %{_datadir}/%{name}
 
 %changelog
+* Thu Sep 01 2011 Munehiro Yamamoto <munepi@vinelinux.org> 0.0.0-16.20110322
+- changed to depend on %%{version} for Obsoletes: x264
+- added BuildArch: noarch
+
 * Wed Mar 23 2011 Munehiro Yamamoto <munepi@vinelinux.org> 0.0.0-15.20110322
 - updated source snapshot 20110322