Commit bcb90c60 authored by Led's avatar Led

0.13.2-alt1

parent 4f464d71
tar.bz2: @version@:. tar: @version@:.
copy: *.conf *.in *.patch copy: *.conf *.in *.patch
object 4bb8af8be61483770b8d74123d9310c6df465c87
type commit
tag 0.13.1
tagger Led <led@altlinux.org> 1226282100 +0200
object e0d031b59f3b6359ae7de26bdb2f23279cff7dc9
type commit
tag 0.13.2
tagger Led <led@altlinux.org> 1226282106 +0200
14bea4985d278dae403e8a23fcdbe80552eeeb39 0.13.1 a7668e315a3c413e07e899f9bd8c58ace7ad5711 0.13.2
diff -urN mpd-0.13.2.orig/src/directory.c mpd-0.13.2/src/directory.c
--- mpd-0.13.2.orig/src/directory.c 2008-01-27 00:16:46 +0200
+++ mpd-0.13.2/src/directory.c 2008-07-06 02:15:11 +0300
@@ -296,7 +296,7 @@
void *song;
if (findInList(directory->songs, shortname, &song)) {
- LOG("removing: %s\n", getSongUrl((Song *) song));
+ LOG("removing: %s\n", utf8ToFsCharset(getSongUrl((Song *) song)));
deleteFromList(directory->songs, shortname);
}
}
@@ -338,7 +338,7 @@
addToDirectory(directory, shortname, name);
return DIRECTORY_RETURN_UPDATE;
} else if (st.st_mtime != ((Song *) song)->mtime) {
- LOG("updating %s\n", name);
+ LOG("updating %s\n", utf8ToFsCharset(name));
if (updateSongInfo((Song *) song) < 0) {
removeSongFromDirectory(directory, shortname);
}
@@ -407,14 +407,14 @@
tmpNode = node->nextNode;
if (findInList(entList, node->key, &name)) {
if (!isDir((char *)name)) {
- LOG("removing directory: %s\n", (char *)name);
+ LOG("removing directory: %s\n", utf8ToFsCharset((char *)name));
deleteFromList(directory->subDirectories,
node->key);
ret = 1;
}
} else {
LOG("removing directory: %s/%s\n",
- getDirectoryPath(directory), node->key);
+ utf8ToFsCharset(getDirectoryPath(directory)), utf8ToFsCharset(node->key));
deleteFromList(directory->subDirectories, node->key);
ret = 1;
}
@@ -547,7 +547,7 @@
}
/* if updateDirectory fails, means we should delete it */
else {
- LOG("removing directory: %s\n", path);
+ LOG("removing directory: %s\n", utf8ToFsCharset(path));
deleteFromList(parentDirectory->subDirectories,
shortname);
ret = 1;
@@ -799,7 +799,7 @@
SONG_TYPE_FILE, directory);
if (!song)
return -1;
- LOG("added %s\n", name);
+ LOG("added %s\n", utf8ToFsCharset(name));
return 1;
} else if (S_ISDIR(st.st_mode)) {
return addSubDirectoryToDirectory(directory, shortname, name,
...@@ -22,7 +22,7 @@ ...@@ -22,7 +22,7 @@
%def_without tremor %def_without tremor
%define zeroconf avahi %define zeroconf avahi
%define mpd_user _mpd %define mpd_user _mpd
%define mpd_group audio %define mpd_group _mpd
#---------------------------------------------------------------------- #----------------------------------------------------------------------
%define set_disable() %{expand:%%force_disable %{1}} %{expand:%%undefine _enable_%{1}} %define set_disable() %{expand:%%force_disable %{1}} %{expand:%%undefine _enable_%{1}}
%define rpmver_ge() %{expand:%%if %%(rpmvercmp %%{get_version %{1}} %{2}) >= 0} %define rpmver_ge() %{expand:%%if %%(rpmvercmp %%{get_version %{1}} %{2}) >= 0}
...@@ -35,17 +35,18 @@ ...@@ -35,17 +35,18 @@
%define Name MPD %define Name MPD
Name: mpd Name: mpd
Version: 0.13.1 Version: 0.13.2
Release: alt1 Release: alt1
Summary: Music Player Daemon (%Name) allows remote access for playing music and managing playlists. Summary: Music Player Daemon (%Name) allows remote access for playing music and managing playlists.
License: %gpl2plus License: %gpl2plus
Group: Sound Group: Sound
URL: http://musicpd.org/ URL: http://musicpd.org
Source0: http://musicpd.org/uploads/files/%name-%version.tar.bz2 Source0: %url/uploads/files/%name-%version.tar
Source1: %name.conf Source1: %name.conf
Source2: %name.sys.conf.in Source2: %name.sys.conf.in
Source3: %name.init.in Source3: %name.init.in
Patch: %name-0.13.0-configure.patch Patch0: %name-0.13.0-configure.patch
Patch1: %name-0.13.2-alt-encoding_output_fix.patch
BuildPreReq: rpm-utils BuildPreReq: rpm-utils
# Automatically added by buildreq on Tue Sep 11 2007 # Automatically added by buildreq on Tue Sep 11 2007
...@@ -83,7 +84,8 @@ console junkie, like frontend options, or restart X often. ...@@ -83,7 +84,8 @@ console junkie, like frontend options, or restart X often.
%prep %prep
%setup %setup
%patch -p1 %patch0 -p1
%patch1 -p1
%rpmver_ge libflac-devel 1.1.3 %rpmver_ge libflac-devel 1.1.3
subst 's/AM_PATH_LIBOGGFLAC/AM_PATH_LIBFLAC/' configure.ac subst 's/AM_PATH_LIBOGGFLAC/AM_PATH_LIBFLAC/' configure.ac
%endif %endif
...@@ -133,7 +135,10 @@ chmod 755 %buildroot%_initdir/%name ...@@ -133,7 +135,10 @@ chmod 755 %buildroot%_initdir/%name
%pre %pre
/usr/sbin/useradd -r -n -s /dev/null -d %_localstatedir/%name -g %mpd_group -c "Music Player Daemon (%Name)" %mpd_user 2> /dev/null ||: %_sbindir/groupadd -r -f %mpd_group &>/dev/null ||:
%_sbindir/useradd -r -n -M -s /dev/null -d %_localstatedir/%name -g %mpd_group \
-c "Music Player Daemon (%Name)" %mpd_user &>/dev/null ||:
%_sbindir/usermod -g %mpd_group -G audio %mpd_user &>/dev/null ||:
%post %post
...@@ -152,13 +157,23 @@ chmod 755 %buildroot%_initdir/%name ...@@ -152,13 +157,23 @@ chmod 755 %buildroot%_initdir/%name
%_man1dir/* %_man1dir/*
%_man5dir/* %_man5dir/*
%_initdir/* %_initdir/*
%attr(755,%mpd_user,%mpd_group) %dir %_localstatedir/%name %attr(775,root,%mpd_group) %dir %_localstatedir/%name
%attr(755,%mpd_user,%mpd_group) %dir %_localstatedir/%name/playlists %attr(775,root,%mpd_group) %dir %_localstatedir/%name/playlists
%attr(755,%mpd_user,%mpd_group) %dir /var/run/%name %attr(775,root,%mpd_group) %dir /var/run/%name
%attr(755,%mpd_user,%mpd_group) %dir %_logdir/%name %attr(775,root,%mpd_group) %dir %_logdir/%name
%changelog %changelog
* Sat Jul 05 2008 Led <led@altlinux.ru> 0.13.2-alt1
- 0.13.2:
+ several bugfixes
+ faster stored playlists
+ Bonjour support
+ .oga suffix support for Ogg containers
- fixed "Security packaging Policy violation" (#15830)
- added %name-0.13.2-alt-encoding_output_fix.patch for resolve #8655
(thanx php-coder for concept)
* Thu Mar 06 2008 Led <led@altlinux.ru> 0.13.1-alt1 * Thu Mar 06 2008 Led <led@altlinux.ru> 0.13.1-alt1
- 0.13.1 - 0.13.1
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment