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 81f193b..0000000 --- a/Makefile +++ /dev/null @@ -1,21 +0,0 @@ -# Makefile for source rpm: allegro -# $Id: Makefile,v 1.1 2004/11/08 04:00:59 cvsextras 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 -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/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