Packman Build Service PMBS

Changes of Revision 7

faad2.changes Changed

faad2.spec Changed

@@ -2,13 +2,12 @@
 # Packmanpackagename: faad2
 # Packman: Manfred Tremmel
 
-# norootforbuild
 
 %define major      2
 %define lib        libfaad
 %define libname    %{lib}%{major}
 
-%if %suse_version > 1120
+%if 0%{?suse_version} > 1120
 %bcond_with    xmms
 %else
 %bcond_without xmms
@@ -19,25 +18,23 @@
 Name:           faad2
 Version:        2.7
 Release:        1
+License:        GPL-2.0+
 Summary:        C library and frontend for decoding MPEG2/4 AAC
 Summary(de):    C Bibliothek und Frontend zum Decodieren von MPEG2/4 AAC
-License:        GPL v2 or later
+Url:            http://www.audiocoding.com/
 Group:          Productivity/Multimedia/Video/Editors and Convertors
-URL:            http://www.audiocoding.com/
 Source0:        http://downloads.sourceforge.net/project/faac/faad2-src/faad2-%{version}/faad2-%{version}.tar.bz2
-BuildRoot:      %{_tmppath}/buildroot-%{name}-%{version}
-Requires:       %{libname} = %{version}-%{release}
+Requires:       %{libname} = %{version}
+BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 %if %{with mpeg4ip}
 BuildRequires:  libmp4v2-devel
+BuildRequires:  SDL-devel
 %endif
-BuildRequires:  glibc-devel
-BuildRequires:  libogg-devel
 %if %{with xmms}
 BuildRequires:  xmms-devel
-%endif
 BuildRequires:  id3lib-devel
-BuildRequires:  gcc-c++
-BuildRequires:  SDL-devel
+%endif
+BuildRequires:  glibc-devel
 #Obsoletes:      faad2-drm
 #Provides:       faad2-drm
 
@@ -48,16 +45,15 @@
 %description -l de
 FAAD 2 ist ein LC, MAIN und LTP profile, MPEG2 und MPEG-4 AAC Decoder.
 
-
 %package -n %{libname}
-Group:          System/Libraries
 Summary:        Shared library part of faad2
 Summary(de):    Bibliotheken zu faad2
-Provides:       %{lib} = %{version}-%{release}
-Provides:       libfaad2_2 = %{version}-%{release}
-Obsoletes:      libfaad2_2 < %{version}-%{release}
-Provides:       libfaad-2 = %{version}-%{release}
-Obsoletes:      libfaad-2 < %{version}-%{release}
+Group:          System/Libraries
+Provides:       %{lib} = %{version}
+Provides:       libfaad2_2 = %{version}
+Obsoletes:      libfaad2_2 < %{version}
+Provides:       libfaad-2 = %{version}
+Obsoletes:      libfaad-2 < %{version}
 
 %description -n %{libname}
 FAAD 2 is a LC, MAIN and LTP profile, MPEG2 and MPEG-4 AAC decoder, completely
@@ -72,13 +68,13 @@
 Summary:        Development files of the FAAD 2 AAC decoder
 Summary(de):    Entwicklerdateien des FAAD 2 AAC Dekoders
 Group:          Development/Libraries/C and C++
-Requires:       %{name} = %{version}-%{release}
-Obsoletes:      libfaad2-devel < %{version}-%{release}
-Provides:       libfaad2-devel = %{version}-%{release}
-Obsoletes:      faad2-devel < %{version}-%{release}
-Provides:       faad2-devel = %{version}-%{release}
-Obsoletes:      faad2-drm-devel < %{version}-%{release}
-Provides:       faad2-drm-devel = %{version}-%{release}
+Requires:       %{name} = %{version}
+Obsoletes:      libfaad2-devel < %{version}
+Provides:       libfaad2-devel = %{version}
+Obsoletes:      faad2-devel < %{version}
+Provides:       faad2-devel = %{version}
+Obsoletes:      faad2-drm-devel < %{version}
+Provides:       faad2-drm-devel = %{version}
 
 %description -n %{lib}-devel
 FAAD 2 is a LC, MAIN and LTP profile, MPEG2 and MPEG-4 AAC decoder, completely
@@ -89,16 +85,15 @@
 FAAD 2 ist ein LC, MAIN und LTP profile, MPEG2 und MPEG-4 AAC Decoder.
 Header-Dateien und Entwicklerdokumtation zur libfaad.
 
-
 %if %{with xmms}
 %package -n xmms-faad2
 Summary:        Xmms faad2 input plugin
 Summary(de):    Xmms faad2 Eingabeplugin
 Group:          Productivity/Multimedia/Sound/Players
-Requires:       %{libname} = %{version}-%{release}
+Requires:       %{libname} = %{version}
 Requires:       xmms >= 1.2.8
-Obsoletes:      faad2-xmms-plugin < %{version}-%{release}
-Provides:       faad2-xmms-plugin = %{version}-%{release}
+Obsoletes:      faad2-xmms-plugin < %{version}
+Provides:       faad2-xmms-plugin = %{version}
 
 %description -n xmms-faad2
 The plugin read aac files with and without ID3tag(version 2.x), AAC files
@@ -112,14 +107,11 @@
 
 %prep
 %setup -qn faad2-%{version}
-FAKE_BUILDDATE=$(LC_ALL=C date -u -r %{_sourcedir}/%{name}.changes '+%%b %%e %%Y')  
+FAKE_BUILDDATE=$(LC_ALL=C date -u -r %{_sourcedir}/%{name}.changes '+%%b %%e %%Y')
 sed -i "s/__DATE__/\"$FAKE_BUILDDATE\"/" frontend/main.c
 
 %build
-export CFLAGS="$RPM_OPT_FLAGS -fPIC -fno-strict-aliasing"
-%{__mkdir_p} plugins/bmp
-autoreconf -vif
-%suse_update_libdir plugins/xmms/src/Makefile.am
+export CFLAGS="%{optflags} -fPIC -fno-strict-aliasing"
 %configure \
 %if %{with xmms}
 	--with-xmms \
@@ -127,7 +119,7 @@
 	--with-pic \
 	--enable-shared \
 	--disable-static
-%{__make} %{?jobs:-j%{jobs}}
+make %{?_smp_mflags}
 
 %install
 %makeinstall
@@ -136,9 +128,6 @@
 %post -n %{libname} -p /sbin/ldconfig
 %postun -n %{libname} -p /sbin/ldconfig
 
-%clean
-[ "%{buildroot}" != "/" ] && %{__rm} -rf %{buildroot}
-
 %files
 %defattr(-, root, root)
 %doc AUTHORS COPYING ChangeLog NEWS README TODO