[clanbomber] - Fix FTBFS (#631342)

Hans de Goede jwrdegoede at fedoraproject.org
Fri Sep 10 07:40:59 UTC 2010


commit 95d8e9901ded27cccd666f8171dcaf433e14ffd6
Author: Hans de Goede <hdegoede at redhat.com>
Date:   Fri Sep 10 09:40:46 2010 +0200

    - Fix FTBFS (#631342)

 clanbomber-1.05-make.patch |   60 ++++++++++++++++++++++++++++++++++++++++++++
 clanbomber.spec            |    7 ++++-
 2 files changed, 66 insertions(+), 1 deletions(-)
---
diff --git a/clanbomber-1.05-make.patch b/clanbomber-1.05-make.patch
new file mode 100644
index 0000000..96fd53c
--- /dev/null
+++ b/clanbomber-1.05-make.patch
@@ -0,0 +1,60 @@
+diff -up clanbomber-1.05/clanbomber/Makefile.in~ clanbomber-1.05/clanbomber/Makefile.in
+--- clanbomber-1.05/clanbomber/Makefile.in~	2010-09-10 09:33:27.000000000 +0200
++++ clanbomber-1.05/clanbomber/Makefile.in	2010-09-10 09:34:54.085574002 +0200
+@@ -614,7 +614,7 @@ distclean-local:
+ .PHONY: files
+ 
+ files:
+-        @for subdir in $(SUBDIRS); do \
++	@for subdir in $(SUBDIRS); do \
+ 	  files=d $$subdir; $(MAKE) files | grep -v "make\[[1-9]\]"; \
+           for file in $$files; do \
+             echo $$subdir/$$file; \
+diff -up clanbomber-1.05/clanbomber/maps/Makefile.in~ clanbomber-1.05/clanbomber/maps/Makefile.in
+--- clanbomber-1.05/clanbomber/maps/Makefile.in~	2010-09-10 09:36:15.000000000 +0200
++++ clanbomber-1.05/clanbomber/maps/Makefile.in	2010-09-10 09:38:15.861573996 +0200
+@@ -355,7 +355,7 @@ uninstall-local:
+ .PHONY: files
+ 
+ files:
+-        @for subdir in $(SUBDIRS); do \
++	@for subdir in $(SUBDIRS); do \
+ 	  files=d $$subdir; $(MAKE) files | grep -v "make\[[1-9]\]"; \
+           for file in $$files; do \
+             echo $$subdir/$$file; \
+diff -up clanbomber-1.05/clanbomber/music/Makefile.in~ clanbomber-1.05/clanbomber/music/Makefile.in
+--- clanbomber-1.05/clanbomber/music/Makefile.in~	2010-09-10 09:36:15.000000000 +0200
++++ clanbomber-1.05/clanbomber/music/Makefile.in	2010-09-10 09:37:19.786573998 +0200
+@@ -259,7 +259,7 @@ uninstall-local:
+ .PHONY: files
+ 
+ files:
+-        @for subdir in $(SUBDIRS); do \
++	@for subdir in $(SUBDIRS); do \
+ 	  files=d $$subdir; $(MAKE) files | grep -v "make\[[1-9]\]"; \
+           for file in $$files; do \
+             echo $$subdir/$$file; \
+diff -up clanbomber-1.05/clanbomber/pics/Makefile.in~ clanbomber-1.05/clanbomber/pics/Makefile.in
+--- clanbomber-1.05/clanbomber/pics/Makefile.in~	2004-02-16 20:07:41.000000000 +0100
++++ clanbomber-1.05/clanbomber/pics/Makefile.in	2010-09-10 09:38:03.205573995 +0200
+@@ -252,7 +252,7 @@ uninstall-am: uninstall-info-am
+ .PHONY: files
+ 
+ files:
+-        @for subdir in $(SUBDIRS); do \
++	@for subdir in $(SUBDIRS); do \
+ 	  files=d $$subdir; $(MAKE) files | grep -v "make\[[1-9]\]"; \
+           for file in $$files; do \
+             echo $$subdir/$$file; \
+diff -up clanbomber-1.05/clanbomber/wavs/Makefile.in~ clanbomber-1.05/clanbomber/wavs/Makefile.in
+--- clanbomber-1.05/clanbomber/wavs/Makefile.in~	2004-02-16 20:07:42.000000000 +0100
++++ clanbomber-1.05/clanbomber/wavs/Makefile.in	2010-09-10 09:38:21.604574010 +0200
+@@ -252,7 +252,7 @@ uninstall-am: uninstall-info-am
+ .PHONY: files
+ 
+ files:
+-        @for subdir in $(SUBDIRS); do \
++	@for subdir in $(SUBDIRS); do \
+ 	  files=d $$subdir; $(MAKE) files | grep -v "make\[[1-9]\]"; \
+           for file in $$files; do \
+             echo $$subdir/$$file; \
diff --git a/clanbomber.spec b/clanbomber.spec
index 2c8a162..159fd8d 100644
--- a/clanbomber.spec
+++ b/clanbomber.spec
@@ -1,6 +1,6 @@
 Name:           clanbomber
 Version:        1.05
-Release:        12%{?dist}
+Release:        13%{?dist}
 Summary:        Lay bombs and Blast the other players of the field game using ClanLib
 Group:          Amusements/Games
 License:        GPLv2+
@@ -10,6 +10,7 @@ Source1:        clanbomber.desktop
 Source2:        clanbomber.png
 Patch0:         clanbomber-1.05-debian.patch
 Patch1:         clanbomber-1.05-namespace.patch
+Patch2:         clanbomber-1.05-make.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  ClanLib06-devel zlib-devel desktop-file-utils
 Requires:       hicolor-icon-theme
@@ -26,6 +27,7 @@ recommended to play ClanBomber with friends (3-8 players are really fun).
 %setup -q
 %patch0 -p1 -z .deb
 %patch1 -p1 -z .namespace
+%patch2 -p1
 
 
 %build
@@ -74,6 +76,9 @@ fi
 
 
 %changelog
+* Fri Sep 10 2010 Hans de Goede <hdegoede at redhat.com> 1.05-13
+- Fix FTBFS (#631342)
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.05-12
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


More information about the scm-commits mailing list