From 2055cce020956211420fc0499d48766c56313559d6f3418bbccf4e32ca1802a7 Mon Sep 17 00:00:00 2001 From: Christoph Junghans Date: Wed, 19 Feb 2014 18:08:23 +0000 Subject: [PATCH] OBS-URL: https://build.opensuse.org/package/show/Education/dynamips?expand=0&rev=19 --- dynamips.spec | 35 +++++++++-------------------------- 1 file changed, 9 insertions(+), 26 deletions(-) diff --git a/dynamips.spec b/dynamips.spec index de057e2..18c27fe 100644 --- a/dynamips.spec +++ b/dynamips.spec @@ -1,7 +1,7 @@ # # spec file for package dynamips # -# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2013,2014 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -28,8 +28,9 @@ BuildRequires: dos2unix Url: http://www.gns3.net %ifarch x86_64 BuildRequires: glibc-devel-32bit +make_opts="DYNAMIPS_ARCH=amd64" %endif -Source: http://sourceforge.net/projects/gns-3/files/Dynamips/0.2.10/%{name}-%{version}-source.zip +Source: http://sourceforge.net/projects/gns-3/files/Dynamips/%{version}/%{name}-%{version}-source.zip Summary: Cisco router Emulator License: GPL-2.0+ Group: System/Emulators/Other @@ -47,35 +48,17 @@ or people wanting to pass their CCNA/CCNP/CCIE exams. %setup -q -n %{name}-%{version}-source %build -CFLAGS="%{optflags} -I/usr/include/libelf -fno-strict-aliasing" -CXXFLAGS="%{optflags} -I/usr/include/libelf -fno-strict-aliasing" -CFLAGS="$CFLAGS -fstack-protector" -CXXFLAGS="$CXXFLAGS -fstack-protector" -export CFLAGS -export CXXFLAGS - -%ifarch x86_64 -%{__make} DYNAMIPS_ARCH=amd64 -%else -%{__make} -%endif +export CFLAGS="%{optflags} -I/usr/include/libelf -fno-strict-aliasing -fstack-protector" +export CXXFLAGS="$CXXFLAGS" +%{__make} $make_opts %install - -%ifarch x86_64 -%{__make} DYNAMIPS_ARCH=amd64 install DESTDIR=%{buildroot} mandir=%{_mandir} bindir=%{_bindir} prefix=/usr -%else -%{__make} install DESTDIR=%{buildroot} mandir=%{_mandir} bindir=%{_bindir} -%endif - -dos2unix COPYING README README.hypervisor TODO - -%clean -%{__rm} -rf %{buildroot} +%{__make} install DESTDIR=%{buildroot} mandir=%{_mandir} bindir=%{_bindir} prefix=/usr $make_opts +dos2unix COPYING README README.hypervisor TODO %files %defattr(-,root,root) -%doc COPYING README README.hypervisor TODO +%doc COPYING README README.hypervisor TODO %{_bindir}/dynamips %{_bindir}/nvram_export %{_mandir}/man*/*