Changes - j0ke.net Open Build Service

Changes of Revision 10

[-] [+]	Changed	xvid.spec
@@ -1,24 +1,22 @@ -%define name xvid -%define ver 1.2.0 -%define rel 1 +# norootforbuild -Name: %{name} +%define soname 4 + +Name: xvidcore +Version: 1.2.1 +Release: 1 Summary: Xvid is a high quality MPEG-4 ASP video codec. Summary(de): Xvid ist ein hochqualitativer MPEG-4 ASP Videocodec. -Version: %{ver} -Release: %{rel} -License: GPL +License: GNU General Public License (GPL) Group: Development/Libraries URL: http://www.xvid.org/ -Source0: xvidcore-1.2.0.tar.bz2 -Patch0: xvidcore-1.2.0-compilefix.patch +Source0: %{name}-%{version}.tar.bz2 -Obsoletes: xvidcore -Provides: xvidcore -ExclusiveArch: %{ix86} ppc sparc sparc64 sparcv9 x86_64 amd64 ia32e -BuildRequires: gcc-c++ -BuildRequires: yasm nasm +Requires: lib%{name}%{soname} = %{version}-%{release} +Obsoletes: xvid +Provides: xvid = %{version}-%{release} +BuildRequires: gcc-c++ yasm make pkgconfig nasm BuildRoot: %{_tmppath}/%{name}-%{version}-root-%(id -u -n) %description @@ -33,85 +31,80 @@ FFmpeg MPEG-4 oder separaten DVD-Playern mit MPEG-4 Implementierungen wieder gegeben werden. -%package devel +%package -n lib%{name}-devel Summary: Development files of XviD video codec -Summary(pl): Pliki programistyczne dla kodeka wideo XviD Summary(de): Entwicklerdateien des XviD Video-Codecs -Summary(fi): Kehitystiedostot XviD-videokodekille Group: Development/Libraries -Requires: %{name} = %{version}-%{release} -Obsoletes: xvidcore-devel -Provides: xvidcore-devel -Provides: libxvidcore.so +Requires: lib%{name}%{soname} = %{version}-%{release} +Obsoletes: xvid-devel +Provides: xvid-devel = %{version}-%{release} -%description devel +%description -n lib%{name}-devel Development files of XviD video codec. -%description devel -l pl -Pliki programistyczne dla kodeka wideo XviD. - -%description devel -l de +%description -n lib%{name}-devel -l de Entwicklerdateien des XviD Video-Codecs. -%description devel -l fi -Kehitystiedostot XviD-videokodekille. +%package -n lib%{name}%{soname} +Summary: Shared library libxvidcore +Summary(de): Bibliothek libxvidcore +Group: System/Libraries + +%description -n lib%{name}%{soname} +Shared library of XviD video codec. + +%description -n lib%{name}%{soname} -l de +Bibliothek des XviD Video Codecs. + +%debug_package + %prep -%setup -q -n %{name}core -%patch0 +%setup -q -n "%{name}" %build -export CFLAGS="${RPM_OPT_FLAGS}" -cd build/generic +pushd build/generic %configure -%{__make} %{?jobs:-j%{jobs}} +%__make %{?jobs:-j%{jobs}} +popd #build/generic %install -[ "%{buildroot}" != "/" ] && %{__rm} -rf %{buildroot} -%{__install} -d %{buildroot}{%{_libdir},%{_includedir}} +%__install -d "%{buildroot}%{_libdir}" +%__install -d "%{buildroot}%{_includedir}" -#cd %{name}core-%{version}/build/generic -cd build/generic/=build -%{__install} .so %{buildroot}%{_libdir} -%{__install} .a %{buildroot}%{_libdir} - -cd ../../../src -%{__install} xvid.h %{buildroot}%{_includedir} - -cd %{buildroot}%{_libdir} -%{__ln_s} libxvidcore.so.4.1 libxvidcore.so.4 -%{__ln_s} libxvidcore.so.4.1 libxvidcore.so +pushd 'build/generic/=build' +%__install .so* .a "%{buildroot}%{_libdir}/" +popd #'build/generic/=build' + +pushd src +%__install xvid.h "%{buildroot}%{_includedir}/" +popd #src + +pushd "%{buildroot}%{_libdir}" +%__ln_s libxvidcore.so.%{soname}. libxvidcore.so.%{soname} +%__ln_s libxvidcore.so.%{soname} libxvidcore.so +popd #libdir %clean -[ "%{buildroot}" != "/" ] && %{__rm} -rf %{buildroot} +[ "%{buildroot}" != "/" ] && %__rm -rf "%{buildroot}" -%post -%if 0%{?suse_version} -%run_ldconfig -%else -/sbin/ldconfig -%endif - -%postun -%if 0%{?suse_version} -%run_ldconfig -%else -/sbin/ldconfig -%endif +%post -n lib%{name}%{soname} -p /sbin/ldconfig +%postun -n lib%{name}%{soname} -p /sbin/ldconfig %files %defattr(644,root,root,755) -%doc AUTHORS ChangeLog LICENSE README TODO -%{_libdir}/.so. -%files devel +%files -n lib%{name}-devel %defattr(644,root,root,755) %doc CodingStyle doc examples %{_includedir}/.h %{_libdir}/.so %{_libdir}/.a -%define date %(echo `LC_ALL="C" date +"%a %b %d %Y"`) +%files -n lib%{name}%{soname} +%doc AUTHORS ChangeLog LICENSE README TODO +%{_libdir}/libxvidcore.so.%{soname} +%{_libdir}/libxvidcore.so.%{soname}. %changelog * Sun Sep 30 2007 Carsten Schoene <cs@linux-administrator.com>
[-] [+]	Deleted	xvidcore-1.2.0-compilefix.patch ^
@@ -1,21 +0,0 @@ ---- src/xvid.c.orig 2008-12-03 21:57:25.000000000 +0100 -+++ src/xvid.c 2008-12-03 21:58:25.000000000 +0100 -@@ -28,6 +28,10 @@ - #include <string.h> - #include <time.h> - -+#if !defined(_WIN32) -+#include <unistd.h> -+#endif -+ - #include "xvid.h" - #include "decoder.h" - #include "encoder.h" -@@ -675,7 +679,6 @@ - - #else - -- #include <unistd.h> - info->num_threads = sysconf(_SC_NPROCESSORS_CONF); - - #endif
	Deleted	xvidcore-1.2.0.tar.bz2 ^
	Changed	xvidcore-1.2.1.tar.bz2 ^