- fix building on x32

[packages/dynamips.git] / dynamips.spec

diff --git a/dynamips.spec b/dynamips.spec
index 285472788c9036a2aa429b8fb4345e3ddf673526..5b826f8b7cd930e2196550653a0ce4aea13b9ef1 100644 (file)
--- a/dynamips.spec
+++ b/dynamips.spec
@@ -1,12 +1,17 @@
+%define                subver  RC2
+%define                rel     4
 Summary:       Cisco 7200 Simulator
-Summary(pl.UTF-8):   Symulator Cisco 7200
+Summary(pl.UTF-8):     Symulator Cisco 7200
 Name:          dynamips
-Version:       0.2.4
-Release:       0.1
+Version:       0.2.8
+Release:       0.%{subver}.%{rel}
 License:       GPL
 Group:         Applications/Emulators
-Source0:       http://www.ipflow.utc.fr/dynamips/%{name}-%{version}.tar.gz
-# Source0-md5: 7b5ba42bbb466cb057bba1bc855476a9
+Source0:       http://www.ipflow.utc.fr/dynamips/%{name}-%{version}-%{subver}.tar.gz
+# Source0-md5: 8d12d28684d164fe3312a3fe43c84d2e
+Patch0:                %{name}-Makefile.patch
+Patch1:                %{name}-debian.patch
+Patch2:                x32.patch
 URL:           http://www.ipflow.utc.fr/index.php/Cisco_7200_Simulator
 BuildRequires: elfutils-devel
 BuildRequires: flex
@@ -20,13 +25,18 @@ Cisco 7200 Simulator.
 Symulator Cisco 7200.
 
 %prep
-%setup -q
+%setup -q -n %{name}-%{version}-%{subver}
+%patch0 -p1
+%patch1 -p1
+%ifarch x32
+%patch2 -p1
+%endif
 
 %build
 %ifarch %{x8664}
 ARCH=amd64
 %else
-%ifarch %{ix86}
+%ifarch %{ix86} x32
 ARCH=x86
 %else
 ARCH=nojit
@@ -36,18 +46,21 @@ ARCH=nojit
 %{__make} \
        DYNAMIPS_ARCH=$ARCH \
        CC="%{__cc}" \
+       RPM_CFLAGS="%{rpmcflags}" \
        LD="%{__ld}"
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT{%{_bindir},%{_desktopdir}}
-
-install dynamips $RPM_BUILD_ROOT%{_bindir}
+%{__make} install \
+       DESTDIR=$RPM_BUILD_ROOT \
+       PREFIX="%{_prefix}"
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(644,root,root,755)
-%doc README ChangeLog TODO
-%attr(755,root,root) %{_bindir}/%{name}
+%doc README README.hypervisor ChangeLog TODO
+%attr(755,root,root) %{_bindir}/*
+%{_mandir}/man1/*.1*
+%{_mandir}/man7/*.7*