Browse Source

updated self-build-xvidcore

git-svn-id: http://trac.vinelinux.org/repos/projects/specs@4176 ec354946-7b23-47d6-9f5a-488ba84defc7
munepi 11 years ago
parent
commit
8068a20f0c

+ 5 - 3
nonfree/self-build-xvidcore/self-build-xvidcore-vl.spec

@@ -1,6 +1,6 @@
 %define pkgname xvidcore
 %define name	self-build-%{pkgname}
-%define version 1.2.2
+%define version 1.3.2
 %define release	1%{?_dist_release}
 
 %define sourceurl0	http://downloads.xvid.org/downloads/%{pkgname}-%{version}.tar.bz2
@@ -11,7 +11,6 @@ Name:		%{name}
 Version:	%{version}
 Release: 	%{release}
 Source0:	%{pkgname}-vl.spec
-Source100:      xvidcore-noexec-stack.patch
 
 License:	GPLv2+
 Group:		Restricted Software
@@ -92,7 +91,6 @@ xvidcore は OpenDivX プロジェクトによるビデオコーデックを
 %{__rm} -rf ${RPM_BUILD_ROOT}
 %{__install} -d ${RPM_BUILD_ROOT}/%{_datadir}/%{name}
 %{__install} -m 644 %{SOURCE0} ${RPM_BUILD_ROOT}/%{_datadir}/%{name}
-%{__install} -m 644 %{SOURCE100} ${RPM_BUILD_ROOT}/%{_datadir}/%{name}
 
 %clean
 %{__rm} -rf ${RPM_BUILD_ROOT}
@@ -107,6 +105,10 @@ xvidcore は OpenDivX プロジェクトによるビデオコーデックを
 %{_datadir}/%{name}
 
 %changelog
+* Sat Jun 18 2011 Munehiro Yamamoto <munepi@vinelinux.org> 1.3.2-1
+- new upstream release
+- dropped upstreamed noexec stack patch
+
 * Sat Dec 25 2010 Munehiro Yamamoto <munepi@vinelinux.org> 1.2.2-1
 - added BuildArch: noarch
 - updated xvidcore-vl.spec

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

@@ -1,9 +1,8 @@
 Summary: MPEG-4 Simple and Advanced Simple Profile codec
 Name:		xvidcore
-Version:	1.2.2
+Version:	1.3.2
 Release:	1%{?_dist_release}
 Source:		http://downloads.xvid.org/downloads/%{name}-%{version}.tar.bz2
-Patch0:         xvidcore-noexec-stack.patch
 Group:          System Environment/Libraries
 License:        GPLv2+
 URL:            http://www.xvid.org/
@@ -33,7 +32,6 @@ documentation for the Xvid video codec.
 
 %prep
 %setup -q -n %{name}
-%patch0 -p1 -z .noexec-stack
 chmod -x examples/*.pl
 f=AUTHORS ; iconv -f iso-8859-1 -t utf-8 -o $f.utf8 $f && touch -r $f $f.utf8 && mv $f.utf8 $f
 # Yes, we want to see the build output.
@@ -55,7 +53,7 @@ cd -
 cd $RPM_BUILD_ROOT%{_libdir}
 chmod 755 libxvidcore.so*
 /sbin/ldconfig -n .
-ln -s libxvidcore.so.? libxvidcore.so
+%__ln_s libxvidcore.so.? libxvidcore.so
 cd -
 
 
@@ -80,6 +78,10 @@ cd -
 %{_libdir}/libxvidcore.so
 
 %changelog
+* Sat Jun 18 2011 Munehiro Yamamoto <munepi@vinelinux.org> 1.3.2-1
+- new upstream release
+- dropped upstreamed noexec stack patch
+
 * Sat Dec 25 2010 Munehiro Yamamoto <munepi@vinelinux.org> 1.2.2-1
 - new upstream release
 - applied a rebase noexec-stack patch from RPM Fusion development