From 1c4a1cd28565242e6cb3073030aa6e854d0e305a Mon Sep 17 00:00:00 2001
From: Hans de Goede <hdegoede@redhat.com>
Date: Sep 10 2010 07:29:22 +0000
Subject: - Fix FTBFS (#631146)


---

diff --git a/alleggl-0.4.3-make.patch b/alleggl-0.4.3-make.patch
new file mode 100644
index 0000000..9bbe8d8
--- /dev/null
+++ b/alleggl-0.4.3-make.patch
@@ -0,0 +1,99 @@
+diff -up alleggl/make/makefile.all~ alleggl/make/makefile.all
+--- alleggl/make/makefile.all~	2007-01-06 21:39:09.000000000 +0100
++++ alleggl/make/makefile.all	2010-09-10 09:14:33.192573997 +0200
+@@ -47,7 +47,6 @@ ifeq ($(DATA_INSTALLER),)
+   PROG_INSTALLER=cp
+ endif
+ 
+-install: $(LIB_PATH_U) $(HEADERS_U) $(EXT_HEADERS_U)
+ ifdef UNIX_TOOLS
+    define CP_INSTALL
+       $(foreach file, $(HEADERS_U), - $(DATA_INSTALLER) $(file) $(subst include,$(COMPILER_INCLUDE_DIR_U),$(file))
+@@ -59,6 +58,31 @@ ifdef UNIX_TOOLS
+       $(foreach link, $(LIB_LINKS_U), - ln -sf $(notdir $(LIB_PATH_U)) $(subst $(LIB_DIR),$(COMPILER_LIB_DIR_U),$(link))
+       )
+    endef
++   define RM_UNINSTALL
++      $(foreach link, $(LIB_LINKS_U), - rm -f $(subst $(LIB_DIR),$(COMPILER_LIB_DIR_U),$(link))
++      )
++      $(foreach file, $(HEADERS_U), - rm -f $(subst include,$(COMPILER_INCLUDE_DIR_U),$(file))
++      )
++      $(foreach file, $(EXT_HEADERS_U), - rm -f $(subst include,$(COMPILER_INCLUDE_DIR_U),$(file))
++      )
++   endef
++else
++   define CP_INSTALL
++      $(foreach file, $(HEADERS_D), - copy /y $(file) $(subst include,$(COMPILER_INCLUDE_DIR_D),$(file))
++      )
++      $(foreach file, $(EXT_HEADERS_D), - copy /y $(file) $(subst include,$(COMPILER_INCLUDE_DIR_D),$(file))
++      )
++   endef
++   define RM_UNINSTALL
++      $(foreach file, $(notdir $(HEADERS_D)), - del $(COMPILER_INCLUDE_DIR_D)\$(file)
++      )
++      $(foreach file, $(notdir $(EXT_HEADERS_D)), - del $(COMPILER_INCLUDE_DIR_D)\$(file)
++      )
++   endef
++endif
++
++install: $(LIB_PATH_U) $(HEADERS_U) $(EXT_HEADERS_U)
++ifdef UNIX_TOOLS
+       ifeq ($(wildcard $(COMPILER_INCLUDE_DIR_U)/allegrogl),)
+ 	mkdir -p $(COMPILER_INCLUDE_DIR_U)/allegrogl
+       endif
+@@ -73,12 +97,6 @@ ifdef UNIX_TOOLS
+ 	- $(INSTALL_LINK)
+ 	- $(LDCONFIG)
+ else
+-   define CP_INSTALL
+-      $(foreach file, $(HEADERS_D), - copy /y $(file) $(subst include,$(COMPILER_INCLUDE_DIR_D),$(file))
+-      )
+-      $(foreach file, $(EXT_HEADERS_D), - copy /y $(file) $(subst include,$(COMPILER_INCLUDE_DIR_D),$(file))
+-      )
+-   endef
+ 	- mkdir $(COMPILER_INCLUDE_DIR_D)\allegrogl
+ 	- mkdir $(COMPILER_INCLUDE_DIR_D)\allegrogl\GLext
+ 	- $(CP_INSTALL)
+@@ -89,25 +107,11 @@ endif
+ 
+ uninstall:
+ ifdef UNIX_TOOLS
+-   define RM_UNINSTALL
+-      $(foreach link, $(LIB_LINKS_U), - rm -f $(subst $(LIB_DIR),$(COMPILER_LIB_DIR_U),$(link))
+-      )
+-      $(foreach file, $(HEADERS_U), - rm -f $(subst include,$(COMPILER_INCLUDE_DIR_U),$(file))
+-      )
+-      $(foreach file, $(EXT_HEADERS_U), - rm -f $(subst include,$(COMPILER_INCLUDE_DIR_U),$(file))
+-      )
+-   endef
+ 	- rm -f $(COMPILER_LIB_DIR_U)/$(notdir $(LIB_PATH_U))
+ 	- $(RM_UNINSTALL)
+ 	- rm -rf $(COMPILER_INCLUDE_DIR_U)/allegrogl/GLext
+ 	- rm -rf $(COMPILER_INCLUDE_DIR_U)/allegrogl
+ else
+-   define RM_UNINSTALL
+-      $(foreach file, $(notdir $(HEADERS_D)), - del $(COMPILER_INCLUDE_DIR_D)\$(file)
+-      )
+-      $(foreach file, $(notdir $(EXT_HEADERS_D)), - del $(COMPILER_INCLUDE_DIR_D)\$(file)
+-      )
+-   endef
+ 	- $(RM_UNINSTALL)
+ 	- rmdir /s /q $(COMPILER_INCLUDE_DIR_D)\allegrogl
+ 	- del $(COMPILER_LIB_DIR_D)\$(notdir $(LIB_PATH_U))
+diff -up alleggl/make/makefile.unx~ alleggl/make/makefile.unx
+--- alleggl/make/makefile.unx~	2007-11-10 20:33:06.000000000 +0100
++++ alleggl/make/makefile.unx	2010-09-10 09:24:30.423574002 +0200
+@@ -149,11 +149,12 @@ distlist:
+ 
+ include make/makefile.dep
+ 
+-$(LIB_PATH_U): $(GENERAL_LIB_OBJS) $(PLATFORM_OBJECT)
+    define MAKE_LINKS
+ 	$(foreach link, $(LIB_LINKS_U), - ln -sf $(notdir $(LIB_PATH_U)) $(link)
+ 	)
+    endef
++
++$(LIB_PATH_U): $(GENERAL_LIB_OBJS) $(PLATFORM_OBJECT)
+ 	$(LIB_BUILDER) $@ $^
+ 	- $(MAKE_LINKS)
+ 
diff --git a/alleggl.spec b/alleggl.spec
index f7f5b5d..7a70336 100644
--- a/alleggl.spec
+++ b/alleggl.spec
@@ -1,6 +1,6 @@
 Name:           alleggl
 Version:        0.4.3
-Release:        6%{?dist}
+Release:        7%{?dist}
 Summary:        OpenGL support library for Allegro
 Group:          System Environment/Libraries
 License:        zlib
@@ -8,6 +8,7 @@ URL:            http://allegrogl.sourceforge.net/
 Source0:        http://downloads.sourceforge.net/allegrogl/%{name}-%{version}.tar.bz2
 Patch0:         alleggl-0.4.2-gcc43.patch
 Patch1:         alleggl-0.4.3-fullscreen-viewport.patch
+Patch2:         alleggl-0.4.3-make.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  allegro-devel libGLU-devel libX11-devel libXext-devel
 BuildRequires:  libXpm-devel libXxf86vm-devel
@@ -39,6 +40,7 @@ developing applications that use %{name}.
 %setup -q -n %{name}
 %patch0 -p1
 %patch1 -p1
+%patch2 -p1
 
 
 %build
@@ -89,6 +91,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Fri Sep 10 2010 Hans de Goede <hdegoede@redhat.com> 0.4.3-7
+- Fix FTBFS (#631146)
+
 * Thu Sep 10 2009 Hans de Goede <hdegoede@redhat.com> 0.4.3-6
 - Fix (workaround) viewport issues in fullscreen mode (#522116)