From ca7f0e0e5e97471860fb0f46e7f6186e2249fb95 Mon Sep 17 00:00:00 2001 From: Jesse Keating Date: Sun, 20 Apr 2008 12:04:39 +0000 Subject: [PATCH 1/4] Initialize branch F-9 for allegro --- branch | 1 + 1 file changed, 1 insertion(+) create mode 100644 branch diff --git a/branch b/branch new file mode 100644 index 0000000..1c26f78 --- /dev/null +++ b/branch @@ -0,0 +1 @@ +F-9 From c12a6c2dd34fd319c5f5560a4ed3c9a6a0cdec95 Mon Sep 17 00:00:00 2001 From: Hans de Goede Date: Mon, 5 May 2008 16:18:48 +0000 Subject: [PATCH 2/4] - Look for /etc/timidity.cfg instead of /usr/share/timidity/timidity.cfg, as the latter is no longer available now that Fedora has switched from timidity++-patches to PersonalCopy-Lite-patches --- allegro-4.0.3-cfg.patch | 2 +- allegro.spec | 8 +++++++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/allegro-4.0.3-cfg.patch b/allegro-4.0.3-cfg.patch index e44aaaa..d3a2e10 100644 --- a/allegro-4.0.3-cfg.patch +++ b/allegro-4.0.3-cfg.patch @@ -5,7 +5,7 @@ # patch set for the DIGMID software wavetable driver -patches = -+patches = /usr/share/timidity/timidity.cfg ++patches = /etc/timidity.cfg diff --git a/allegro.spec b/allegro.spec index 5cc990a..2aa0418 100644 --- a/allegro.spec +++ b/allegro.spec @@ -1,6 +1,6 @@ Name: allegro Version: 4.2.2 -Release: 9%{?dist} +Release: 10%{?dist} Summary: A game programming library Summary(es): Una libreria de programacion de juegos @@ -59,6 +59,7 @@ Summary(fr): Une librairie de programmation de jeux Summary(it): Una libreria per la programmazione di videogiochi Summary(cs): Knihovna pro programování her Group: Development/Libraries +Provides: %{name}-static = %{version}-%{release} Requires: %{name} = %{version}-%{release}, xorg-x11-proto-devel Requires: libX11-devel, libXcursor-devel Requires(post): /sbin/install-info @@ -293,6 +294,11 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Mon May 5 2008 Hans de Goede 4.2.2-10 +- Look for /etc/timidity.cfg instead of /usr/share/timidity/timidity.cfg, + as the latter is no longer available now that Fedora has switched from + timidity++-patches to PersonalCopy-Lite-patches + * Tue Apr 1 2008 Hans de Goede 4.2.2-9 - Fix i386 asm code compilation with latest binutils - Remove -fomit-frame-pointer from the compile flags of the default build, so From f66f551094ae8ecb46bccfe7275d09e91265554f Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Thu, 26 Nov 2009 01:26:22 +0000 Subject: [PATCH 3/4] Fix typo that causes a failure to update the common directory. (releng #2781) --- Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 81f193b..70f7724 100644 --- a/Makefile +++ b/Makefile @@ -1,10 +1,10 @@ # Makefile for source rpm: allegro -# $Id: Makefile,v 1.1 2004/11/08 04:00:59 cvsextras Exp $ +# $Id: Makefile,v 1.2 2004/11/24 03:09:37 gafton Exp $ NAME := allegro 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 c4e224c2f447d27ed8902a4e2237148f8292db2b Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 28 Jul 2010 09:42:58 +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 70f7724..0000000 --- a/Makefile +++ /dev/null @@ -1,21 +0,0 @@ -# Makefile for source rpm: allegro -# $Id: Makefile,v 1.2 2004/11/24 03:09:37 gafton Exp $ -NAME := allegro -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 1c26f78..0000000 --- a/branch +++ /dev/null @@ -1 +0,0 @@ -F-9