Changes - j0ke.net Open Build Service

Changes of Revision 13

[-] [+]	Changed	faad2.spec
@@ -1,11 +1,16 @@ + # norootforbuild -#!BuildIgnore: post-build-checks -%define name faad2 -%define version 2.6.1 -%define release 8 -%define major 0 -%define lib libfaad -%define libname %{lib}%{major} + +%define name faad2 +%define version 2.7 +%define release 15 +%define major 2 +%define oldversion 2.6.1 +%define oldmajor 0 +%define lib libfaad +%define libname %{lib}%{major} +%define oldlibname %{lib}%{oldmajor} +%define libmp4ff libmp4ff%{oldmajor} Name: %{name} Version: %{version} @@ -16,8 +21,9 @@ Group: Productivity/Multimedia/Video/Editors and Convertors URL: http://www.audiocoding.com/ -Source0: http://downloads.sourceforge.net/faac/%{name}-%{version}.tar.bz2 -Source1: %{name}-rpmlintrc +Source0: faad2-2.7.tar.bz2 +Source1: faad2-2.6.1.tar.bz2 + Patch0: faad2-libmp4ff.patch Patch1: faad2-main_overflow.diff BuildRoot: %{_tmppath}/buildroot-%{name}-%{version} @@ -30,7 +36,7 @@ BuildRequires: id3lib-devel BuildRequires: gcc-c++ BuildRequires: SDL-devel -%if 0%{?suse_version} < 1000 && 0%{?suse_version} > 0 +%if 0%{?suse_version} < 1000 BuildRequires: glib BuildRequires: glib-devel BuildRequires: gtk @@ -51,22 +57,49 @@ Group: System/Libraries Summary: Shared library part of faad2 Summary(de): Bibliotheken zu faad2 -Requires: libmp4v2 +Provides: %{lib} = %{version}-%{release} +Provides: libfaad2_2 = %{version}-%{release} +Obsoletes: libfaad2_2 < %{version}-%{release} +Provides: libfaad-2 = %{version}-%{release} +Obsoletes: libfaad-2 < %{version}-%{release} + +%description -n %{libname} +Shared library part of faad2 + +%description -n %{libname} -l de +Bibliotheken zu faad2 + +%package -n %{oldlibname} +Group: System/Libraries +Summary: Shared library part of faad2 +Summary(de): Bibliotheken zu faad2 Provides: %{lib} = %{version}-%{release} Provides: libfaad2_0 = %{version}-%{release} Obsoletes: libfaad2_0 < %{version}-%{release} Provides: libfaad-0 = %{version}-%{release} Obsoletes: libfaad-0 < %{version}-%{release} -%description -n %{libname} +%description -n %{oldlibname} Shared library part of faad2 -%description -n %{libname} -l de +%description -n %{oldlibname} -l de Bibliotheken zu faad2 +%package -n %{libmp4ff} +Group: System/Libraries +Summary: Shared library libmp4ff +Summary(de): Bibliotheken libmp4ff +Provides: libmp4ff = %{version}-%{release} + +%description -n %{libmp4ff} +Shared library libmp4ff + +%description -n %{libmp4ff} -l de +Bibliotheken libmp4ff + %package -n %{lib}-devel -Summary: Development files of the FAAD 2 AAC decoder -Summary(de): Entwicklerdateien des FAAD 2 AAC Dekoders +Summary: Development files of the FAAD 2 AAC decoder. +Summary(de): Entwicklerdateien des FAAD 2 AAC Dekoders. Group: Development/Libraries/C and C++ Requires: %{libname} = %{version}-%{release} Requires: libmp4v2-devel @@ -85,8 +118,8 @@ %package xmms-plugin -Summary: Faad2 Xmms input plugin -Summary(de): Faad2 Xmms input plugin +Summary: faad2 Xmms input plugin +Summary(de): faad2 Xmms input plugin Group: Productivity/Multimedia/Sound/Players Requires: %{libname} = %{version}-%{release} Requires: xmms >= 1.2.8 @@ -101,37 +134,46 @@ %debug_package %prep -%setup -qn faad2 -chmod 644 README NEWS AUTHORS ChangeLog COPYING TODO +%setup -qn faad2-%{version} -b 1 +cd ../faad2 %patch0 %patch1 -p1 %build +export CFLAGS="$RPM_OPT_FLAGS -fPIC" +%{__mkdir_p} plugins/bmp +autoreconf -vif +%suse_update_libdir plugins/xmms/src/Makefile.am +%configure --with-xmms --with-pic +%{__make} %{?jobs:-j%{jobs}} + +cd ../faad2 export CFLAGS="$RPM_OPT_FLAGS" %{__mkdir_p} plugins/bmp %if 0%{?suse_version} >= 1100 %__sed -i -e "s\|dnl AC_PROG_CXX\|AC_PROG_CXX\|g" configure.in %endif autoreconf -vif -%if 0%{?suse_version} %suse_update_libdir plugins/xmms/src/Makefile.am -%endif -%configure --with-xmms - +%configure %{__make} %{?jobs:-j%{jobs}} + %install [ "%{buildroot}" != "/" ] && %{__rm} -rf %{buildroot} -%__make DESTDIR=%{buildroot} install +cd ../faad2 +%makeinstall +cd - +%makeinstall %{__install} -m 644 common/mp4ff/mp4ff.h %{buildroot}%{_includedir}/ %{__install} -m 644 common/mp4ff/mp4ff_int_types.h %{buildroot}%{_includedir}/ -%post -p /sbin/ldconfig -%postun -p /sbin/ldconfig - %post -n %{libname} -p /sbin/ldconfig %postun -n %{libname} -p /sbin/ldconfig +%post -n %{oldlibname} -p /sbin/ldconfig +%postun -n %{oldlibname} -p /sbin/ldconfig + %clean [ "%{buildroot}" != "/" ] && %{__rm} -rf %{buildroot} @@ -139,10 +181,19 @@ %defattr(-, root, root) %doc AUTHORS COPYING ChangeLog NEWS README TODO %{_bindir}/* +%{_mandir}/manm/faad.man.gz %files -n %{libname} %defattr(-,root,root) -%{_libdir}/.so. +%{_libdir}/libfaad.so.%{major}* + +%files -n %{oldlibname} +%defattr(-,root,root) +%{_libdir}/libfaad.so.%{oldmajor}* + +%files -n %{libmp4ff} +%defattr(-,root,root) +%{_libdir}/libmp4ff.so.%{oldmajor}* %files -n %{lib}-devel %defattr(-, root, root) @@ -156,6 +207,5 @@ %{_libdir}/xmms/Input/libmp4* %changelog -* Sun Sep 30 2007 Carsten Schoene <cs@linux-administrator.com> -- import for SLE_10 build - +* Mon Jun 29 2009 Carsten Schoene <cs@linux-administrator.com> - 2.7.0-15 +- import for SLE_11 build
	Added	faad2-2.7.tar.bz2 ^
[-] [+]	Deleted	faad2-rpmlintrc ^
@@ -1,2 +0,0 @@ -from Config import * -addFilter("faad2-xmms-plugin.* devel-file-in-non-devel-package")