Changes - j0ke.net Open Build Service

Changes of Revision 2

[-] [+]	Changed	libfame.spec
@@ -1,24 +1,28 @@ -Name: libfame +%define lib libfame +%define version 0.9.1 +%define release 1 +%define major 1 +%define libname libfame%{major} + +Name: %{libname} Summary: Fast Assembly Mpeg Encoding library Summary(de): Schnelle Assembler MPEG Encodingbibliothek -Version: 0.9.1 -Release: 1 -License: LGPL -Group: Development/Libraries +Version: %{version} +Release: %{release} +License: LGPL v2 or later +Group: System/Libraries URL: http://fame.sourceforge.net -Source0: http://prdownloads.sourceforge.net/fame/libfame-%{version}.tar.gz +Source0: libfame-0.9.1.tar.bz2 Patch0: libfame-0.9.1-gcc34-1.patch Patch1: libfame-0.9.1-underquoted-definition.patch -Patch2: libfame-fix-implicit-decl.patch -Patch3: libfame-intptr.patch -BuildRoot: %{_tmppath}/libfame-%{version}-root +BuildRoot: %{_tmppath}/libfame-%{PACKAGE_VERSION}-root AutoReqProv: off -Provides: libfame-0.9.so.0 +Provides: %{lib} = %{version}-%{release} Provides: libfame-0.9.so.1 +Obsoletes: %{lib} %ifarch x86_64 amd64 ia32e -Provides: libfame-0.9.so.0()(64bit) Provides: libfame-0.9.so.1()(64bit) %endif @@ -28,39 +32,40 @@ %description -l de FAME ist eine Bibliothek für schnelles MPEG-Encoding. -%package devel +%package -n %{lib}-devel +Group: Development/Libraries/C and C++ Summary: Libraries and include to develop using FAME Summary(de): Bibliothek und Includes zum Entwicklen mit FAME -Group: Development/Libraries -Requires: %name = %version +Requires: %{libname} = %{version}-%{release} +Provides: %{libname}-devel = %{version}-%{release} -%description devel +%description -n %{lib}-devel FAME is a library for fast MPEG encoding. This is the libraries, include files and other resources you can use to develop FAME applications. -%description devel -l de +%description -n %{lib}-devel -l de FAME ist eine Bibliothek für schnelles MPEG-Encoding. Dies ist die Bibliothek, Include-Dateien und andere Resourcen die zur Entwicklung von Anwendungen, die FAME verwenden, benötigt werden. +%debug_package + %prep -%setup -q +%setup-q -n %{lib}-%{version} %patch0 -p1 %patch1 -%patch2 -%patch3 %suse_update_config -f %suse_update_libdir %build -CFLAGS="$RPM_OPT_FLAGS" +CFLAGS="${RPM_OPT_FLAGS}" %if %suse_version >= 910 %if %suse_version <= 1000 - CFLAGS="$RPM_OPT_FLAGS -fno-unit-at-a-time" + CFLAGS="${RPM_OPT_FLAGS} -fno-unit-at-a-time" %endif %endif @@ -72,7 +77,7 @@ # Needed for snapshot releases. if [ ! -f configure ]; then - ./autogen.sh --prefix=%_prefix --libdir=%_libdir --mandir=%_mandir --includedir=%_includedir + ./autogen.sh --prefix=%{_prefix} --libdir=%{_libdir} --mandir=%{_mandir} --includedir=%{_includedir} fi %ifarch i686 x86_64 ia32e @@ -81,30 +86,28 @@ %configure %endif -%__make %{?jobs:-j%{jobs}} +%{__make} %{?jobs:-j%{jobs}} %install +[ "%{buildroot}" != "/" ] && %{__rm} -rf %{buildroot} %makeinstall -cd $RPM_BUILD_ROOT/%_libdir -%{__ln_s} libfame-0.9.so.1.0.0 libfame-0.9.so.0 %clean -[ "$RPM_BUILD_ROOT" != "/" ] && rm -rf $RPM_BUILD_ROOT +[ "%{buildroot}" != "/" ] && %{__rm} -rf %{buildroot} -%post +%post -n %{libname} %run_ldconfig -%postun +%postun -n %{libname} %run_ldconfig -%files +%files -n %{libname} %defattr(-, root, root) %doc CHANGES COPYING README %{_libdir}/lib.so. -%files devel +%files -n %{lib}-devel %defattr(-, root, root) -%doc CHANGES COPYING README %{_bindir}/-config %{_libdir}/lib.so %{_libdir}/*a
[-] [+]	Deleted	libfame-fix-implicit-decl.patch ^
@@ -1,30 +0,0 @@ ---- src/fame_motion_pmvfast.c.orig 2006-11-13 00:42:30.000000000 +0100 -+++ src/fame_motion_pmvfast.c 2006-11-13 00:42:37.000000000 +0100 -@@ -19,6 +19,7 @@ - - #include <stdio.h> - #include <stdlib.h> -+#include <string.h> - #include "fame.h" - #include "fame_malloc.h" - #include "fame_motion.h" ---- src/fame_rate_simple.c.orig 2006-11-13 00:41:51.000000000 +0100 -+++ src/fame_rate_simple.c 2006-11-13 00:41:59.000000000 +0100 -@@ -19,6 +19,7 @@ - - #include <stdio.h> - #include <stdlib.h> -+#include <string.h> - #include <math.h> - #include "fame.h" - #include "fame_rate_simple.h" ---- src/fame_rate_1param.c.orig 2006-11-13 00:42:12.000000000 +0100 -+++ src/fame_rate_1param.c 2006-11-13 00:42:18.000000000 +0100 -@@ -19,6 +19,7 @@ - - #include <stdio.h> - #include <stdlib.h> -+#include <string.h> - #include <math.h> - #include "fame.h" - #include "fame_rate_1param.h"
[-] [+]	Deleted	libfame-intptr.patch ^
@@ -1,22 +0,0 @@ ---- src/fame_malloc.c.orig 2006-11-13 00:44:42.000000000 +0100 -+++ src/fame_malloc.c 2006-11-13 00:45:24.000000000 +0100 -@@ -21,6 +21,7 @@ - #define ALIGN 32 - - #include <stdlib.h> -+#include <stdint.h> - - void* fame_malloc(size_t size) - { -@@ -36,9 +37,9 @@ - / - - ptr = (unsigned char) malloc(size+ALIGN); -- aligned = (unsigned char) (((unsigned int)ptr & (~(ALIGN-1))) + ALIGN ); -+ aligned = (unsigned char) (((intptr_t)ptr & (~(ALIGN-1))) + ALIGN ); - padding = aligned - 1; -- padding = (ALIGN-1) - ((unsigned int)ptr & (ALIGN-1)); -+ padding = (ALIGN-1) - ((intptr_t)ptr & (ALIGN-1)); - - return ((void*)aligned); - }
	Renamed	libfame-0.9.1.tar.bz2 ^
	Added	libfame1-0.9.1-0.pm.9.src.rpm ^