2007-04-04 Thomas Wagner <
[email protected]>
* SFEmpd.spec: added dependencies
bump to 0.12.2
patch mpdconf.example and copy to /etc/mpd.conf
* SFElibmpcdec: bump to 1.2.5, rebuild patch libmpcdec-01-configure.diff
--- a/SFElibmpcdec.spec Wed Apr 04 14:02:00 2007 +0000
+++ b/SFElibmpcdec.spec Wed Apr 04 23:22:47 2007 +0000
@@ -7,7 +7,7 @@
Name: SFElibmpcdec
Summary: libmpcdec - Portable Musepack decoder library
-Version: 1.2.2
+Version: 1.2.5
Source: http://files2.musepack.net/source/libmpcdec-%{version}.tar.bz2
Patch1: libmpcdec-01-configure.diff
SUNW_BaseDir: %{_basedir}
@@ -61,6 +61,9 @@
%{_includedir}/*
%changelog
+* Thu Apr 05 2007 - Thomas Wagner
+- bump to 1.2.5
+- refresh patch/libmpcdec-01-configure.diff
* Fri Jun 23 2006 - [email protected]
- rename to SFElibmpcdec
- update file attributes
--- a/SFEmpd.spec Wed Apr 04 14:02:00 2007 +0000
+++ b/SFEmpd.spec Wed Apr 04 23:22:47 2007 +0000
@@ -3,7 +3,9 @@
# This file and all modifications and additions to the pristine
# package are under the same license as the package itself.
#
-# For the output section of ~/.mpdconf, this worked for me:
+
+
+# For the output section of ~/.mpdconf or /etc/mpd.conf try:
#
# audio_output {
# type "ao"
@@ -15,18 +17,35 @@
Name: SFEmpd
Summary: Daemon for remote access music playing & managing playlists
-Version: 0.12.0
+Version: 0.12.2
Source: http://www.musicpd.org/uploads/files/mpd-%{version}.tar.bz2
+Patch1: mpd-01-include-ao-mpdconf.example.diff
SUNW_BaseDir: %{_basedir}
BuildRoot: %{_tmppath}/%{name}-%{version}-build
%include default-depend.inc
-BuildRequires: SFElibao
+BuildRequires: SFElibao-devel
+BuildRequires: SFElibmpcdec-devel
+BuildRequires: SFElibmad-devel
+BuildRequires: SFEfaad2-devel
+BuildRequires: SFElibid3tag-devel
+BuildRequires: SUNWogg-vorbis-devel
+BuildRequires: SUNWgnome-audio-devel
+BuildRequires: SUNWflac-devel
Requires: SFElibao
+Requires: SFElibmpcdec
+Requires: SFElibmad
+Requires: SFEfaad2
+Requires: SFElibid3tag
+Requires: SFEid3lib
+Requires: SUNWogg-vorbis
+Requires: SUNWgnome-audio
+Requires: SUNWflac
%prep
%setup -q -n mpd-%version
+%patch1 -p1
%build
@@ -43,8 +62,9 @@
./configure --prefix=%{_prefix} \
--mandir=%{_mandir} \
- --enable-ao \
- --disable-id3
+ --enable-ao
+
+# --disable-id3
make -j$CPUS
@@ -56,6 +76,14 @@
%clean
rm -rf $RPM_BUILD_ROOT
+%post
+( echo 'PATH=/usr/bin; export PATH' ;
+ echo 'retval=0';
+ echo '[ -f /etc/mpd.conf ] || cp -p $PKG_INSTALL_ROOT%{_datadir}/doc/mpd/mpdconf.example $PKG_INSTALL_ROOT%{_sysconfdir}/mpd.conf'
+ echo 'exit $retval' ) | $PKG_INSTALL_ROOT/usr/lib/postrun -b -c SFE
+
+
+
%files
%defattr (-, root, bin)
%dir %attr (0755, root, bin) %{_bindir}
@@ -70,6 +98,12 @@
%{_datadir}/doc/*
%changelog
+* Wed Apr 04 2007 - Thomas Wagner
+- bump to 0.12.2
+- added dependencies
+- modified configuration note to name /etc/mpd.conf
+- copy patched mdconf.example to /etc/mpd.conf
+- re-add id3 tags (untested)
* Mon Nov 06 2006 - Eric Boutilier
- Fix attributes
* Tue Sep 26 2006 - Eric Boutilier
--- a/patches/libmpcdec-01-configure.diff Wed Apr 04 14:02:00 2007 +0000
+++ b/patches/libmpcdec-01-configure.diff Wed Apr 04 23:22:47 2007 +0000
@@ -1,18 +1,16 @@
-diff -urN libmpcdec-1.2.2-orig/configure libmpcdec-1.2.2/configure
---- libmpcdec-1.2.2-orig/configure 2005-10-23 21:17:16.000000000 +0700
-+++ libmpcdec-1.2.2/configure 2006-06-13 19:18:04.360408247 +0700
-@@ -19581,7 +19581,7 @@
+--- libmpcdec-1.2.5-orig/configure Sun Feb 11 21:03:53 2007
++++ libmpcdec-1.2.5/configure Wed Apr 4 23:24:25 2007
+@@ -19626,7 +19626,7 @@
-CFLAGS="$CFLAGS -O3 -fomit-frame-pointer -fPIC"
+CFLAGS="$CFLAGS -KPIC"
- echo "$as_me:$LINENO: checking whether byte ordering is bigendian" >&5
- echo $ECHO_N "checking whether byte ordering is bigendian... $ECHO_C" >&6
-diff -urN libmpcdec-1.2.2-orig/configure.ac libmpcdec-1.2.2/configure.ac
---- libmpcdec-1.2.2-orig/configure.ac 2005-10-23 21:14:52.000000000 +0700
-+++ libmpcdec-1.2.2/configure.ac 2006-06-13 19:23:13.497181866 +0700
+ { echo "$as_me:$LINENO: checking whether byte ordering is bigendian" >&5
+ echo $ECHO_N "checking whether byte ordering is bigendian... $ECHO_C" >&6; }
+--- libmpcdec-1.2.5-orig/configure.ac Sun Feb 11 21:02:49 2007
++++ libmpcdec-1.2.5/configure.ac Wed Apr 4 23:25:01 2007
@@ -6,7 +6,7 @@
AM_PROG_LIBTOOL
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/mpd-01-include-ao-mpdconf.example.diff Wed Apr 04 23:22:47 2007 +0000
@@ -0,0 +1,19 @@
+--- mpd-0.12.2-orig/doc/mpdconf.example 2007-03-20 22:22:53.000000000 +0100
++++ mpd-0.12.2/doc/mpdconf.example 2007-04-05 00:10:57.078477236 +0200
+@@ -112,6 +112,16 @@
+ # public "no" # optional
+ #}
+ #
++# An example of an ao output on Solaris:
++#
++
++audio_output {
++ type "ao"
++ name "libao audio device
++ driver "sun"
++}
++
++#
+ # Force all decoded audio to be converted to this format before
+ # being passed to the audio outputs.
+ #