Miscellany

Index: faad2.spec
===================================================================
--- faad2.spec  (révision 11524)
+++ faad2.spec  (copie de travail)
@@ -1,86 +1,102 @@
-%{?el4:%define _without_sysfs 1}
-%{?fc3:%define _without_sysfs 1}
-%{?fc2:%define _without_sysfs 1}
-%{?fc1:%define _without_sysfs 1}
-%{?el3:%define _without_sysfs 1}
-%{?rh9:%define _without_sysfs 1}
-%{?rh7:%define _without_sysfs 1}
-%{?el2:%define _without_sysfs 1}
+%define xmmsinputplugindir %(xmms-config --input-plugin-dir 2>/dev/null)
 
 Summary:       Library and frontend for decoding MPEG2/4 AAC
 Name:          faad2
 Epoch:         1
 Version:       2.6.1
-Release:       1%{?dist}
+Release:       2%{?dist}
 License:       GPLv2+
-Group:         Applications/Multimedia
-URL:           http://faac.sourceforge.net/
-Source:                http://dl.sf.net/faac/%{name}-%{version}.tar.gz
-Patch1:                %{name}-buildfix.patch
-BuildRoot:     %{_tmppath}/%{name}-%{version}-%{release}-root
-BuildRequires: gcc-c++
-%{!?_without_sysfs:BuildRequires: libsysfs-devel}
+Group:                 Applications/Multimedia
+URL:           http://www.audiocoding.com
+Source:                http://downloads.sourceforge.net/faac/%{name}-%{version}.tar.gz
+BuildRoot:     %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+
+BuildRequires: id3lib-devel
+BuildRequires: libsysfs-devel
 BuildRequires: libtool
+BuildRequires: xmms-devel
 BuildRequires: zlib-devel
 
-%description
-FAAD 2 is a LC, MAIN and LTP profile, MPEG2 and MPEG-4 AAC decoder, completely
-written from scratch.
-
 %package devel
-Summary:       Development libraries of the FAAD 2 AAC decoder
+Summary:       Development files for the FAAD 2 AAC decoder
 Group:         Development/Libraries
 Requires:      %{name} = %{epoch}:%{version}-%{release}
 
+%package -n xmms-%{name}
+Summary:       Faad2 XMMS Input Plugin
+Group:         Applications/Multimedia
+Requires:      %{name} = %{epoch}:%{version}-%{release}
+Provides:      xmms-aac = %{epoch}:%{version}-%{release}
+
+%description
+FAAD is an Advanced Audio Decoder (MPEG2-AAC, MPEG4-AAC). 
+
 %description devel
-FAAD 2 is a LC, MAIN and LTP profile, MPEG2 and MPEG-4 AAC decoder, completely
-written from scratch.
+FAAD is an Advanced Audio Decoder (MPEG2-AAC, MPEG4-AAC).
+This package contains development files for the FAAD.
 
-This package contains development files and documentation for libfaad.
+%description -n xmms-%{name}
+FAAD is an Advanced Audio Decoder (MPEG2-AAC, MPEG4-AAC).
+This package contains an input plugin for xmms.
 
 %prep
 %setup -q -n %{name}
-%patch1 -p1 -b .buildfix
+
 find . -name "*.c" -o -name "*.h" | xargs chmod 644
+chmod 0644 plugins/xmms/{AUTHORS,NEWS}
 
 %build
 # This is what the README.linux file recommends
 autoreconf -vif
 %configure \
-    --disable-static \
-#    --with-drm
+       --disable-static \
+       --with-xmms \
+#      --with-drm
 
-%{__make} %{?_smp_mflags}
+make %{?_smp_mflags}
 
+
 %install
-%{__rm} -rf %{buildroot}
-%{__make} install DESTDIR=%{buildroot}
+rm -rf $RPM_BUILD_ROOT
+make install DESTDIR=$RPM_BUILD_ROOT INSTALL="install -p"
 
 for f in AUTHORS COPYING ChangeLog NEWS README* TODO ; do
-    tr -d '\r' <$f >$f.n && mv -f $f.n $f
+       tr -d '\r' <$f >$f.n && mv -f $f.n $f
 done
 
+
 %clean
-%{__rm} -rf %{buildroot}
+rm -rf $RPM_BUILD_ROOT
 
 %post -p /sbin/ldconfig
 
 %postun -p /sbin/ldconfig
 
 %files
-%defattr(-, root, root, -)
+%defattr(-,root,root,-)
 %doc AUTHORS COPYING ChangeLog NEWS README* TODO
 %{_bindir}/faad
 %{_libdir}/libfaad.so.*
 
 %files devel
-%defattr(-, root, root, -)
+%defattr(-,root,root,-)
 %{_includedir}/faad.h
 %{_includedir}/neaacdec.h
 %{_libdir}/libfaad.so
 %exclude %{_libdir}/*.la
 
+%files -n xmms-%{name}
+%defattr(-,root,root,-)
+%doc plugins/xmms/AUTHORS plugins/xmms/NEWS
+%xmmsinputplugindir/libmp4.so
+%exclude %xmmsinputplugindir/libmp4.la
+
+
 %changelog
+* Mon Nov 05 2007 kwizart < kwizart at gmail.com > - 1:2.6.1-2
+- Re-enable with-xmms
+- Add related BR id3lib-devel
+
 * Thu Nov 01 2007 Dominik Mierzejewski <dominik [AT] greysector [DOT] net> 1:2.6.1-1
 - remerge freshrpms specfile
 - update to latest upstream, fixes licensing issues!