[allegro] Fix building in a patch which contains /build/ (such as the builddir on the builders)
Hans de Goede
jwrdegoede at fedoraproject.org
Wed Jul 13 08:49:42 UTC 2011
commit 5e108a5346f2d8984c34a9f146cf733bd3da4977
Author: Hans de Goede <hdegoede at redhat.com>
Date: Wed Jul 13 10:49:52 2011 +0200
Fix building in a patch which contains /build/ (such as the builddir on the builders)
allegro-4.4.2-buildsys-fix.patch | 12 ++++++++++++
allegro.spec | 2 ++
2 files changed, 14 insertions(+), 0 deletions(-)
---
diff --git a/allegro-4.4.2-buildsys-fix.patch b/allegro-4.4.2-buildsys-fix.patch
new file mode 100644
index 0000000..68d00dd
--- /dev/null
+++ b/allegro-4.4.2-buildsys-fix.patch
@@ -0,0 +1,12 @@
+diff -up allegro-4.4.2/docs/CMakeLists.txt~ allegro-4.4.2/docs/CMakeLists.txt
+--- allegro-4.4.2/docs/CMakeLists.txt~ 2011-07-13 10:40:58.000000000 +0200
++++ allegro-4.4.2/docs/CMakeLists.txt 2011-07-13 10:47:19.561523944 +0200
+@@ -72,7 +72,7 @@ foreach(page ${DOC_SRCS})
+ string(REPLACE "._tx" "" basename ${basename})
+
+ set(page ${CMAKE_CURRENT_SOURCE_DIR}/${page})
+- if(${page} MATCHES "/build/")
++ if(${page} MATCHES "src/build/")
+ set(txt_out ${CMAKE_CURRENT_BINARY_DIR}/build/${basename}.txt)
+ set(html_out ${CMAKE_CURRENT_BINARY_DIR}/build/${basename}.html)
+ else()
diff --git a/allegro.spec b/allegro.spec
index 6377850..078774e 100644
--- a/allegro.spec
+++ b/allegro.spec
@@ -17,6 +17,7 @@ Patch2: allegro-4.0.3-libdir.patch
Patch3: allegro-4.2.3-pack-formatstring.patch
Patch4: allegro-4.4.2-dynamic-addons.patch
Patch5: allegro-4.4.2-doc-install.patch
+Patch6: allegro-4.4.2-buildsys-fix.patch
BuildRequires: texinfo cmake
BuildRequires: xorg-x11-proto-devel libX11-devel libXpm-devel libXcursor-devel
BuildRequires: libXxf86vm-devel libXxf86dga-devel libGL-devel libGLU-devel
@@ -232,6 +233,7 @@ developing applications that use logg.
%patch3 -p1
%patch4 -p1
%patch5 -p1
+%patch6 -p1
%build
More information about the scm-commits
mailing list