diff --git a/.cvsignore b/.cvsignore deleted file mode 100644 index 5114d8b..0000000 --- a/.cvsignore +++ /dev/null @@ -1 +0,0 @@ -xmms-sid-0.7.4.tar.bz2 diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..2fdd613 --- /dev/null +++ b/.gitignore @@ -0,0 +1,2 @@ +xmms-sid-0.8.0beta19.tar.bz2.asc +xmms-sid-0.8.0beta19.tar.bz2 diff --git a/Makefile b/Makefile deleted file mode 100644 index f03314c..0000000 --- a/Makefile +++ /dev/null @@ -1,21 +0,0 @@ -# Makefile for source rpm: xmms-sid -# $Id$ -NAME := xmms-sid -SPECFILE = $(firstword $(wildcard *.spec)) - -define find-makefile-common -for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done -endef - -MAKEFILE_COMMON := $(shell $(find-makefile-common)) - -ifeq ($(MAKEFILE_COMMON),) -# attept a checkout -define checkout-makefile-common -test -f CVS/Rootx && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2 -endef - -MAKEFILE_COMMON := $(shell $(checkout-makefile-common)) -endif - -include $(MAKEFILE_COMMON) diff --git a/sources b/sources index ee90f52..1a81c35 100644 --- a/sources +++ b/sources @@ -1 +1,2 @@ -02bff37834fe8dd713e87511bb2213a4 xmms-sid-0.7.4.tar.bz2 +5399850d08166106a1ef7d142efa45d2 xmms-sid-0.8.0beta19.tar.bz2.asc +1f580736787f9c4d7cbc8166d96363ba xmms-sid-0.8.0beta19.tar.bz2 diff --git a/xmms-sid-0.7.4-cflags.patch b/xmms-sid-0.7.4-cflags.patch deleted file mode 100644 index 6a5242d..0000000 --- a/xmms-sid-0.7.4-cflags.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- xmms-sid-0.7.4/src/Makefile.in.cflags 2003-05-02 18:53:22.000000000 +0300 -+++ xmms-sid-0.7.4/src/Makefile.in 2003-05-02 18:52:36.000000000 +0300 -@@ -104,7 +104,7 @@ - - # Generals - --CFLAGS = -O2 -W -Wall -I$(top_builddir) -I$(top_srcdir) -I$(includedir) -D_REENTRANT @GTK_CFLAGS@ @SIDPLAY_CFLAGS@ -lstdc++ -+CFLAGS = @CFLAGS@ -O2 -W -Wall -I$(top_builddir) -I$(top_srcdir) -I$(includedir) -D_REENTRANT @GTK_CFLAGS@ @SIDPLAY_CFLAGS@ -lstdc++ - CXXFLAGS = $(CFLAGS) - LIBS = -lsidplay - diff --git a/xmms-sid-0.7.4-gcc34.patch b/xmms-sid-0.7.4-gcc34.patch deleted file mode 100644 index 4834024..0000000 --- a/xmms-sid-0.7.4-gcc34.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -Nur xmms-sid-0.7.4-orig/src/xmms-sid.cc xmms-sid-0.7.4/src/xmms-sid.cc ---- xmms-sid-0.7.4-orig/src/xmms-sid.cc 2002-09-02 23:55:29.000000000 +0200 -+++ xmms-sid-0.7.4/src/xmms-sid.cc 2004-11-10 04:13:37.000000000 +0100 -@@ -196,7 +196,7 @@ - int fxlen, tn; - struct sidTuneInfo sidInf; - char *name; -- enum AFormat fmt = (xs_emuConf.bitsPerSample == 16) ? FMT_S16_NE : FMT_U8; -+ AFormat fmt = (xs_emuConf.bitsPerSample == 16) ? FMT_S16_NE : FMT_U8; - gint chn = xs_emuConf.channels; - - tune->getInfo(sidInf); diff --git a/xmms-sid-0.8.0beta15.tar.bz2.asc b/xmms-sid-0.8.0beta15.tar.bz2.asc new file mode 100644 index 0000000..1b87f04 --- /dev/null +++ b/xmms-sid-0.8.0beta15.tar.bz2.asc @@ -0,0 +1,7 @@ +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v1.4.2 (GNU/Linux) + +iD8DBQBDck1LEKYophN0wRIRAjXnAJ9WdajeoUtO5tAcv6I16l1qjIgkfwCbBduT +CdJIcO3ufwi7La6G8V7knmw= +=vv+g +-----END PGP SIGNATURE----- diff --git a/xmms-sid.spec b/xmms-sid.spec index e5a3242..6b01d5e 100644 --- a/xmms-sid.spec +++ b/xmms-sid.spec @@ -1,70 +1,90 @@ %define xmms_inputdir %(xmms-config --input-plugin-dir) -Summary: SIDPlay input plugin for X MultiMedia System (XMMS) +%define sourceversion 0.8.0beta19 + +Summary: SID music input plugin for X MultiMedia System (XMMS) Name: xmms-sid -Version: 0.7.4 -Release: 4 -Epoch: 0 +Version: 0.8.0 +Release: 0.6.beta19%{?dist} URL: http://www.tnsp.org/xmms-sid.php -License: GPL +License: GPLv2+ Group: Applications/Multimedia -Source0: http://www.tnsp.org/xs-files/%{name}-%{version}.tar.bz2 -Patch0: xmms-sid-0.7.4-cflags.patch -Patch1: xmms-sid-0.7.4-gcc34.patch -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root -Requires: xmms >= 0:1.2.7 -BuildRequires: xmms-devel >= 0:1.2, libsidplay-devel >= 0:1.36.57 -BuildRequires: gtk+-devel >= 0:1.2.2, glib-devel >= 0:1.2.2 +Source0: http://www.tnsp.org/xs-files/%{name}-%{sourceversion}.tar.bz2 +Source1: http://www.tnsp.org/xs-files/%{name}-%{sourceversion}.tar.bz2.asc +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) +BuildRequires: xmms-devel libsidplay-devel +BuildRequires: glib-devel gtk+-devel %description XMMS-SID is a plugin for XMMS (X MultiMedia System) which provides support for playing the so-called "SID tunes". For the actual playing, -XMMS-SID uses the excellent libsidplay SID-chip/6502 emulator engine. - +XMMS-SID uses the libsidplay emulator engine. + If you are not familiar with the term "SID tune" or "SID" concept at all, a short (yes it is! ;-) explanation follows: - -SID is the sound chip that was used in many of the old 8-bit home -computers manufactured by Commodore Inc. in 1980's. Best known of -those was the Commodore 64 home computer (aka C64 or CBM64, also + +SID is the MOS-6581 (and MOS-8580) sound chip that was used in many of the +old 8-bit home computers manufactured by Commodore Inc. in 1980's. Best +known of those was the Commodore 64 home computer (aka C64 or CBM64, also known as VIC-64 in some countries). %prep -%setup -q -%patch0 -p1 -b .cflags -%patch1 -p1 -b .gcc34 +%setup -q -n %{name}-%{sourceversion} -#--------------------------------------------------------------------- - %build %configure --libdir=%{xmms_inputdir} make %{?_smp_mflags} - -#--------------------------------------------------------------------- + %install rm -rf %{buildroot} make DESTDIR=%{buildroot} install rm -f %{buildroot}/%{xmms_inputdir}/*.la +rm -f %{buildroot}%{_datadir}/%{name}/Kummatti_City.sid +%find_lang %{name} -#--------------------------------------------------------------------- %clean rm -rf %{buildroot} -#--------------------------------------------------------------------- - -%files +%files -f %{name}.lang %defattr(-,root,root,-) -%doc AUTHORS COPYING ChangeLog NEWS README TODO README.* +%doc AUTHORS BUGS COPYING ChangeLog FAQ NEWS README THANKS TODO %{xmms_inputdir}/*.so -#--------------------------------------------------------------------- %changelog -* Wed Nov 10 2004 Michael Schwendt 0:0.7.4-4 +* Wed Sep 3 2008 Michael Schwendt - 0.8.0-0.6.beta19 +- update to beta19 + +* Fri Feb 08 2008 Michael Schwendt +- rebuilt for GCC 4.3 as requested by Fedora Release Engineering + +* Tue Aug 21 2007 Michael Schwendt +- rebuilt + +* Thu Aug 2 2007 Michael Schwendt - 0.8.0-0.3.beta17 +- Upgrade to 0.8.0beta17, add translation message object files. +- Clarify licence (GPLv2+). + +* Mon Aug 28 2006 Michael Schwendt +- rebuilt + +* Sat Apr 8 2006 Michael Schwendt - 0.8.0-0.2.beta15 +- remove explicit dep on "xmms" and rely on soname dep + +* Sat Feb 18 2006 Michael Schwendt - 0.8.0-0.1.beta15 +- upgrade to 0.8.0beta15 which upstream has declared as stable + +* Sun May 22 2005 Jeremy Katz - 0.7.4-6 +- rebuild on all arches + +* Fri Apr 7 2005 Michael Schwendt +- rebuilt + +* Wed Nov 10 2004 Michael Schwendt 0:0.7.4-4 - Fix src/xmms-sid.cc for GCC 3.4/FC3. * Fri May 02 2003 Panu Matilainen 0:0.7.4-0.fdr.3 @@ -74,5 +94,5 @@ rm -rf %{buildroot} * Mon Apr 28 2003 Panu Matilainen 0:0.7.4-0.fdr.2 - add missing Epoch's -* Mon Mar 24 2003 Panu Matilainen +* Mon Mar 24 2003 Panu Matilainen - Initial Fedora packaging.