Compare commits

...
Sign in to create a new pull request.

1 commit

Author SHA1 Message Date
Hans de Goede
14a5447410 - Fix FTBFS (#631099) 2010-09-09 23:09:55 +02:00
2 changed files with 46 additions and 1 deletions

40
allegro-4.2.3-make.patch Normal file
View file

@ -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

View file

@ -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@redhat.com> 4.2.3-3
- Fix FTBFS (#631099)
* Mon Jun 21 2010 Hans de Goede <hdegoede@redhat.com> 4.2.3-2
- Fix multilib conflict in -devel (#603836)