0.14.2-alt1

.gear/rules

-tar: release-@version@:.
-diff: release-@version@:. @version@-alt:. name=@name@-@version@-@release@.patch
+tar: @version@:.
+diff: @version@:. @version@-alt:. name=@name@-@version@-@release@.patch
 copy: *.conf *.in *.logrotate

.gear/tags/86d4e995398ff86db59dad2c6d8c3301ef5ee4d1

+object fd69782a996b02732d92dc846b6d55cc0ad2c031
+type commit
+tag 0.14.2
+tagger Led <led@altlinux.org> 1235004068 +0200
+
+0.14.2

.gear/tags/8fd3aa20153a55ede83902d5332e8eab25bef3df

-object 067629d7ab34f849fb66aea87469ca828c0f2ae9
-type commit
-tag 0.14-alt
-tagger Led <led@altlinux.org> 1230403854 +0200
-

.gear/tags/981f2d2a50769fe78696f598bc6d9d3bdf46e199

+object 8ec10e2b3bf701f2d481c869c1a54b8c1db09811
+type commit
+tag 0.14.2-alt
+tagger Led <led@altlinux.org> 1235004451 +0200
+

.gear/tags/list

-8b7d7f8abd4aaca3e19f5da6f0c03aa75c736c0b release-0.14
-8fd3aa20153a55ede83902d5332e8eab25bef3df 0.14-alt
+86d4e995398ff86db59dad2c6d8c3301ef5ee4d1 0.14.2
+981f2d2a50769fe78696f598bc6d9d3bdf46e199 0.14.2-alt

mpd.spec

@@ -2,15 +2,14 @@
 %def_disable prof
 %def_disable werror
 %def_enable ao
-%def_enable shout
 %def_enable shout_ogg
 %def_enable shout_mp3
-%def_enable iconv
 %def_enable tcp
 %def_enable un
 %def_enable curl
 %def_disable ipv6
-%def_disable sun
+%def_enable fluidsynth
+%def_disable wildmidi
 %def_enable oss
 %def_enable alsa
 %def_enable jack
@@ -25,12 +24,21 @@
 %def_enable aac
 %def_enable audiofile
 %def_enable mod
+%def_disable modplug
 %def_enable faad
 %def_enable mpc
 %def_enable ffmpeg
+%def_disable mp4
 %def_enable wavpack
 %def_enable id3
 %def_enable lsr
+%def_enable mms
+%def_enable bzip2
+%def_enable zip
+%def_enable iso9660
+%def_enable sqlite
+%def_disable sidplay
+%def_enable doc
 %def_without tremor
 # auto|avahi|bonjour|no
 %define zeroconf avahi
@@ -41,14 +49,14 @@
 %define set_disable() %{expand:%%force_disable %{1}} %{expand:%%undefine _enable_%{1}}
 
 %if_with tremor
-%set_disable shout
+%set_disable shout_ogg
 %set_disable oggflac
 %endif
 %{!?zeroconf:%define zeroconf no}
 
 %define Name MPD
 Name: mpd
-Version: 0.14
+Version: 0.14.2
 %define prerel %nil
 Release: alt1
 Summary: Music Player Daemon (%Name) allows remote access for playing music and managing playlists. 
@@ -64,14 +72,16 @@ Patch: %name-%version-%release.patch
 Packager: Led <led@altlinux.ru>
 
 BuildRequires(pre): rpm-build-licenses
-BuildRequires: xmlto zlib-devel
+BuildRequires: zlib-devel gcc-c++
 %{?_enable_curl:BuildRequires: libcurl-devel}
 %{?_enable_alsa:BuildRequires: libalsa-devel >= 0.9.0}
 %{?_enable_jack:BuildRequires: jackit-devel}
 %{?_enable_ao:BuildRequires: libao-devel}
-%{?_enable_shout:BuildRequires: libshout2-devel}
+%{?_enable_shout_ogg:BuildRequires: libshout2-devel}
+%{?_enable_shout_mp3:BuildRequires: libshout2-devel}
 %{?_enable_audiofile:BuildRequires: libaudiofile-devel >= 0.1.7}
 %{?_enable_mod:BuildRequires: libmikmod-devel >= 3.1.7}
+%{?_enable_modplug:BuildRequires: libmmodplug-devel}
 %{?_enable_faad:BuildRequires: libfaad-devel}
 %{?_enable_flac:BuildRequires: libflac-devel >= 1.1.3}
 %{?_enable_oggflac:BuildRequires: liboggflac-devel}
@@ -80,12 +90,20 @@ BuildRequires: xmlto zlib-devel
 %{?_enable_lame:BuildRequires: liblame-devel}
 %{?_enable_mpc:BuildRequires: libmpcdec-devel}
 %{?_enable_ffmpeg:BuildRequires: libavformat-devel}
+%{?_enable_mp4:BuildRequires: libmp4ff-devel}
 %{?_enable_wavpack:BuildRequires: libwavpack-devel}
 %{?_enable_pulse:BuildRequires: libpulseaudio-devel}
 %{?_enable_oggvorbis:BuildRequires: libvorbis-devel}
 %{?_enable_lsr:BuildRequires: libsamplerate-devel}
+%{?_enable_mms:BuildRequires: libmms-devel}
+%{?_enable_sidplay:BuildRequires: libsidplay2-devel}
+%{?_enable_zip:BuildRequires: zziplib-devel}
+%{?_enable_bzip2:BuildRequires: bzlib-devel}
+%{?_enable_sqlite:BuildRequires: libsqlite3-devel}
+%{?_enable_fluidsynth:BuildRequires: libfluidsynth-devel}
+%{?_enable_doc:BuildRequires: docbook-dtds doxygen xmlto >= 0.0.21-alt2}
 %if %zeroconf == avahi
-BuildRequires: libavahi-devel
+BuildRequires: libavahi-glib-devel
 %endif
 
 %description
@@ -97,6 +115,39 @@ It is also makes a great desktop music player, especially if you are a
 console junkie, like frontend options, or restart X often.
 
 
+%if_enabled doc
+%package doc
+Summary: Music Player Daemon (%Name) documentation
+Group: Documentation
+BuildArch: noarch
+Conflicts: %name < %version
+
+%description doc
+Music Player Daemon (%Name) allows remote access for playing music
+(MP3, Ogg Vorbis, FLAC, AAC, Mod, and wave files) and managing
+playlists. %Name 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.
+This package contains %Name documentation.
+
+
+%package doc-api
+Summary: Music Player Daemon (%Name) documentation
+Group: Development/Documentation
+BuildArch: noarch
+
+%description doc-api
+Music Player Daemon (%Name) allows remote access for playing music
+(MP3, Ogg Vorbis, FLAC, AAC, Mod, and wave files) and managing
+playlists. %Name 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.
+This package contains %Name's API documentation.
+%endif
+
+
 %prep
 %setup -n %name-%version%prerel
 %patch -p1
@@ -107,18 +158,13 @@ console junkie, like frontend options, or restart X often.
 %define _optlevel 3
 %autoreconf
 %configure \
-%ifarch x86_64
-    --with-pic \
-%endif
     %{subst_enable debug} \
     %{subst_enable_to prof gprof} \
     %{subst_enable werror} \
     %{subst_with tremor} \
     %{subst_enable ao} \
-    %{subst_enable shout} \
     %{subst_enable shout_ogg} \
     %{subst_enable shout_mp3} \
-    %{subst_enable iconv} \
     %{subst_enable tcp} \
     %{subst_enable un} \
     %{subst_enable curl} \
@@ -138,18 +184,31 @@ console junkie, like frontend options, or restart X often.
     %{subst_enable aac} \
     %{subst_enable audiofile} \
     %{subst_enable mod} \
+    %{subst_enable modplug} \
     %{subst_enable mpc} \
     %{subst_enable ffmpeg} \
+    %{subst_enable mp4} \
     %{subst_enable wavpack} \
     %{subst_enable id3} \
     %{subst_enable lsr} \
-    --with-zeroconf=%zeroconf
+    %{subst_enable mms} \
+    %{subst_enable sidplay} \
+    %{subst_enable bzip2} \
+    %{subst_enable zip} \
+    %{subst_enable iso9660} \
+    %{subst_enable sqlite} \
+    %{subst_enable fluidsynth} \
+    %{subst_enable wildmidi} \
+    %{subst_enable_to doc documentation} \
+    --with-zeroconf=%zeroconf \
+    --docdir=%_docdir/%name-%version
 %make_build
 bzip2 --best --keep --force NEWS
 
 
 %install
-%make_install DESTDIR=%buildroot docdir=%_docdir/%name-%version install
+%make_install DESTDIR=%buildroot protocoldir=%_docdir/%name-%version/html install
+ln -s html %buildroot%_docdir/%name-%version/protocol
 install -d %buildroot{%_localstatedir/%name/playlists,{/var/run,%_logdir}/%name,%_sysconfdir,%_initdir}
 install -m 0644 %SOURCE1 %buildroot%_sysconfdir/%name.conf
 sed 's/@MPD_USER@/%mpd_user/g' %SOURCE2 > %buildroot%_sysconfdir/%name.sys.conf
@@ -157,6 +216,7 @@ chmod 640 %buildroot%_sysconfdir/%name.sys.conf
 sed 's/@MPD_USER@/%mpd_user/g' %SOURCE3 > %buildroot%_initdir/%name
 chmod 755 %buildroot%_initdir/%name
 install -D -m 0644 %SOURCE4 %buildroot%_sysconfdir/logrotate.d/%name
+bzip2 --best %buildroot%_docdir/%name-%version/NEWS
 
 
 %pre
@@ -175,7 +235,15 @@ install -D -m 0644 %SOURCE4 %buildroot%_sysconfdir/logrotate.d/%name
 
 
 %files
-%doc AUTHORS NEWS.* README TODO UPGRADING doc/{%{name}conf.example,protocol.html}
+%doc %dir %_docdir/%name-%version
+%doc %_docdir/%name-%version/AUTHORS
+%doc %_docdir/%name-%version/README
+%doc %_docdir/%name-%version/%{name}conf.example
+%if_disabled doc
+%doc %_docdir/%name-%version/NEWS.*
+%doc %_docdir/%name-%version/TODO
+%doc %_docdir/%name-%version/UPGRADING
+%endif
 %config(noreplace) %_sysconfdir/%name.conf
 %config(noreplace) %_sysconfdir/%name.sys.conf
 %config(noreplace) %_sysconfdir/logrotate.d/*
@@ -189,7 +257,36 @@ install -D -m 0644 %SOURCE4 %buildroot%_sysconfdir/logrotate.d/%name
 %attr(775,root,%mpd_group) %dir %_logdir/%name
 
 
+%if_enabled doc
+%files doc
+%doc %dir %_docdir/%name-%version
+%doc %_docdir/%name-%version/NEWS.*
+%doc %_docdir/%name-%version/TODO
+%doc %_docdir/%name-%version/UPGRADING
+%doc %_docdir/%name-%version/html
+%doc %_docdir/%name-%version/protocol
+
+
+%files doc-api
+%doc %dir %_docdir/%name-%version
+%doc %_docdir/%name-%version/api
+%endif
+
+
 %changelog
+* Fri Feb 20 2009 Led <led@altlinux.ru> 0.14.2-alt1
+- 0.14.2
+- cleaned up spec
+- enabled support:
+  + mms
+  + zip
+  + bzip2
+  + fluidsynth
+  + sqlite
+  + iso9660
+  + modplug
+- added doc and doc-api subpackages
+
 * Sat Dec 27 2008 Led <led@altlinux.ru> 0.14-alt1
 - 0.14 release