- lib64.patch

- release 5

Changed files:
    adonthell.spec -> 1.21

diff --git a/adonthell.spec b/adonthell.spec
index 9ef48027d700a11fd5a2380cf4fb66fee556792e..b5425f3ff9f987e6a40b3cc2d5cc7ba535b8f19d 100644 (file)
--- a/adonthell.spec
+++ b/adonthell.spec
@@ -2,19 +2,26 @@ Summary:      A 2D graphical RPG game
 Summary(pl):   Darmowa gra RPG z graficznym interfejsem
 Name:          adonthell
 Version:       0.3.3
 Summary(pl):   Darmowa gra RPG z graficznym interfejsem
 Name:          adonthell
 Version:       0.3.3

-Release:       4
+Release:       5

 License:       GPL
 Group:         X11/Applications/Games
 Source0:       http://savannah.nongnu.org/download/adonthell/src/%{name}-%{version}.tar.gz
 # Source0-md5: 8ed4a8b02ea24fd393b67bca355cc70b
 Patch0:                %{name}-etc_dir.patch
 License:       GPL
 Group:         X11/Applications/Games
 Source0:       http://savannah.nongnu.org/download/adonthell/src/%{name}-%{version}.tar.gz
 # Source0-md5: 8ed4a8b02ea24fd393b67bca355cc70b
 Patch0:                %{name}-etc_dir.patch

+Patch1:                %{name}-lib64.patch

 URL:           http://adonthell.linuxgames.com/
 BuildRequires: SDL-devel >= 1.2.0
 URL:           http://adonthell.linuxgames.com/
 BuildRequires: SDL-devel >= 1.2.0

+BuildRequires: autoconf

 BuildRequires: automake
 BuildRequires: automake

+BuildRequires: gettext-devel
+BuildRequires: gtk+-devel
+BuildRequires: intltool
+BuildRequires: libtool

 BuildRequires: libvorbis-devel
 BuildRequires: python
 BuildRequires: python-devel
 BuildRequires: python-modules
 BuildRequires: libvorbis-devel
 BuildRequires: python
 BuildRequires: python-devel
 BuildRequires: python-modules

+BuildRequires: sed >= 4.0

 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %define                _gamedatadir    %{_datadir}/%{name}
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %define                _gamedatadir    %{_datadir}/%{name}


@@ -34,11 +41,21 @@ gry jest dost
 %prep
 %setup -q
 %patch0 -p1
 %prep
 %setup -q
 %patch0 -p1

+%if "%{_lib}" == "lib64"
+%patch1 -p1
+%endif
+:> acinclude.m4
+# ugly workaround for a buggy libtool
+sed -i 's/-Wl,-E/-Wl,-Xlinker,-E/' configure.in

 
 %build
 
 %build

-cp -f /usr/share/automake/config.sub .
-
-%configure2_13 \
+%{__gettextize}
+%{__libtoolize}
+intltoolize --copy --force
+%{__aclocal}
+%{__autoconf}
+%{__automake}
+%configure \

        --disable-py-debug
 
 %{__make}
        --disable-py-debug
 
 %{__make}