Author: scop
Update of /cvs/extras/rpms/xmms/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22421
Modified Files:
xmms.spec
Added Files:
xmms-cd-mountpoint.patch
Log Message:
Tune default CDROM mountpoint, drop unneeded skins tarball.
xmms-cd-mountpoint.patch:
--- NEW FILE xmms-cd-mountpoint.patch ---
--- Input/cdaudio/cdaudio.c~ 2004-01-28 01:09:39.000000000 +0200
+++ Input/cdaudio/cdaudio.c 2005-04-30 18:39:04.000000000 +0300
@@ -78,7 +78,7 @@
# define CDDA_DIRECTORY "/cdrom/cdrom0"
# endif
# else
-# define CDDA_DIRECTORY "/mnt/cdrom"
+# define CDDA_DIRECTORY "/media/cdrecorder"
# endif
#endif
Index: xmms.spec
===================================================================
RCS file: /cvs/extras/rpms/xmms/devel/xmms.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- xmms.spec 15 Apr 2005 20:07:18 -0000 1.7
+++ xmms.spec 30 Apr 2005 16:40:24 -0000 1.8
@@ -1,16 +1,14 @@
Summary: The X MultiMedia System, a media player which resembles Winamp
Name: xmms
Version: 1.2.10
-Release: 15
+Release: 16
Epoch: 1
License: GPL
Group: Applications/Multimedia
URL:
http://www.xmms.org/
Source0:
http://www.xmms.org/files/1.2.x/%{name}-%{version}.patched.tar.bz2
-#Source1:
Source2: xmms.req
Source3: xmms.xpm
-Source4: xmmsskins-1.0.tar.gz
Source5: rh_mp3.c
Patch1: xmms-1.2.6-audio.patch
Patch2: xmms-1.2.6-lazy.patch
@@ -18,8 +16,7 @@
Patch4: xmms-1.2.9-nomp3.patch
Patch5: xmms-1.2.8-arts.patch
Patch6: xmms-1.2.8-alsalib.patch
-#Patch7:
-#Patch8:
+Patch7: xmms-cd-mountpoint.patch
Patch9: xmms-underquoted.patch
Patch10: xmms-alsa-backport.patch
Patch11: xmms-1.2.10-gcc4.patch
@@ -67,6 +64,8 @@
%patch5 -p1 -b .arts
# Don't link *everything* against alsa-lib
%patch6 -p1 -b .alsalib
+# Use something that's more likely to work as the default cdrom mountpoint
+%patch7 -p0 -b .cd-mountpoint
# Fix m4 underquoted warning
%patch9 -p1 -b .underquoted
# Backport for recent ALSA
@@ -75,7 +74,7 @@
%patch11 -p1 -b .gcc4
%build
-%configure \
+%configure --disable-dependency-tracking \
--enable-kanji \
--enable-texthack \
--enable-ipv6
@@ -146,6 +145,12 @@
%{_libdir}/lib*.so
%changelog
+* Sat Apr 30 2005 Ville Skytt�� <ville.skytta at iki.fi> - 1:1.2.10-16
+- Use /media/cdrecorder as the default CDROM mountpoint for the CD audio
+ plugin, it's more likely to work nowadays than /mnt/cdrom.
+- Drop no longer needed skins tarball.
+- Build with dependency tracking disabled.
+
* Fri Apr 15 2005 Matthias Saou <
http://freshrpms.net/> 1:1.2.10-15
- Change main icon from xpm to png (smaller, more consistent).
- Split off the aRts plugin.