Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
M
mpd
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Иван Мажукин
mpd
Commits
bcb90c60
Commit
bcb90c60
authored
Nov 10, 2008
by
Led
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
0.13.2-alt1
parent
4f464d71
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
89 additions
and
18 deletions
+89
-18
rules
.gear/rules
+1
-1
14bea4985d278dae403e8a23fcdbe80552eeeb39
.gear/tags/14bea4985d278dae403e8a23fcdbe80552eeeb39
+0
-5
a7668e315a3c413e07e899f9bd8c58ace7ad5711
.gear/tags/a7668e315a3c413e07e899f9bd8c58ace7ad5711
+5
-0
list
.gear/tags/list
+1
-1
mpd-0.13.2-alt-encoding_output_fix.patch
mpd-0.13.2-alt-encoding_output_fix.patch
+56
-0
mpd.spec
mpd.spec
+26
-11
No files found.
.gear/rules
View file @
bcb90c60
tar
.bz2
: @version@:.
tar: @version@:.
copy: *.conf *.in *.patch
.gear/tags/14bea4985d278dae403e8a23fcdbe80552eeeb39
deleted
100644 → 0
View file @
4f464d71
object 4bb8af8be61483770b8d74123d9310c6df465c87
type commit
tag 0.13.1
tagger Led <led@altlinux.org> 1226282100 +0200
.gear/tags/a7668e315a3c413e07e899f9bd8c58ace7ad5711
0 → 100644
View file @
bcb90c60
object e0d031b59f3b6359ae7de26bdb2f23279cff7dc9
type commit
tag 0.13.2
tagger Led <led@altlinux.org> 1226282106 +0200
.gear/tags/list
View file @
bcb90c60
14bea4985d278dae403e8a23fcdbe80552eeeb39 0.13.1
a7668e315a3c413e07e899f9bd8c58ace7ad5711 0.13.2
mpd-0.13.2-alt-encoding_output_fix.patch
0 → 100644
View file @
bcb90c60
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,
mpd.spec
View file @
bcb90c60
...
...
@@ -22,7 +22,7 @@
%def_without tremor
%define zeroconf avahi
%define mpd_user _mpd
%define mpd_group
audio
%define mpd_group
_mpd
#----------------------------------------------------------------------
%define set_disable() %{expand:%%force_disable %{1}} %{expand:%%undefine _enable_%{1}}
%define rpmver_ge() %{expand:%%if %%(rpmvercmp %%{get_version %{1}} %{2}) >= 0}
...
...
@@ -35,17 +35,18 @@
%define Name MPD
Name: mpd
Version: 0.13.
1
Version: 0.13.
2
Release: alt1
Summary: Music Player Daemon (%Name) allows remote access for playing music and managing playlists.
License: %gpl2plus
Group: Sound
URL: http://musicpd.org
/
Source0:
http://musicpd.org/uploads/files/%name-%version.tar.bz2
URL: http://musicpd.org
Source0:
%url/uploads/files/%name-%version.tar
Source1: %name.conf
Source2: %name.sys.conf.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
# Automatically added by buildreq on Tue Sep 11 2007
...
...
@@ -83,7 +84,8 @@ console junkie, like frontend options, or restart X often.
%prep
%setup
%patch -p1
%patch0 -p1
%patch1 -p1
%rpmver_ge libflac-devel 1.1.3
subst 's/AM_PATH_LIBOGGFLAC/AM_PATH_LIBFLAC/' configure.ac
%endif
...
...
@@ -133,7 +135,10 @@ chmod 755 %buildroot%_initdir/%name
%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
...
...
@@ -152,13 +157,23 @@ chmod 755 %buildroot%_initdir/%name
%_man1dir/*
%_man5dir/*
%_initdir/*
%attr(7
55,%mpd_user
,%mpd_group) %dir %_localstatedir/%name
%attr(7
55,%mpd_user
,%mpd_group) %dir %_localstatedir/%name/playlists
%attr(7
55,%mpd_user
,%mpd_group) %dir /var/run/%name
%attr(7
55,%mpd_user
,%mpd_group) %dir %_logdir/%name
%attr(7
75,root
,%mpd_group) %dir %_localstatedir/%name
%attr(7
75,root
,%mpd_group) %dir %_localstatedir/%name/playlists
%attr(7
75,root
,%mpd_group) %dir /var/run/%name
%attr(7
75,root
,%mpd_group) %dir %_logdir/%name
%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
- 0.13.1
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment