OpenPKG Specs / changeset

     1.1 --- a/netperf/netperf.patch	Tue Aug 28 18:37:20 2012 +0200
     1.2 +++ b/netperf/netperf.patch	Tue Aug 28 18:37:35 2012 +0200
     1.3 @@ -1,46 +1,31 @@
     1.4 -diff -Nau configure.orig configure
     1.5 -Index: configure
     1.6 ---- configure.orig	2011-03-21 09:30:50.934813866 +0100
     1.7 -+++ configure	2011-03-21 09:31:27.459048318 +0100
     1.8 -@@ -8748,6 +8748,7 @@
     1.9 - cat confdefs.h >>conftest.$ac_ext
    1.10 - cat >>conftest.$ac_ext <<_ACEOF
    1.11 - /* end confdefs.h.  */
    1.12 -+#include <sys/socket.h>
    1.13 - #include <netinet/sctp.h>
    1.14 +diff -Nau src/dscp.c.orig src/dscp.c
    1.15 +Index: src/dscp.c
    1.16 +--- src/dscp.c.orig	2012-08-21 12:14:56.541033514 +0200
    1.17 ++++ src/dscp.c	2012-08-21 12:15:00.668991007 +0200
    1.18 +@@ -50,6 +50,7 @@
    1.19 +  */
    1.20   
    1.21 - int
    1.22 -diff -Nau src/net_uuid.c.orig src/net_uuid.c
    1.23 -Index: src/net_uuid.c
    1.24 ---- src/net_uuid.c.orig	2008-10-25 01:13:44.000000000 +0200
    1.25 -+++ src/net_uuid.c	2011-03-21 14:23:16.000000000 +0100
    1.26 -@@ -38,8 +38,10 @@
    1.27 - #else
    1.28 - #include <sys/types.h>
    1.29 - #include <sys/time.h>
    1.30 -+#if !defined(__APPLE__) && !defined(__MACH__)
    1.31 - #include <sys/sysinfo.h>
    1.32 + #if HAVE_NETINET_IN_SYSTM_H
    1.33 ++#include <stdint.h>
    1.34 + #include <netinet/in_systm.h>
    1.35   #endif
    1.36 -+#endif
    1.37 - 
    1.38 - /* system dependent call to get the current system time. Returned as
    1.39 -    100ns ticks since UUID epoch, but resolution may be less than
    1.40 + #if HAVE_NETINET_IP_H
    1.41  diff -Nau src/nettest_bsd.c.orig src/nettest_bsd.c
    1.42  Index: src/nettest_bsd.c
    1.43 ---- src/nettest_bsd.c.orig	2011-03-21 09:20:13.471888999 +0100
    1.44 -+++ src/nettest_bsd.c	2011-03-21 09:20:16.343927098 +0100
    1.45 -@@ -97,6 +97,7 @@
    1.46 - #endif /* NOSTDLIBH */
    1.47 +--- src/nettest_bsd.c.orig	2012-06-19 22:32:47.000000000 +0200
    1.48 ++++ src/nettest_bsd.c	2012-08-21 12:15:36.378376195 +0200
    1.49 +@@ -106,6 +106,7 @@
    1.50 + #include <netinet/tcp.h>
    1.51   
    1.52 - #ifdef WANT_SCTP
    1.53 + #ifdef HAVE_NETINET_SCTP_H
    1.54  +#include <sys/socket.h>
    1.55   #include <netinet/sctp.h>
    1.56   #endif
    1.57   
    1.58  diff -Nau src/nettest_sctp.c.orig src/nettest_sctp.c
    1.59  Index: src/nettest_sctp.c
    1.60 ---- src/nettest_sctp.c.orig	2011-03-21 09:22:57.248890123 +0100
    1.61 -+++ src/nettest_sctp.c	2011-03-21 09:23:02.907197031 +0100
    1.62 +--- src/nettest_sctp.c.orig	2012-06-19 22:39:22.000000000 +0200
    1.63 ++++ src/nettest_sctp.c	2012-08-21 12:16:25.314029201 +0200
    1.64  @@ -58,6 +58,7 @@
    1.65   #include <netinet/sctp.h>
    1.66   #include <arpa/inet.h>

     2.1 --- a/netperf/netperf.spec	Tue Aug 28 18:37:20 2012 +0200
     2.2 +++ b/netperf/netperf.spec	Tue Aug 28 18:37:35 2012 +0200
     2.3 @@ -1,6 +1,6 @@
     2.4  ##
     2.5  ##  netperf.spec -- OpenPKG RPM Package Specification
     2.6 -##  Copyright (c) 2011 Michael Schloh von Bennewitz <michael@schloh.com>
     2.7 +##  Copyright (c) 2012 Michael Schloh von Bennewitz <michael@schloh.com>
     2.8  ##
     2.9  ##  Permission to use, copy, modify, and distribute this software for
    2.10  ##  any purpose with or without fee is hereby granted, provided that
    2.11 @@ -31,20 +31,16 @@
    2.12  Class:        EVAL
    2.13  Group:        Network
    2.14  License:      Commercial
    2.15 -Version:      2.4.5
    2.16 -Release:      20110302
    2.17 +Version:      2.6.0
    2.18 +Release:      20120800
    2.19  
    2.20  #   list of sources
    2.21  Source0:      ftp://ftp.netperf.org/netperf/netperf-%{version}.tar.bz2
    2.22  Patch0:       netperf.patch
    2.23  
    2.24  #   build information
    2.25 -Prefix:       %{l_prefix}
    2.26 -BuildRoot:    %{l_buildroot}
    2.27 -BuildPreReq:  OpenPKG, openpkg >= 20040130
    2.28 -PreReq:       OpenPKG, openpkg >= 20040130
    2.29 -AutoReq:      no
    2.30 -AutoReqProv:  no
    2.31 +BuildPreReq:  OpenPKG, openpkg >= 20100101, make
    2.32 +PreReq:       OpenPKG, openpkg >= 20100101
    2.33  
    2.34  %description
    2.35      Netperf is a benchmark that can be used to measure the performance
    2.36 @@ -78,7 +74,6 @@
    2.37      %{l_make} %{l_mflags -O}
    2.38  
    2.39  %install
    2.40 -    rm -rf $RPM_BUILD_ROOT
    2.41      %{l_make} %{l_mflags} install DESTDIR=$RPM_BUILD_ROOT
    2.42      strip $RPM_BUILD_ROOT%{l_prefix}/bin/*
    2.43      %{l_rpmtool} files -v -ofiles -r$RPM_BUILD_ROOT %{l_files_std}
    2.44 @@ -86,5 +81,4 @@
    2.45  %files -f files
    2.46  
    2.47  %clean
    2.48 -    rm -rf $RPM_BUILD_ROOT
    2.49