rpms/xmms/devel xmms.spec,1.2,1.3
Seth Vidal (skvidal)
fedora-extras-commits at redhat.com
Wed Apr 6 05:17:53 UTC 2005
Author: skvidal
Update of /cvs/extras/rpms/xmms/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16692
Modified Files:
xmms.spec
Log Message:
clean up spec file
Index: xmms.spec
===================================================================
RCS file: /cvs/extras/rpms/xmms/devel/xmms.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- xmms.spec 6 Apr 2005 04:57:33 -0000 1.2
+++ xmms.spec 6 Apr 2005 05:17:51 -0000 1.3
@@ -9,23 +9,23 @@
License: GPL
Group: Applications/Multimedia
URL: http://www.xmms.org/
-Source: http://www.xmms.org/files/1.2.x/%{name}-%{version}.patched.tar.bz2
-Source4: arts_output-%{artsplugin_ver}.tar.gz
-Source5: xmms.req
-Source6: xmms.xpm
-Source7: xmmsskins-1.0.tar.gz
-Source8: rh_mp3.c
+Source0: http://www.xmms.org/files/1.2.x/%{name}-%{version}.patched.tar.bz2
+Source1: arts_output-%{artsplugin_ver}.tar.gz
+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
Patch3: xmms-1.2.8-default-skin.patch
Patch4: xmms-1.2.9-nomp3.patch
Patch5: xmms-1.2.8-arts.patch
Patch6: xmms-1.2.8-alsalib.patch
-#Patch8: http://www3.big.or.jp/~sian/linux/products/xmms/xmms-1.2.5pre1j_20010601.diff.bz2
-Patch10: arts_output-0.6.0-buffer.patch
-Patch11: xmms-underquoted.patch
-Patch12: xmms-alsa-backport.patch
-Patch13: xmms-1.2.10-gcc4.patch
+#Patch7: http://www3.big.or.jp/~sian/linux/products/xmms/xmms-1.2.5pre1j_20010601.diff.bz2
+Patch8: arts_output-0.6.0-buffer.patch
+Patch9: xmms-underquoted.patch
+Patch10: xmms-alsa-backport.patch
+Patch11: xmms-1.2.10-gcc4.patch
Requires: gtk+ >= 1:1.2.2, unzip
# the desktop file and redhat-menus are redundant requires really
@@ -42,7 +42,7 @@
Conflicts: arts < 1.2.0-1.5
%define _use_internal_dependency_generator 0
-%define __find_requires %{SOURCE5}
+%define __find_requires %{SOURCE2}
%description
Xmms is a multimedia (Ogg Vorbis, CDs) player for the X Window System with
@@ -70,7 +70,7 @@
skins were obtained from http://www.xmms.org/skins.html .
%prep
-%setup -q -a 4
+%setup -q -a 1
# Set default output plugin to ALSA
%patch1 -p1 -b .audio
# Use RTLD_LAZY, not RTLD_NOW
@@ -83,15 +83,15 @@
# Link arts dynamically and detect its presence for choosing output plugin
%patch5 -p1 -b .arts
# bump up the default buffer size to avoid audio artifacts
-%patch10 -p0 -b .buffer
+%patch8 -p0 -b .buffer
%endif
# Don't link *everything* against alsa-lib
%patch6 -p1 -b .alsalib
-%patch11 -p1 -b .underquoted
-%patch12 -p0 -b .alsa-backport
-%patch13 -p1 -b .gcc4
+%patch9 -p1 -b .underquoted
+%patch10 -p0 -b .alsa-backport
+%patch11 -p1 -b .gcc4
-#%patch8 -p1 -b .ja
+#%patch7 -p1 -b .ja
%build
%configure \
@@ -115,7 +115,7 @@
%endif
gcc -fPIC $RPM_OPT_FLAGS -shared -Wl,-soname -Wl,librh_mp3.so -o librh_mp3.so \
- %{SOURCE8} -I. `gtk-config --cflags gtk`
+ %{SOURCE5} -I. `gtk-config --cflags gtk`
%install
rm -rf %{buildroot}
@@ -133,7 +133,7 @@
mkdir -p %{buildroot}%{_datadir}/xmms/Skins
pushd %{buildroot}%{_datadir}/xmms/Skins
- tar xvfz %{SOURCE7}
+ tar xvfz %{SOURCE4}
popd
mkdir -pv %{buildroot}%{_datadir}/applications
@@ -143,7 +143,7 @@
mkdir -p %{buildroot}%{_datadir}/pixmaps/mini
install xmms/xmms_logo.xpm %{buildroot}%{_datadir}/pixmaps
install xmms/xmms_mini.xpm %{buildroot}%{_datadir}/pixmaps/mini
-install -m 644 $RPM_SOURCE_DIR/xmms.xpm %{buildroot}%{_datadir}/pixmaps
+install -m 644 ${SOURCE3} %{buildroot}%{_datadir}/pixmaps
# unpackaged files
rm -f %{buildroot}/%{_datadir}/xmms/*/lib*.{a,la} \
@@ -197,6 +197,10 @@
%{_datadir}/xmms/Skins
%changelog
+* Wed Apr 6 2005 Seth Vidal <skvidal at phy.duke.edu> 1:1.2.10-13
+- clean up spec file a bit.
+- remove everything except for the last 2 yrs of changelog entries.
+
* Wed Apr 6 2005 Seth Vidal <skvidal at phy.duke.edu> 1:1.2.10-12
- Apply patch from David Hill RH bz: 152138
@@ -280,310 +284,3 @@
* Tue Jun 3 2003 Jeff Johnson <jbj at redhat.com>
- add explicit epoch's where needed.
-
-* Mon Feb 24 2003 Elliot Lee <sopwith at redhat.com>
-- rebuilt
-
-* Fri Feb 21 2003 Havoc Pennington <hp at redhat.com> 1:1.2.7-20.p
-- patch to fix session management which may prevent gnome-session hangs
-
-* Wed Feb 5 2003 Bill Nottingham <notting at redhat.com> 1.2.7-19.p
-- rename zz_mp3 to rh_mp3
-- fix rh_mp3 taking precedence over other plugins (#81002)
-- nuke .la files (#68341)
-
-* Wed Jan 22 2003 Tim Powers <timp at redhat.com>
-- rebuilt
-
-* Tue Jan 14 2003 Owen Taylor <otaylor at redhat.com> 1.2.7-17.p
-- Add patch from havardk at netcom.no to fix problem with file browser not
- updating in CDROM directories (#65173)
-
-* Tue Nov 12 2002 Bill Nottingham <notting at redhat.com> 1.2.7-16.p
-- rebuild on more arches
-
-* Wed Oct 2 2002 Bill Nottingham <notting at redhat.com> 1.2.7-15.p
-- fix zz_mp3 plugin, tweak some buildprereqs
-
-* Tue Oct 1 2002 Bill Nottingham <notting at redhat.com> 1.2.7-14.p
-- fix arts config code (#72440, #74708, #74717)
-- fix selection of 'no skin' (#73799)
-
-* Mon Sep 2 2002 Bill Nottingham <notting at redhat.com> 1.2.7-13.p
-- placeholder mp3 plugin
-
-* Thu Aug 22 2002 Bill Nottingham <notting at redhat.com> 1.2.7-12.p
-- absolute symlinks
-
-* Wed Aug 21 2002 Bill Nottingham <notting at redhat.com> 1.2.7-11.p
-- add mikmod buildprereq to insure plugin actually gets built (#70088)
-
-* Tue Aug 20 2002 Bill Nottingham <notting at redhat.com> 1.2.7-10.p
-- take out mpg123 plugin
-
-* Sat Aug 10 2002 Than Ngo <than at redhat.com> 1.2.7-10
-- Fix to use Bluecurve
-
-* Sat Aug 3 2002 Havoc Pennington <hp at redhat.com>
-- add a patch to default to redhat-artwork skin
-
-* Wed Jul 31 2002 Havoc Pennington <hp at redhat.com> 1.2.7-8
-- use override desktop file from redhat-menus so we can translate it
-- desktop file is not a config file
-
-* Tue Jul 30 2002 Bill Nottingham <notting at redhat.com> 1.2.7-7
-- desktop file tweaks (#69549)
-
-* Thu Jul 25 2002 Bill Nottingham <notting at redhat.com> 1.2.7-6
-- desktop file tweaks (#69549)
-
-* Fri Jul 18 2002 Bill Nottingham <notting at redhat.com> 1.2.7-5
-- build against current libvorbis
-
-* Wed Jun 27 2002 Karsten Hopp <karsten at redhat.de> 1.2.7-4
-- fix buildprereq (arts-devel instead of kdelibs-sound-devel)
-- added patch to avoid dynamic linkage against libarts (static libarts is no
- longer available), use dlopen instead
-
-* Sun May 26 2002 Tim Powers <timp at redhat.com>
-- automated rebuild
-
-* Thu May 16 2002 Bill Nottingham <notting at redhat.com> 1.2.7-2
-- kill -gnome subpackage
-
-* Mon Mar 4 2002 Bill Nottingham <notting at redhat.com> 1.2.7-1
-- update to 1.2.7
-
-* Tue Feb 26 2002 Bill Nottingham <notting at redhat.com> 1.2.6-2
-- don't strip libs
-
-* Tue Jan 15 2002 Bill Nottingham <notting at redhat.com> 1.2.6-0.7
-- update to 1.2.6
-
-* Tue Sep 4 2001 Bill Nottingham <notting at redhat.com>
-- ship man pages (#53095)
-
-* Mon Aug 20 2001 Bill Nottingham <notting at redhat.com>
-- add patch to fix vorbis on big-endian machines (<havardk at xmms.org>)
-- fix double ownership of files that made xmms-skins irrelevant (#51581)
-
-* Mon Jul 23 2001 Bill Nottingham <notting at redhat.com>
-- buildrequire gnome-libs-devel (#44849)
-
-* Tue Jul 17 2001 Bill Nottingham <notting at redhat.com>
-- own %%{_datadir}/xmms
-- take out the realtime patch for now
-- remove other obsoleted patches
-
-* Tue Jul 17 2001 Preston Brown <pbrown at redhat.com>
-- add audio/mpegurl to list of acceptable MimeTypes
-
-* Tue Jun 26 2001 Florian La Roche <Florian.LaRoche at redhat.de>
-- change filelist to include link from lib major version number
-
-* Wed Jun 20 2001 Preston Brown <pbrown at redhat.com>
-- 1.2.5
-- italian i18n patch disabled until a newer one available
-- japanese patch disabled until there is one available for 1.2.5
-- add OGG mimetype to .desktop file
-
-* Wed Jun 6 2001 Bill Nottingham <notting at redhat.com>
-- make it build
-
-* Mon May 21 2001 Tim Powers <timp at redhat.com>
-- added skins subpackage
-
-* Mon May 14 2001 Bill Nottingham <notting at redhat.com>
-- remove extraneous printf in tmpdir patch
-- add prototype for mpg123_munge_sample in downsample_vis patch
-
-* Thu Apr 11 2001 Bill Nottingham <notting at redhat.com>
-- rebuild to fix dependencies on ia64
-
-* Tue Mar 20 2001 Bill Nottingham <notting at redhat.com>
-- remove a couple of patches that are no longer needed (<havardk at xmms.org>)
-
-* Tue Mar 20 2001 Harald Hoyer <harald at redhat.de>
-- added euro patch to fix font loading
-
-* Tue Mar 13 2001 Bernhard Rosenkraenzer <bero at redhat.com>
-- Fix arts plugin installation
-
-* Mon Mar 05 2001 Owen Taylor <otaylor at redhat.com>
-- Rebuild for GTK+-1.2.9 include dirs
-
-* Thu Mar 1 2001 Bill Nottingham <notting at redhat.com>
-- fix arts pluging build to be self hosting (#30049)
-
-* Thu Feb 22 2001 Bill Nottingham <notting at redhat.com>
-- add recommended bugfixes from the XMMS team (<havardk at xmms.org>)
-
-* Thu Feb 8 2001 Bill Nottingham <notting at redhat.com>
-- fix tmpdir patch & skin saving (#26494)
-
-* Thu Feb 1 2001 Bill Nottingham <notting at redhat.com>
-- hack to fix visualization scope when downsampling (#19642)
-- install xmms.xpm and fix icon entry in desktop,
- add some #include fixes (#20944, <tothwolf at concentric.net>)
-- make realtime not make xmms perform *worse* (#23951)
-
-* Thu Jan 18 2001 Bill Nottingham <notting at redhat.com>
-- don't segfault on skin change (#24284)
-
-* Mon Jan 8 2001 Bill Nottingham <notting at redhat.com>
-- kill separate kde package
-
-* Mon Jan 8 2001 Bernhard Rosenkraenzer <bero at redhat.com>
-- Add arts backend (new kde subpackage)
-- Add a hack to determine whether arts, esd or oss should be used
-- Fix requires
-- Mark locale files
-
-* Tue Jan 2 2001 Bill Nottingham <notting at redhat.com>
-- clean up japanese support patch some
-- don't enable transparenthack; it's broken
-- fix possible temp race
-
-* Mon Dec 25 2000 Yukihiro Nakai <ynakai at redhat.com>
-- Add Japanese resources.
-
-* Tue Nov 28 2000 Bill Nottingham <notting at redhat.com>
-- update to 1.2.4
-
-* Mon Nov 13 2000 Bill Nottingham <notting at redhat.com>
-- fix some compiler warnings (#20135)
-- add Ogg Vorbis plugin
-
-* Mon Oct 30 2000 Preston Brown <pbrown at redhat.com>
-- even better .desktop file handling streaming MP3 types
-
-* Mon Oct 16 2000 Bill Nottingham <notting at redhat.com>
-- um, if we're going to ship a japanese translation, we should probably
- ship the .mo files
-- add a patch for small files from Thomas Woller
-- add alpha patches (#19141)
-
-* Fri Oct 13 2000 Preston Brown <pbrown at redhat.com>
-- improved .desktop file
-- 1.2.3
-
-* Thu Aug 31 2000 Satoru Sato <ssato at redhat.com>
-- fix SPEC
-
-* Wed Aug 30 2000 Satoru Sato <ssato at redhat.com>
-- apply nls patch (by Hiroshi Takekawa <sian at big.or.jp>)
-
-* Fri Aug 11 2000 Jonathan Blandford <jrb at redhat.com>
-- Up Epoch and release
-
-* Mon Aug 7 2000 Bill Nottingham <notting at redhat.com>
-- rebuild against new DGA
-
-* Fri Aug 4 2000 Bill Nottingham <notting at redhat.com>
-- add translation to desktop entry
-
-* Wed Jul 19 2000 Bill Nottingham <notting at redhat.com>
-- version 1.2.2
-
-* Thu Jul 13 2000 Prospector <bugzilla at redhat.com>
-- automatic rebuild
-
-* Fri Jul 7 2000 Bill Nottingham <notting at redhat.com>
-- use lazy symbol resolution in the plugin loader
-
-* Mon Jun 18 2000 Bill Nottingham <notting at redhat.com>
-- 1.2.1
-
-* Fri Jun 16 2000 Preston Brown <pbrown at redhat.com>
-- some fixes to the .desktop entry
-
-* Mon Jun 12 2000 Preston Brown <pbrown at redhat.com>
-- 1.2.0
-- use rpm macros
-- fix gnomexmms buildroot breakage
-
-* Sun Jun 11 2000 Bill Nottingham <notting at redhat.com>
-- rebuild in new environment
-- work around some toolchain madness
-
-* Mon Mar 27 2000 Bill Nottingham <notting at redhat.com>
-- include /usr/share/xmmms/wmxmms.xpm
-
-* Tue Feb 22 2000 Bill Nottingham <notting at redhat.com>
-- use /usr prefix to be consistent with xmms.org (why not?)
-- find something more appropriate than the disk writer to use
- as output plugin if configured one doesn't exist
-
-* Wed Feb 16 2000 Matt Wilson <msw at redhat.com>
-- include /usr/X11R6/bin/wmxmms
-
-* Thu Feb 3 2000 Bill Nottingham <notting at redhat.com>
-- some cleanups
-
-* Mon Jan 31 2000 Bill Nottingham <notting at redhat.com>
-- update to 1.0.1
-
-* Fri Jan 28 2000 Bill Nottingham <notting at redhat.com>
-- update to 1.0.0
-
-* Tue Sep 28 1999 Bill Nottingham <notting at redhat.com>
-- update to 0.9.5.1
-
-* Wed Sep 23 1999 Preston Brown <pbrown at redhat.com>
-- latest stable release (0.9.5)
-
-* Wed Sep 22 1999 Bill Nottingham <notting at redhat.com>
-- open in non-blocking mode, then reset
-- make esd the default
-
-* Mon Sep 13 1999 Bill Nottingham <notting at redhat.com>
-- fix binaries
-
-* Thu Sep 9 1999 Bill Nottingham <notting at redhat.com>
-- fix gtk+ requirements
-
-* Wed Aug 18 1999 Bill Nottingham <notting at redhat.com>
-- fix a /0 in the disk writer
-
-* Tue Jul 20 1999 Bill Nottingham <notting at redhat.com>
-- 0.9.1
-
-* Mon Jun 21 1999 Bill Nottingham <notting at redhat.com>
-- use other fallback patch
-- obsolete x11amp-devel
-
-* Fri Jun 11 1999 Matt Wilson <msw at redhat.com>
-- updated to xmms 0.9 final
-
-* Thu Apr 8 1999 The Rasterman <raster at redhat.com>
-- patched to have plugin fallback to other plugins for output if plugin fails.
-
-* Mon Mar 29 1999 Michael Maher <mike at redhat.com>
-- added desktop entry.
-
-* Mon Mar 22 1999 Michael Maher <mike at redhat.com>
-- made some changes to the spec file.
-- has 'esd' support now.
-- stripped executables.
-
-* Mon Feb 15 1999 Michael Maher <mike at redhat.com>
-- built pacakge for 6.0
-- changed spec file, added mp3 licenses.
-
-* Mon Feb 15 1999 Ryan Weaver <ryanw at infohwy.com>
- [x11amp-0.9-alpha3-1]
-- Updated to alpha3 see ChangLog for changes.
-
-* Wed Jan 13 1999 Ryan Weaver <ryanw at infohwy.com>
- [x11amp-0.9-alpha2-1]
-- fixed close button in PL/EQ windows
-- fixed shuffel/randomize functions
-- removed imlib, no need for imlib anymore
-- mpg123 plugin now works on SMP machines, also reduced cpu usage
-- fixed so mainwindow will be positioned correct at startup in some windowmanagers
-- fixed the playlistwindow buttons that ended up behind the window
-- added mikmod plugin into the source tree
-- now you can configure the OSS drivers and mpg123 plugin
-- SKINSDIR variable can be used again
-- added bars as analyzer mode
-- in playlistwindow the player control buttons now work, also time window works
More information about the fedora-extras-commits
mailing list