freeciv.spec - poprawka dla amd64

[Paweł Zaskórski]

Witam,

próbowałem zbudować sobie Freeciv 2.0.1 z CVSu. Proces kończy się jednak
następującym błędem:

+ CC=amd64-pld-linux-gcc
+ export CC
+ CXX=amd64-pld-linux-g++
+ export CXX
+ ./configure --host=amd64-pld-linux --prefix=/usr --exec-prefix=/usr
--bindir=/usr/bin --sbindir=/usr/sbin --sysconfdir=/etc
--datadir=/usr/share --includedir=/usr/include --libdir=/usr/lib64
--libexecdir=/usr/lib64 --localstatedir=/var --sharedstatedir=/var/lib
--mandir=/usr/share/man --infodir=/usr/share/info
--x-libraries=/usr/X11R6/lib64 --enable-client=gtk2
configure: WARNING: If you wanted to set the --build type, don't use --host.
    If a cross compiler is detected then cross compile mode will be used.
checking build system type... x86_64-unknown-linux-gnu
checking host system type... Invalid configuration `amd64-pld-linux':
machine `amd64-pld' not recognized
configure: error: /bin/sh bootstrap/config.sub amd64-pld-linux failed
błąd: Błędny status wyjścia z /var/tmp/rpm-tmp.28499 (%build)

W załączniku przesyłam patch, dzięki któremu pakiet buduje się i działa
na AMD64.

Pozdrawiam
-- 
Paweł M. Zaskórski
jid: pmz at jabberpl.org
-------------- next part --------------
--- freeciv-2.0.1/bootstrap/config.sub	2004-09-21 02:58:58.000000000 +0200
+++ freeciv-2.0.1.mod/bootstrap/config.sub	2005-05-22 19:51:01.276280704 +0200
@@ -720,6 +720,9 @@
 	pentiumii-* | pentium2-*)
 		basic_machine=i686-`echo $basic_machine | sed 's/^[^-]*-//'`
 		;;
+	amd64-*)
+		basic_machine=x86_64-pc
+		;;
 	pn)
 		basic_machine=pn-gould
 		;;
-------------- next part --------------
Index: freeciv.spec
===================================================================
RCS file: /cvsroot/SPECS/freeciv.spec,v
retrieving revision 1.81
diff -u -r1.81 freeciv.spec
--- freeciv.spec	16 May 2005 06:57:43 -0000	1.81
+++ freeciv.spec	22 May 2005 18:03:57 -0000
@@ -9,7 +9,7 @@
 Summary(pt_BR):	Clone do jogo Civilization
 Name:		freeciv
 Version:	2.0.1
-Release:	1
+Release:	2
 License:	GPL
 Group:		X11/Applications/Games/Strategy
 Source0:	ftp://ftp.freeciv.org/freeciv/stable/%{name}-%{version}.tar.bz2
@@ -17,6 +17,7 @@
 Source1:	%{name}-client.desktop
 Source2:	%{name}-server.desktop
 Source3:	%{name}.png
+Patch0:	%{name}-config.sub_amd64.patch
 URL:		http://www.freeciv.org/
 BuildRequires:	SDL_mixer-devel
 BuildRequires:	automake
@@ -78,6 +79,7 @@
 
 %prep
 %setup -q 
+%patch0 -p1
 
 %build
 cp -f %{_datadir}/automake/config.sub .