From 5afa77b9934482275416616e1542146975013d0d Mon Sep 17 00:00:00 2001 From: gafton Date: Wed, 24 Nov 2004 05:10:12 +0000 Subject: [PATCH 01/11] Fix braindead typo from the original import --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index f03314c..62b0efc 100644 --- a/Makefile +++ b/Makefile @@ -12,7 +12,7 @@ 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 +test -f CVS/Root && { 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)) From 356842b7f4591e258cb927350fcc7a4556b0da2b Mon Sep 17 00:00:00 2001 From: Matthias Saou Date: Sat, 5 Mar 2005 20:07:09 +0000 Subject: [PATCH 02/11] Mass letter "x"," y" and "z" update, one or more apply : - Drop epoch: 0 - Remove %{epoch} requirements in sub-packages - Remove trailing white spaces - Keep consistent between spaces and tabs --- xmms-sid.spec | 22 +++++++--------------- 1 file changed, 7 insertions(+), 15 deletions(-) diff --git a/xmms-sid.spec b/xmms-sid.spec index e5a3242..914024e 100644 --- a/xmms-sid.spec +++ b/xmms-sid.spec @@ -4,7 +4,6 @@ Summary: SIDPlay input plugin for X MultiMedia System (XMMS) Name: xmms-sid Version: 0.7.4 Release: 4 -Epoch: 0 URL: http://www.tnsp.org/xmms-sid.php License: GPL Group: Applications/Multimedia @@ -12,18 +11,18 @@ 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 +Requires: xmms >= 1.2.7 +BuildRequires: xmms-devel >= 1.2, libsidplay-devel >= 1.36.57 +BuildRequires: gtk+-devel >= 1.2.2, glib-devel >= 1.2.2 %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. - + 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 @@ -35,33 +34,26 @@ known as VIC-64 in some countries). %patch1 -p1 -b .gcc34 -#--------------------------------------------------------------------- - %build %configure --libdir=%{xmms_inputdir} make %{?_smp_mflags} - -#--------------------------------------------------------------------- + %install rm -rf %{buildroot} make DESTDIR=%{buildroot} install rm -f %{buildroot}/%{xmms_inputdir}/*.la -#--------------------------------------------------------------------- %clean rm -rf %{buildroot} -#--------------------------------------------------------------------- - %files %defattr(-,root,root,-) %doc AUTHORS COPYING ChangeLog NEWS README TODO README.* %{xmms_inputdir}/*.so -#--------------------------------------------------------------------- %changelog * Wed Nov 10 2004 Michael Schwendt 0:0.7.4-4 @@ -74,5 +66,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. From 80e06a53141547e495fb56ea6c6eda624cc80987 Mon Sep 17 00:00:00 2001 From: Michael Schwendt Date: Wed, 6 Apr 2005 22:13:53 +0000 Subject: [PATCH 03/11] mass release bump for packages not rebuilt after FC-3-split --- xmms-sid.spec | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/xmms-sid.spec b/xmms-sid.spec index 914024e..74249df 100644 --- a/xmms-sid.spec +++ b/xmms-sid.spec @@ -3,7 +3,8 @@ Summary: SIDPlay input plugin for X MultiMedia System (XMMS) Name: xmms-sid Version: 0.7.4 -Release: 4 +Release: 5 + URL: http://www.tnsp.org/xmms-sid.php License: GPL Group: Applications/Multimedia @@ -56,6 +57,9 @@ rm -rf %{buildroot} %changelog +* 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. From 03e25acbad62562898dc2811dbf099e96f9bc566 Mon Sep 17 00:00:00 2001 From: Jeremy Katz Date: Sun, 22 May 2005 23:41:56 +0000 Subject: [PATCH 04/11] - rebuild on all arches --- xmms-sid.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xmms-sid.spec b/xmms-sid.spec index 74249df..43f17a3 100644 --- a/xmms-sid.spec +++ b/xmms-sid.spec @@ -3,7 +3,7 @@ Summary: SIDPlay input plugin for X MultiMedia System (XMMS) Name: xmms-sid Version: 0.7.4 -Release: 5 +Release: 6 URL: http://www.tnsp.org/xmms-sid.php License: GPL @@ -57,6 +57,9 @@ rm -rf %{buildroot} %changelog +* Sun May 22 2005 Jeremy Katz - 0.7.4-6 +- rebuild on all arches + * Fri Apr 7 2005 Michael Schwendt - rebuilt From b335525d29f4e6d96966c2089ad5944f8a5145dc Mon Sep 17 00:00:00 2001 From: Michael Schwendt Date: Sat, 18 Feb 2006 16:25:14 +0000 Subject: [PATCH 05/11] auto-import xmms-sid-0.8.0-0.1.beta15 on branch devel from xmms-sid-0.8.0-0.1.beta15.src.rpm Upgrade src.rpm --- .cvsignore | 2 +- sources | 2 +- xmms-sid-0.7.4-cflags.patch | 11 ----------- xmms-sid-0.7.4-gcc34.patch | 12 ------------ xmms-sid-0.8.0beta15.tar.bz2.asc | 7 +++++++ xmms-sid.spec | 25 ++++++++++++------------- 6 files changed, 21 insertions(+), 38 deletions(-) delete mode 100644 xmms-sid-0.7.4-cflags.patch delete mode 100644 xmms-sid-0.7.4-gcc34.patch create mode 100644 xmms-sid-0.8.0beta15.tar.bz2.asc diff --git a/.cvsignore b/.cvsignore index 5114d8b..8db68e2 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -xmms-sid-0.7.4.tar.bz2 +xmms-sid-0.8.0beta15.tar.bz2 diff --git a/sources b/sources index ee90f52..44d35d2 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -02bff37834fe8dd713e87511bb2213a4 xmms-sid-0.7.4.tar.bz2 +43c1472d84fe41e96ca64da73832c420 xmms-sid-0.8.0beta15.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 43f17a3..7200087 100644 --- a/xmms-sid.spec +++ b/xmms-sid.spec @@ -2,19 +2,17 @@ Summary: SIDPlay input plugin for X MultiMedia System (XMMS) Name: xmms-sid -Version: 0.7.4 -Release: 6 - +Version: 0.8.0 +Release: 0.1.beta15%{?dist} URL: http://www.tnsp.org/xmms-sid.php License: GPL 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 +Source0: http://www.tnsp.org/xs-files/%{name}-0.8.0beta15.tar.bz2 +Source1: http://www.tnsp.org/xs-files/%{name}-0.8.0beta15.tar.bz2.asc BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root -Requires: xmms >= 1.2.7 -BuildRequires: xmms-devel >= 1.2, libsidplay-devel >= 1.36.57 -BuildRequires: gtk+-devel >= 1.2.2, glib-devel >= 1.2.2 +Requires: xmms +BuildRequires: xmms-devel libsidplay-devel +BuildRequires: glib-devel gtk+-devel %description XMMS-SID is a plugin for XMMS (X MultiMedia System) which provides @@ -30,9 +28,7 @@ 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}-0.8.0beta15 %build @@ -52,11 +48,14 @@ rm -rf %{buildroot} %files %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 +* 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 From 22ea943fd92b7910d43a6d6babb74c5f25ad8271 Mon Sep 17 00:00:00 2001 From: Michael Schwendt Date: Sat, 8 Apr 2006 09:54:25 +0000 Subject: [PATCH 06/11] - remove explicit dep on "xmms" and rely on soname dep --- xmms-sid.spec | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/xmms-sid.spec b/xmms-sid.spec index 7200087..44fd1cc 100644 --- a/xmms-sid.spec +++ b/xmms-sid.spec @@ -3,14 +3,13 @@ Summary: SIDPlay input plugin for X MultiMedia System (XMMS) Name: xmms-sid Version: 0.8.0 -Release: 0.1.beta15%{?dist} +Release: 0.2.beta15%{?dist} URL: http://www.tnsp.org/xmms-sid.php License: GPL Group: Applications/Multimedia Source0: http://www.tnsp.org/xs-files/%{name}-0.8.0beta15.tar.bz2 Source1: http://www.tnsp.org/xs-files/%{name}-0.8.0beta15.tar.bz2.asc BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root -Requires: xmms BuildRequires: xmms-devel libsidplay-devel BuildRequires: glib-devel gtk+-devel @@ -53,6 +52,9 @@ rm -rf %{buildroot} %changelog +* 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 From 9288828826fa2a813a5aaf542f1c831e96ab9d81 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ville=20Skytt=C3=A4?= Date: Sun, 27 Aug 2006 21:18:11 +0000 Subject: [PATCH 07/11] http://fedoraproject.org/wiki/Extras/Schedule/FC6MassRebuild --- needs.rebuild | 1 + 1 file changed, 1 insertion(+) create mode 100644 needs.rebuild diff --git a/needs.rebuild b/needs.rebuild new file mode 100644 index 0000000..815fd29 --- /dev/null +++ b/needs.rebuild @@ -0,0 +1 @@ +http://fedoraproject.org/wiki/Extras/Schedule/FC6MassRebuild From 19862bed27c9763de19a6bc5ebe226cb1f979c7e Mon Sep 17 00:00:00 2001 From: Michael Schwendt Date: Mon, 28 Aug 2006 10:36:04 +0000 Subject: [PATCH 08/11] automated bump and rebuild --- needs.rebuild | 1 - xmms-sid.spec | 5 ++++- 2 files changed, 4 insertions(+), 2 deletions(-) delete mode 100644 needs.rebuild diff --git a/needs.rebuild b/needs.rebuild deleted file mode 100644 index 815fd29..0000000 --- a/needs.rebuild +++ /dev/null @@ -1 +0,0 @@ -http://fedoraproject.org/wiki/Extras/Schedule/FC6MassRebuild diff --git a/xmms-sid.spec b/xmms-sid.spec index 44fd1cc..4e5672b 100644 --- a/xmms-sid.spec +++ b/xmms-sid.spec @@ -3,7 +3,7 @@ Summary: SIDPlay input plugin for X MultiMedia System (XMMS) Name: xmms-sid Version: 0.8.0 -Release: 0.2.beta15%{?dist} +Release: 0.3.beta15%{?dist} URL: http://www.tnsp.org/xmms-sid.php License: GPL Group: Applications/Multimedia @@ -52,6 +52,9 @@ rm -rf %{buildroot} %changelog +* 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 From 9b346271252a9cdfdb0eabb0a0697d8e6cd55a34 Mon Sep 17 00:00:00 2001 From: Jeremy Katz Date: Mon, 23 Oct 2006 19:43:57 +0000 Subject: [PATCH 09/11] Initialize branch FC-6 for xmms-sid --- branch | 1 + 1 file changed, 1 insertion(+) create mode 100644 branch diff --git a/branch b/branch new file mode 100644 index 0000000..d5b6362 --- /dev/null +++ b/branch @@ -0,0 +1 @@ +FC-6 From 1142d858138f52da121e53c31e6dc2ecfe75c289 Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Thu, 26 Nov 2009 01:35:18 +0000 Subject: [PATCH 10/11] Fix typo that causes a failure to update the common directory. (releng #2781) --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 62b0efc..cdbef4c 100644 --- a/Makefile +++ b/Makefile @@ -4,7 +4,7 @@ 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 +for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done endef MAKEFILE_COMMON := $(shell $(find-makefile-common)) From b315c4e84cfc9a4d4dc26a74c171185171676126 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 29 Jul 2010 16:01:04 +0000 Subject: [PATCH 11/11] dist-git conversion --- .cvsignore => .gitignore | 0 Makefile | 21 --------------------- branch | 1 - 3 files changed, 22 deletions(-) rename .cvsignore => .gitignore (100%) delete mode 100644 Makefile delete mode 100644 branch diff --git a/.cvsignore b/.gitignore similarity index 100% rename from .cvsignore rename to .gitignore diff --git a/Makefile b/Makefile deleted file mode 100644 index cdbef4c..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 $$d/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/Root && { 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/branch b/branch deleted file mode 100644 index d5b6362..0000000 --- a/branch +++ /dev/null @@ -1 +0,0 @@ -FC-6