Accepting request 223124 from Education

OBS-URL: https://build.opensuse.org/request/show/223124
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/dynamips?expand=0&rev=12

dynamips.changes

@@ -1,3 +1,25 @@
+-------------------------------------------------------------------
+Wed Feb 19 18:08:40 UTC 2014 - junghans@votca.org
+
+- clean up spec file
+
+-------------------------------------------------------------------
+Mon Feb 17 19:46:00 UTC 2014 - andrea@opensuse.org
+
+- new upstream version 0.2.11
+  * Full update of hypervisor documentation.
+  * Change default NPE for c7200 platform from npe-200 to npe-400.
+  * New hypervisor commands
+  * Fixed issue #20 - segmentation fault when accessing a device
+    that failed to memory map it's file
+  * Implemented enhancement #21 - Renaming devices
+  * Closed issue #22 - Hypervisor documentation is out of date
+  * Implemented enhancement #36 - hypervisor command to clean
+    the files of a vm
+  * Fixed issue #27 - Rename issues.
+  * Old text is replayed when you connect to the console/aux port.
+  * Warn the VM isn't running when connecting to the console/aux port.
+
 -------------------------------------------------------------------
 Sat Nov 16 11:37:26 UTC 2013 - andrea@opensuse.org
 

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
@@ -17,19 +17,26 @@
 
 
 Name:           dynamips
-Version:        0.2.10
+Version:        0.2.11
 Release:        0
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
+%if %{defined fedora}
+BuildRequires:  elfutils-libelf-devel
+%else
 BuildRequires:  libelf-devel
+%endif
 BuildRequires:  libpcap-devel
 BuildRequires:  libuuid-devel
 BuildRequires:  unzip
 BuildRequires:  dos2unix
 Url:            http://www.gns3.net
 %ifarch x86_64
+%if %{undefined fedora}
 BuildRequires:  glibc-devel-32bit
+BuildRequires:  glibc-32bit
 %endif
-Source:         http://sourceforge.net/projects/gns-3/files/Dynamips/0.2.10/%{name}-%{version}-source.zip
+%endif
+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,34 +54,20 @@ 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}
+make_opts="DYNAMIPS_ARCH=amd64"
 %endif
+export CFLAGS="%{optflags} -I/usr/include/libelf -fno-strict-aliasing -fstack-protector"
+export CXXFLAGS="$CFLAGS"
+%{__make} $make_opts
 
 %install
-
-%ifarch x86_64
-%{__make} DYNAMIPS_ARCH=amd64  install DESTDIR=%{buildroot}/usr mandir=%{_mandir} bindir=%{_bindir} prefix=/usr
-%else
-%{__make}  install DESTDIR=%{buildroot}/usr 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*/*

dynamips-0.2.10-source.zip

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:d62f739547134aeb0ee5a6b28a52772ae79a93cb6426b712cbddc72cb0b7ba44
-size 966018

dynamips-0.2.11-source.zip

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:4278baecf1f6718433722e6f38179a69ec9b2ef02381b31c5d3ef5b8f8f3e94a
+size 967525