Hello community, here is the log from the commit of package dynamips for openSUSE:Factory checked in at Wed Jun 1 11:52:42 CEST 2011.
-------- New Changes file: --- /dev/null 2010-08-26 16:28:41.000000000 +0200 +++ /mounts/work_src_done/STABLE/dynamips/dynamips.changes 2011-04-11 16:59:46.000000000 +0200 @@ -0,0 +1,10 @@ +------------------------------------------------------------------- +Mon Apr 11 14:57:14 UTC 2011 - and...@opensuse.org + +- update to version 0.2.8 RC3 from gns3 community project + +------------------------------------------------------------------- +Fri Jun 20 21:22:47 CEST 2008 - crrodrig...@suse.de + +- update to version 0.2.8 RC2 per user requests + calling whatdependson for head-i586 New: ---- dynamips-0.2.8-RC3-make.patch dynamips-0.2.8-RC3.tar.bz2 dynamips.changes dynamips.spec ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ dynamips.spec ++++++ # # spec file for package dynamips # # Copyright (c) 2011 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 # upon. The license for this file, and modifications and additions to the # file, is the same license as for the pristine package itself (unless the # license for the pristine package is not an Open Source License, in which # case the license is the MIT License). An "Open Source License" is a # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. # Please submit bugfixes or comments via http://bugs.opensuse.org/ # # norootforbuild %define pkg_extraver RC3 Name: dynamips Version: 0.2.8%{pkg_extraver} Release: 1 License: GPL BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: libelf-devel libpcap-devel libuuid-devel Url: http://www.gns3.net %ifarch x86_64 BuildRequires: glibc-devel-32bit %endif Source: %{name}-0.2.8-%{pkg_extraver}.tar.bz2 Group: System/Emulators/Other Summary: Cisco router Emulator Patch0: dynamips-0.2.8-%{pkg_extraver}-make.patch %description Cisco Router Emulator supported by GNS3 Community Dynamips emulates Cisco 7200/3600/3725/3745/2691 Routers on a traditional PC. You can use dynamips to create labs. It uses IOS Images (which are not part of this package). Of course, this emulator cannot replace a real router. It is simply a complementary tool to real labs for administrators of Cisco networks or people wanting to pass their CCNA/CCNP/CCIE exams. %prep %setup -q -n %{name}-0.2.8-%{pkg_extraver} %patch0 -p1 %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 %install %ifarch x86_64 %{__make} DYNAMIPS_ARCH=amd64 install DESTDIR=%{buildroot} mandir=%{_mandir} bindir=%{_bindir} %else %{__make} install DESTDIR=%{buildroot} mandir=%{_mandir} bindir=%{_bindir} %endif chmod -x README.community %clean %{__rm} -rf %{buildroot} %files %defattr(-,root,root) %doc README.community COPYING README README.hypervisor TODO %{_bindir}/dynamips %{_bindir}/nvram_export %{_mandir}/man*/*.gz %changelog ++++++ dynamips-0.2.8-RC3-make.patch ++++++ diff -uNr old-dynamips-0.2.8-RC3//Makefile dynamips-0.2.8-RC3/Makefile --- old-dynamips-0.2.8-RC3//Makefile 2011-03-30 15:01:30.000000000 +0200 +++ dynamips-0.2.8-RC3/Makefile 2011-04-11 16:33:07.451266220 +0200 @@ -7,9 +7,13 @@ # - Use "nojit" for unsupported architectures. export DYNAMIPS_ARCH?=x86 -# Do you want to use lib (for 32 bit compiling) or lib64 -export DYNAMIPS_LIB?=lib -#export DYNAMIPS_LIB?=lib64 +ifeq ($(DYNAMIPS_ARCH), amd64) +DYNAMIPS_LIB?=lib64 +LIBDIR?=/usr/lib64 +else +DYNAMIPS_LIB?=lib +LIBDIR?=/usr/lib +endif # For MAC x64 you can compile the "unstable" version, which should work # fine, or use stable if you prefer. @@ -33,8 +37,6 @@ export VERSION_SUB=-RC3 # Executable binary extension -export DESTDIR?=/usr -export BIN_EXT?= .PHONY: all dynamips.stable dynamips.unstable @@ -50,13 +52,13 @@ install: dynamips.$(DYNAMIPS_CODE) @echo "Installing" - install -d $(DESTDIR)/bin $(DESTDIR)/man/man1 $(DESTDIR)/man/man7 $(DESTDIR)/etc + install -d $(DESTDIR)/usr/bin $(DESTDIR)/usr/share/man/man1 $(DESTDIR)/usr/share/man/man7 $(DESTDIR)/etc cp dynamips.$(DYNAMIPS_CODE) dynamips - install dynamips $(DYNAMIPS_CODE)/nvram_export $(DESTDIR)/bin/ + install dynamips $(DYNAMIPS_CODE)/nvram_export $(DESTDIR)/usr/bin/ rm -f dynamips - install -m644 dynamips.1 $(DESTDIR)/man/man1 - install -m644 nvram_export.1 $(DESTDIR)/man/man1 - install -m644 hypervisor_mode.7 $(DESTDIR)/man/man7 + install -m644 dynamips.1 $(DESTDIR)/usr/share/man/man1 + install -m644 nvram_export.1 $(DESTDIR)/usr/share/man/man1 + install -m644 hypervisor_mode.7 $(DESTDIR)/usr/share/man/man7 .PHONY: clean diff -uNr old-dynamips-0.2.8-RC3//stable/Makefile dynamips-0.2.8-RC3/stable/Makefile --- old-dynamips-0.2.8-RC3//stable/Makefile 2011-03-30 15:01:30.000000000 +0200 +++ dynamips-0.2.8-RC3/stable/Makefile 2011-04-11 16:33:05.115266219 +0200 @@ -10,9 +10,13 @@ DYNAMIPS_ARCH=x86 endif -# Do you want to use lib (for 32 bit compiling) or lib64 +ifeq ($(DYNAMIPS_ARCH), amd64) +DYNAMIPS_LIB?=lib64 +LIBDIR?=/usr/lib64 +else DYNAMIPS_LIB?=lib - +LIBDIR?=/usr/lib +endif # Get include files from the current directory and from the common directory INCLUDE+=-I. -I../common @@ -38,8 +42,6 @@ VPATH = ../common # Executable binary extension -DESTDIR?=/usr -BIN_EXT?= CC?=gcc LD=ld @@ -51,7 +53,7 @@ PPC32_ARCH_INC_FILE=\"ppc32_$(DYNAMIPS_ARCH)_trans.h\" OSNAME=unknown -CFLAGS+= $(INCLUDE) -Wall -O3 -fomit-frame-pointer \ +CFLAGS+= $(INCLUDE) -Wall -fomit-frame-pointer \ -DJIT_ARCH=\"$(DYNAMIPS_ARCH)\" -DJIT_CPU=CPU_$(DYNAMIPS_ARCH) \ -DMIPS64_ARCH_INC_FILE=$(MIPS64_ARCH_INC_FILE) \ -DPPC32_ARCH_INC_FILE=$(PPC32_ARCH_INC_FILE) \ @@ -73,11 +75,11 @@ else ifeq ($(shell uname), Linux) PTHREAD_LIBS?=-lpthread -# PCAP_LIB=-lpcap + PCAP_LIB=-lpcap OSNAME=Linux CFLAGS+=-I/usr/include -I. $(PTHREAD_CFLAGS) - LIBS=-L/usr/lib -L. -ldl -luuid /usr/$(DYNAMIPS_LIB)/libelf.a $(PTHREAD_LIBS) - DESTDIR=/usr + LIBS=-L/$(LIBDIR) -L. -ldl -luuid -lelf $(PTHREAD_LIBS) +# DESTDIR=/usr else ifeq ($(shell uname -s), Darwin) OSNAME=Darwin @@ -103,7 +105,7 @@ PCAP_LIB=-lpacket -lwpcap else CFLAGS+=-I/usr/include/libelf -D_FILE_OFFSET_BITS=64 - LIBS=-L. -ldl /usr/lib/libelf.a -lpthread + LIBS=-L. -ldl $(LIBDIR)/libelf.a -lpthread endif endif endif @@ -247,29 +249,29 @@ $(PROG): mips64_microcode_dump.inc ppc32_microcode_dump.inc \ $(LEX_C) $(C_OBJS) $(A_OBJS) @echo "Linking $@" - @$(CC) $(CFLAGS) -o $@ $(C_OBJS) $(A_OBJS) $(LIBS) + $(CC) $(CFLAGS) -o $@ $(C_OBJS) $(A_OBJS) $(LIBS) udp_send$(BIN_EXT): udp_send.c net.c crc.c @echo "Linking $@" - @$(CC) -Wall $(CFLAGS) -o $@ udp_send.c net.c crc.c $(LIBS) + $(CC) -Wall $(CFLAGS) -o $@ udp_send.c net.c crc.c $(LIBS) udp_recv$(BIN_EXT): udp_recv.c net.c crc.c @echo "Linking $@" - @$(CC) -Wall $(CFLAGS) -o $@ udp_recv.c net.c crc.c $(LIBS) + $(CC) -Wall $(CFLAGS) -o $@ udp_recv.c net.c crc.c $(LIBS) rom2c$(BIN_EXT): rom2c.c @echo "Linking $@" - @$(CC) -Wall $(CFLAGS) -o $@ $< $(LIBS) + $(CC) -Wall $(CFLAGS) -o $@ $< $(LIBS) mips64_microcode_dump.inc: rom2c$(BIN_EXT) mips64_microcode - @./rom2c mips64_microcode mips64_microcode_dump.inc 0xbfc00000 + ./rom2c mips64_microcode mips64_microcode_dump.inc 0xbfc00000 ppc32_microcode_dump.inc: rom2c$(BIN_EXT) ppc32_microcode - @./rom2c ppc32_microcode ppc32_microcode_dump.inc 0xfff00000 + ./rom2c ppc32_microcode ppc32_microcode_dump.inc 0xfff00000 asmdefs$(BIN_EXT): asmdefs.c mips64.h @echo "Linking $@" - @$(CC) -Wall $(CFLAGS) -o $@ asmdefs.c + $(CC) -Wall $(CFLAGS) -o $@ asmdefs.c asmdefs.h: asmdefs$(BIN_EXT) @echo "Building assembly definitions header file" @@ -281,11 +283,11 @@ install: $(PROG) nvram_export @echo "Installing" - install -d $(DESTDIR)/bin $(DESTDIR)/man/man1 $(DESTDIR)/man/man7 $(DESTDIR)/etc - install dynamips nvram_export $(DESTDIR)/bin - install -m644 dynamips.1 $(DESTDIR)/man/man1 - install -m644 nvram_export.1 $(DESTDIR)/man/man1 - install -m644 hypervisor_mode.7 $(DESTDIR)/man/man7 + install -d $(DESTDIR)/usr/bin $(DESTDIR)/usr/share/man/man1 $(DESTDIR)/usr/shareman/man7 $(DESTDIR)/etc + install dynamips nvram_export $(DESTDIR)/usr/bin + install -m644 dynamips.1 $(DESTDIR)/usr/share/man/man1 + install -m644 nvram_export.1 $(DESTDIR)/usr/share/man/man1 + install -m644 hypervisor_mode.7 $(DESTDIR)/usr/share/man/man7 # install -m644 example $(DESTDIR)/etc/dynamips @@ -312,11 +314,11 @@ .S.o: @echo "Assembling $<" - @$(CC) $(CFLAGS) $(INCLUDE) -c -o $*.o $< + $(CC) $(CFLAGS) $(INCLUDE) -c -o $*.o $< .c.o: @echo "Compiling $<" - @$(CC) $(CFLAGS) $(INCLUDE) -c -o $*.o $< + $(CC) $(CFLAGS) $(INCLUDE) -c -o $*.o $< .l.c: $(LEX) -o$*.c $< ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org
