[allegro/f14/master] - Fix FTBFS (#631099)

Hans de Goede jwrdegoede at fedoraproject.org
Thu Sep 9 21:10:11 UTC 2010


commit 14a544741091cc729debaafb5df8fdd43d8c9010
Author: Hans de Goede <hdegoede at redhat.com>
Date:   Thu Sep 9 23:09:55 2010 +0200

    - Fix FTBFS (#631099)

 allegro-4.2.3-make.patch |   40 ++++++++++++++++++++++++++++++++++++++++
 allegro.spec             |    7 ++++++-
 2 files changed, 46 insertions(+), 1 deletions(-)
---
diff --git a/allegro-4.2.3-make.patch b/allegro-4.2.3-make.patch
new file mode 100644
index 0000000..5f6742d
--- /dev/null
+++ b/allegro-4.2.3-make.patch
@@ -0,0 +1,40 @@
+diff -up allegro-4.2.3/makefile.in~ allegro-4.2.3/makefile.in
+--- allegro-4.2.3/makefile.in~	2007-09-19 15:19:25.000000000 +0200
++++ allegro-4.2.3/makefile.in	2010-09-09 22:14:34.793000051 +0200
+@@ -406,7 +406,6 @@ examples: $(EXAMPLE_FILES)
+ 
+ # -------- rules for deleting the generated files --------
+ 
+-clean:
+ 
+    define RM_OBJ_CLEAN_FILES
+       $(foreach file, $(OBJ_CLEAN_FILES), rm -f $(file)
+@@ -418,25 +417,26 @@ clean:
+       )
+    endef
+ 
++clean:
+ 	$(RM_OBJ_CLEAN_FILES)
+ 	$(RM_OTHER_CLEAN_FILES)
+ 
+-distclean: clean
+ 
+    define RM_DISTCLEAN_FILES
+       $(foreach file, $(DISTCLEAN_FILES) $(ALLEGRO_LIB_X_EXES), rm -f $(file)
+       )
+    endef
+ 
++distclean: clean
+ 	$(RM_DISTCLEAN_FILES)
+ 
+-veryclean: distclean
+ 
+    define RM_VERYCLEAN_FILES
+       $(foreach file, $(VERYCLEAN_FILES), rm -f $(file)
+       )
+    endef
+ 
++veryclean: distclean
+ 	$(RM_VERYCLEAN_FILES)
+ 	rm -f makefile
+ 
diff --git a/allegro.spec b/allegro.spec
index 02a011f..ea631c5 100644
--- a/allegro.spec
+++ b/allegro.spec
@@ -1,6 +1,6 @@
 Name:           allegro
 Version:        4.2.3
-Release:        2%{?dist}
+Release:        3%{?dist}
 
 Summary:        A game programming library
 Summary(es):    Una libreria de programacion de juegos
@@ -19,6 +19,7 @@ Patch4:         allegro-4.2.0-multilib.patch
 Patch5:         allegro-4.2.1-noexecmod.patch
 Patch6:         allegro-4.0.3-libdir.patch
 Patch7:         allegro-4.2.2-fullscreen-viewport.patch
+Patch8:         allegro-4.2.3-make.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  esound-devel, texinfo, perl, arts-devel, glib2-devel
 BuildRequires:  xorg-x11-proto-devel, libX11-devel, libXext-devel, libXt-devel
@@ -162,6 +163,7 @@ sound through JACK (Jack Audio Connection Kit).
 %patch5 -p1 -z .noexecmod
 %patch6 -p1 -z .multilib2
 %patch7 -p1 -z .fs-viewport
+%patch8 -p1
 iconv -f iso-8859-1 -t utf-8 docs/src/allegro._tx > docs/src/allegro._tx.tmp
 mv docs/src/allegro._tx.tmp docs/src/allegro._tx
 
@@ -290,6 +292,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Thu Sep  9 2010 Hans de Goede <hdegoede at redhat.com> 4.2.3-3
+- Fix FTBFS (#631099)
+
 * Mon Jun 21 2010 Hans de Goede <hdegoede at redhat.com> 4.2.3-2
 - Fix multilib conflict in -devel (#603836)
 


More information about the scm-commits mailing list