updated {self-build-,}xvidcore-vl.spec

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

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

@@ -1,7 +1,7 @@
 %define pkgname xvidcore
 %define name	self-build-%{pkgname}
-%define version 1.2.1
+%define version 1.2.2
-%define release	4%{?_dist_release}
+%define release	1%{?_dist_release}
 
 %define sourceurl0	http://downloads.xvid.org/downloads/%{pkgname}-%{version}.tar.bz2
 
@@ -11,20 +11,17 @@ Name:		%{name}
 Version:	%{version}
 Release: 	%{release}
 Source0:	%{pkgname}-vl.spec
+Source100:      xvidcore-noexec-stack.patch
 
-License:	GPL
+License:	GPLv2+
 Group:		Restricted Software
 
 Requires(post):		self-build-setup >= 0.9.9
 
 # (build)requies of target package.
-%ifarch %{ix86}
+Requires(post):		nasm >= 2.0
-Requires(post):		nasm
-%endif
-%ifarch x86_64
-Requires(post):		yasm
-%endif
 
+BuildArch:	noarch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-root
 
 Packager:	munepi
@@ -95,12 +92,13 @@ 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}
 
 %posttrans
-/usr/lib/rpm/self-build-rpm.sh %{name} %{pkgname}-vl.spec "%{sourceurl0}" 10000
+/usr/lib/rpm/self-build-rpm.sh %{name} %{pkgname}-vl.spec "%{sourceurl0}" 34000
 /usr/lib/rpm/pre-allocate-rpm.sh %{pkgname}-%{version}-%{release} \
                                  %{pkgname}-devel-%{version}-%{release}
 
@@ -109,6 +107,12 @@ xvidcore は OpenDivX プロジェクトによるビデオコーデックを
 %{_datadir}/%{name}
 
 %changelog
+* Sat Dec 25 2010 Munehiro Yamamoto <munepi@vinelinux.org> 1.2.2-1
+- added BuildArch: noarch
+- updated xvidcore-vl.spec
+  - new upstream release
+  - applied a rebase noexec-stack patch from RPM Fusion development
+
 * Sun Mar 21 2010 Munehiro Yamamoto <munepi@vinelinux.org> 1.2.1-4
 - renamed %%{Source0} to xvidcore-vl.spec
 

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

@@ -1,76 +1,89 @@
-%define name xvidcore
+Summary: MPEG-4 Simple and Advanced Simple Profile codec
-%define version 1.2.1
+Name:		xvidcore
-%define release 4%{?_dist_release}
+Version:	1.2.2
-
+Release:	1%{?_dist_release}
-Summary: Free reimplementation of the OpenDivX video codec
+Source:		http://downloads.xvid.org/downloads/%{name}-%{version}.tar.bz2
-Name: %{name}
+Patch0:         xvidcore-noexec-stack.patch
-Version: %{version}
+Group:          System Environment/Libraries
-Release: %{release}
+License:        GPLv2+
-Source: http://downloads.xvid.org/downloads/%{name}-%{version}.tar.bz2
+URL:            http://www.xvid.org/
-License: XVID (GPL with specific restrictions)
+
-URL: http://www.xvid.org/
+BuildRequires:	nasm >= 2.0
-Group: System Environment/Libraries
+
-
-#Requires: 
-%ifarch %{ix86}
-BuildRequires: nasm
-%endif
-%ifarch x86_64
-BuildRequires: yasm
-%endif
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
 
 %description
-Free reimplementation of the OpenDivX video codec. You can play OpenDivX
+The Xvid video codec implements MPEG-4 Simple Profile and Advanced Simple
-and DivX4 videos with it, as well as encode compatible files.
+Profile standards. It permits compressing and decompressing digital video
-
+in order to reduce the required bandwidth of video data for transmission
-%package devel
+over computer networks or efficient storage on CDs or DVDs. Due to its
-Summary: Development files for the XviD video codec
+unrivalled quality Xvid has gained great popularity and is used in many
-Group: Development/Libraries
+other GPLed applications, like e.g. Transcode, MEncoder, MPlayer, Xine and
-Requires: %{name} = %{version}-%{release}
+many more.
-
+
-%description devel
+%package        devel
+Summary:        Development files for the Xvid video codec
+Group:          Development/Libraries
+Requires:       %{name} = %{version}-%{release}
+
+%description    devel
 This package contains header files, static library and API
-documentation for the XviD video codec.
+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.
+%{__perl} -pi -e 's/^\t@(?!echo\b)/\t/' build/generic/Makefile
+
 
 %build
 cd build/generic
+export CFLAGS="$RPM_OPT_FLAGS -ffast-math"
+%configure
+%__make %{?_smp_mflags} 
+cd -
 
-%configure 
-make %{?_smp_mflags} 
 
 %install
-rm -rf %{buildroot}
+%__rm -rf $RPM_BUILD_ROOT
-cd build/generic
+%__make -C build/generic install DESTDIR=$RPM_BUILD_ROOT
-%makeinstall
+%__rm $RPM_BUILD_ROOT%{_libdir}/libxvidcore.a
-rm $RPM_BUILD_ROOT%{_libdir}/libxvidcore.a
 cd $RPM_BUILD_ROOT%{_libdir}
 chmod 755 libxvidcore.so*
 /sbin/ldconfig -n .
 ln -s libxvidcore.so.? libxvidcore.so
+cd -
+
+
+%clean
+%__rm -rf $RPM_BUILD_ROOT
+
 
 %post -p /sbin/ldconfig
 
 %postun -p /sbin/ldconfig
 
-%clean
-rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(-,root,root,-)
-%doc LICENSE README AUTHORS ChangeLog TODO
+%doc LICENSE README AUTHORS ChangeLog
 %{_libdir}/libxvidcore.so.*
 
 %files devel
 %defattr(-,root,root,-)
-%doc CodingStyle examples/
+%doc CodingStyle TODO examples/
 %{_includedir}/xvid.h
 %{_libdir}/libxvidcore.so
 
 %changelog
+* 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
+
 * Sun Mar 21 2010 Munehiro Yamamoto <munepi@vinelinux.org> 1.2.1-4
 - change release to sync with self-build-xvidcore