From f99a406ebc6cf8f818dd084e8da9c6c48cf83621 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Toshio=20=E3=81=8F=E3=82=89=E3=81=A8=E3=81=BF?= Date: Sat, 20 Oct 2007 15:38:54 +0000 Subject: [PATCH 1/4] Initialize branch F-8 for abcMIDI --- branch | 1 + 1 file changed, 1 insertion(+) create mode 100644 branch diff --git a/branch b/branch new file mode 100644 index 0000000..e9e7ccd --- /dev/null +++ b/branch @@ -0,0 +1 @@ +F-8 From f8d82594b575abde276cac718f7686b82396adbd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?G=C3=A9rard=20Milmeister?= Date: Wed, 24 Sep 2008 15:45:08 +0000 Subject: [PATCH 2/4] new release 20080924 --- .cvsignore | 2 +- abcMIDI.spec | 15 ++++++++++----- abcmidi-snprintf.patch | 10 ---------- abcmidi-sprintf.patch | 11 ----------- sources | 2 +- 5 files changed, 12 insertions(+), 28 deletions(-) delete mode 100644 abcmidi-snprintf.patch delete mode 100644 abcmidi-sprintf.patch diff --git a/.cvsignore b/.cvsignore index c23c94a..9a916e0 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -abcMIDI-2007-01-06.zip +abcMIDI-2008-09-24.zip diff --git a/abcMIDI.spec b/abcMIDI.spec index 6fe050d..c26e21e 100644 --- a/abcMIDI.spec +++ b/abcMIDI.spec @@ -1,12 +1,12 @@ Name: abcMIDI -Version: 20070106 +Version: 20080924 Release: 1%{?dist} Summary: ABC to/from MIDI conversion utilities Group: Applications/Multimedia -License: GPL +License: GPLv2+ URL: http://abc.sourceforge.net/abcMIDI -Source0: http://ifdo.pugmarks.com/~seymour/runabc/abcMIDI-2007-01-06.zip +Source0: http://ifdo.pugmarks.com/~seymour/runabc/abcMIDI-2008-09-24.zip BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) %description @@ -22,7 +22,9 @@ which is a part of the abcm2ps. %prep %setup -q -n abcmidi # correct end-of-line encoding -sed -i 's/\r//' doc/*.txt demo.abc doc/AUTHORS VERSION +sed -i 's/\r//' doc/*.txt *.abc doc/AUTHORS VERSION +# remove executable flag from text files +chmod 0644 *.abc VERSION doc/*.txt doc/AUTHORS doc/CHANGES %build @@ -55,12 +57,15 @@ rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root,-) -%doc demo.abc VERSION doc/*.txt doc/AUTHORS doc/CHANGES +%doc *.abc VERSION doc/*.txt doc/AUTHORS doc/CHANGES %{_mandir}/man*/* %{_bindir}/* %changelog +* Wed Sep 24 2008 Gerard Milmeister - 20080924-1 +- new release 2008-09-24 + * Tue Jan 9 2007 Gerard Milmeister - 20070106-1 - new version 20070106 diff --git a/abcmidi-snprintf.patch b/abcmidi-snprintf.patch deleted file mode 100644 index bcf37aa..0000000 --- a/abcmidi-snprintf.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- abcmidi/store.c.snprintf 2006-03-07 21:34:00.000000000 +0100 -+++ abcmidi/store.c 2006-03-07 21:34:10.000000000 +0100 -@@ -73,7 +73,6 @@ - extern char* strchr(); - extern void reduce(); - #endif --int snprintf(char *str, size_t size, const char *format, ...); - - - #define MAXLINE 500 diff --git a/abcmidi-sprintf.patch b/abcmidi-sprintf.patch deleted file mode 100644 index 7bd1345..0000000 --- a/abcmidi-sprintf.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- abcmidi/store.c.sprintf 2006-06-10 14:00:57.000000000 +0200 -+++ abcmidi/store.c 2006-06-10 14:01:34.000000000 +0200 -@@ -1222,7 +1222,7 @@ - - if(strcmp(command,"gracedivider") == 0) { - int b; -- char msg[40]; -+ char msg[200]; - skipspace(&p); - b = -1; - b = readnump(&p); diff --git a/sources b/sources index d5dba47..c610e7a 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -be1d03c642ae5a6d99728e4108aa6ae6 abcMIDI-2007-01-06.zip +3aa16f97bfc3bf187dc6ce5ea6a60750 abcMIDI-2008-09-24.zip From c32413698581971c5b8beb81a7fd400d00a23b29 Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Thu, 26 Nov 2009 01:24:16 +0000 Subject: [PATCH 3/4] 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 4fc6be3..d89b7f1 100644 --- a/Makefile +++ b/Makefile @@ -4,7 +4,7 @@ NAME := abcMIDI 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 4641acbfd737e50b0ae55e0cb74ffe55dd973a48 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 28 Jul 2010 09:30:17 +0000 Subject: [PATCH 4/4] 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 d89b7f1..0000000 --- a/Makefile +++ /dev/null @@ -1,21 +0,0 @@ -# Makefile for source rpm: abcMIDI -# $Id$ -NAME := abcMIDI -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 e9e7ccd..0000000 --- a/branch +++ /dev/null @@ -1 +0,0 @@ -F-8