0.12.1-alt1

.gear/rules

 tar.bz2: @version@:.
-copy: *.conf
+copy: *.conf *.patch

.gear/tags/08d5fe90e4828cd4abdbfaffc3b08250afcff254

-object 3e53b9d5b04994a2cfe878bc5649e64c274e5473
-type commit
-tag 0.12.0
-tagger Led <led@altlinux.org> 1226282077 +0200
-

.gear/tags/e8b2d77d8357cc43763d5d1fab5aca97da1bc11a

+object 134a9ab30b26e207360301330442a10ed0f8c401
+type commit
+tag 0.12.1
+tagger Led <led@altlinux.org> 1226282087 +0200
+

.gear/tags/list

-08d5fe90e4828cd4abdbfaffc3b08250afcff254 0.12.0
+e8b2d77d8357cc43763d5d1fab5aca97da1bc11a 0.12.1

mpd-0.12.1-configure.patch

+diff -urN mpd-0.12.1.orig/configure mpd-0.12.1/configure
+--- mpd-0.12.1.orig/configure	2006-10-11 02:57:30 +0300
++++ mpd-0.12.1/configure	2007-01-10 18:56:56 +0200
+@@ -18970,7 +18970,13 @@
+ # Check whether --with-tremor or --without-tremor was given.
+ if test "${with_tremor+set}" = set; then
+   withval="$with_tremor"
+-  use_tremor=yes; test x$withval != xyes && tremor_prefix="$withval"
++  if test "x$withval" = xyes -o "x$withval" = xno; then
++    use_tremor="$withval"
++  else
++    use_tremor=yes
++    tremor_prefix="$withval"
++  fi
++
+ fi;
+ 
+ # Check whether --with-tremor-libraries or --without-tremor-libraries was given.
+diff -urN mpd-0.12.1.orig/configure.ac mpd-0.12.1/configure.ac
+--- mpd-0.12.1.orig/configure.ac	2006-10-11 02:56:58 +0300
++++ mpd-0.12.1/configure.ac	2007-01-10 18:56:28 +0200
+@@ -81,7 +81,14 @@
+ AC_ARG_ENABLE(mpc,[  --disable-mpc           disable musepack (MPC) support (default: enable)],[enable_mpc=$enableval],[enable_mpc=yes])
+ AC_ARG_ENABLE(id3,[  --disable-id3           disable id3 support (default: enable)],[enable_id3=$enableval],[enable_id3=yes])
+ 
+-AC_ARG_WITH(tremor,[[  --with-tremor[=PFX]         Use Tremor(vorbisidec) integer Ogg-Vorbis decoder (with optional prefix)]], use_tremor=yes; test x$withval != xyes && tremor_prefix="$withval",)
++AC_ARG_WITH(tremor,[[  --with-tremor[=PFX]         Use Tremor(vorbisidec) integer Ogg-Vorbis decoder (with optional prefix)]],
++  if test "x$withval" = xyes -o "x$withval" = xno; then
++    use_tremor="$withval"
++  else
++    use_tremor=yes
++    tremor_prefix="$withval"
++  fi
++,)
+ AC_ARG_WITH(tremor-libraries,[  --with-tremor-libraries=DIR Directory where Tremor library is installed (optional)], tremor_libraries="$withval", tremor_libraries="")
+ AC_ARG_WITH(tremor-includes,[  --with-tremor-includes=DIR  Directory where Tremor header files are installed (optional)], tremor_includes="$withval", tremor_includes="")
+ 

mpd.spec

-Name:		mpd 
-Version:	0.12.0
-Release:	alt1
+%def_with pic
 
-Summary:	Music Player Daemon (MPD) allows remote access for playing music and managing playlists. 
-License: 	GPL
-Group: 		Sound
+%def_enable ao
+%def_enable shout
+%def_enable iconv
+%def_disable ipv6
+%def_disable sun
+%def_enable oss
+%def_enable alsa
+%def_enable pulse
+%def_enable mvp
+%def_enable oggvorbis
+%def_enable oggflac
+%def_enable flac
+%def_enable mp3
+%def_enable aac
+%def_enable audiofile
+%def_enable mod
+%def_enable faad
+%def_enable mpc
+%def_enable id3
+%def_without tremor
+#----------------------------------------------------------------------
+%define set_disable() %{expand:%%force_disable %{1}} %{expand:%%undefine _enable_%{1}}
 
-Url:		http://musicpd.org/
+%if_with tremor
+%set_disable shout
+%set_disable oggflac
+%endif
 
-Source:		%name-%version.tar.bz2
-Source1:	%name.conf
+Name: mpd
+Version: 0.12.1
+Release: alt1
+Summary: Music Player Daemon (MPD) allows remote access for playing music and managing playlists. 
+License: GPL
+Group: Sound
+URL: http://musicpd.org/
+Source0: http://musicpd.org/uploads/files/%name-%version.tar.bz2
+Source1: %name.conf
+Patch0: %name-0.12.1-configure.patch
+Patch1: mpd-0.12.1+flac-1.1.3.patch
 
+# Automatically added by buildreq on Wed Jan 10 2007
+BuildRequires: gcc-c++ zlib-devel
 
-# Automatically added by buildreq on Fri Sep 15 2006
-BuildRequires: libalsa-devel libaudiofile-devel libfaad-devel libflac-devel libid3tag-devel libmad-devel libmikmod-devel libmpcdec-devel liboggflac-devel libpulseaudio-devel libvorbis-devel zlib-devel libao-devel
+%{?_enable_alsa:BuildRequires: libalsa-devel >= 0.9.0}
+%{?_enable_ao:BuildRequires: libao-devel}
+%{?_enable_shout:BuildRequires: libshout-devel}
+%{?_enable_audiofile:BuildRequires: libaudiofile-devel >= 0.1.7}
+%{?_enable_mod:BuildRequires: libmikmod-devel >= 3.1.7}
+%{?_enable_faad:BuildRequires: libfaad-devel}
+%{?_enable_flac:BuildRequires: libflac-devel}
+%{?_enable_oggflac:BuildRequires: liboggflac-devel}
+%{?_enable_id3:BuildRequires: libid3tag-devel}
+%{?_enable_mp3:BuildRequires: libmad-devel}
+%{?_enable_mpc:BuildRequires: libmpcdec-devel}
+%{?_enable_pulse:BuildRequires: libpulseaudio-devel}
+%{?_enable_oggvorbis:BuildRequires: libvorbis-devel}
 
 %description
+Music Player Daemon (MPD) allows remote access for playing music
+(MP3, Ogg Vorbis, FLAC, AAC, Mod, and wave files) and managing
+playlists. MPD is designed for integrating a computer into a stereo
+system that provides control for music playback over a local network.
+It is also makes a great desktop music player, especially if you are a
+console junkie, like frontend options, or restart X often.
 
-Music Player Daemon (MPD) allows remote access for playing music 
-(MP3, Ogg Vorbis, FLAC, AAC, Mod, and wave files) and managing playlists. 
-MPD is designed for integrating a computer into a stereo system that 
-provides control for music playback over a local network. It is also 
-makes a great desktop music player, especially if you are a console junkie, 
-like frontend options, or restart X often.
 
 %prep
 %setup -q
+%patch0 -p1
+%patch1 -p1
+touch aclocal.m4
+
 
 %build
-%configure --enable-ao \
-		--enable-mod \
-		--enable-mp3 \
-		--enable-mpc \
-		--enable-mvp \
-		--enable-oggvorbis \
-		--enable-oss \
-		--enable-pulse
+autoconf -v -i -f
+%configure \
+    %{subst_with pic} \
+    %{subst_with tremor} \
+    %{subst_enable ao} \
+    %{subst_enable shout} \
+    %{subst_enable iconv} \
+    %{subst_enable ipv6} \
+    %{subst_enable sun} \
+    %{subst_enable oss} \
+    %{subst_enable alsa} \
+    %{subst_enable pulse} \
+    %{subst_enable mvp} \
+    %{subst_enable oggvorbis} \
+    %{subst_enable flac} \
+    %{subst_enable oggflac} \
+    %{subst_enable mp3} \
+    %{subst_enable aac} \
+    %{subst_enable audiofile} \
+    %{subst_enable mod} \
+    %{subst_enable mpc} \
+    %{subst_enable id3} \
+    --disable-libOggFLACtest
+
 %make_build
 
+
 %install
-%makeinstall
-%__mkdir %buildroot%_sysconfdir
-%__install -p -m644  %SOURCE1 %buildroot%_sysconfdir
+%make_install DESTDIR=%buildroot docdir=%_docdir/%name-%version install
+install -pD -m 0644 %SOURCE1 %buildroot%_sysconfdir/%name.conf
+bzip2 --best --keep --force ChangeLog
+
 
 %files
-%doc AUTHORS ChangeLog COPYING INSTALL README TODO UPGRADING doc/{mpdconf.example,COMMANDS}
-%config(noreplace) %_sysconfdir/%name.conf
-%_bindir/%name
-%_man1dir/%name.1.gz
-%_man5dir/%name.conf.5.gz
+%doc AUTHORS ChangeLog.* README TODO UPGRADING doc/{%{name}conf.example,COMMANDS}
+%config(noreplace) %_sysconfdir/*
+%_bindir/*
+%_man1dir/*
+%_man5dir/*
+
 
 %changelog
+* Mon Feb 26 2007 Led <led@altlinux.ru> 0.12.1-alt1
+- NMU (fixed #10874)
+- 0.12.1
+- fixed BuildRequires
+- added %name-0.12.1-configure.patch
+- added mpd-0.12.1+flac-1.1.3.patch
+- cleaned up spec
+
 * Mon Sep 25 2006 Alex Gorbachenko (agent_007) <algor@altlinux.ru> 0.12.0-alt1
--  0.12.
+- 0.12
 
 * Fri Sep 15 2006 Alex Gorbachenko (agent_007) <algor@altlinux.ru> 0.12.0rc4-alt1
 -  0.12.0rc4.