[packages/wrk] - up to 4.0.2; rel 1

[mis]

commit 56db6e8da06d3f6996c2ec2afc10bbc05b495bef
Author: mis <mistoo at gmail.com>
Date:   Wed Jun 7 01:53:22 2017 +0200

    - up to 4.0.2; rel 1

 makefile.patch | 54 ------------------------------------------------------
 wrk.spec       | 22 ++++++++++------------
 2 files changed, 10 insertions(+), 66 deletions(-)
---
diff --git a/wrk.spec b/wrk.spec
index 1e9e409..15318bc 100644
--- a/wrk.spec
+++ b/wrk.spec
@@ -1,12 +1,11 @@
 Summary:	A modern HTTP benchmarking tool
 Name:		wrk
-Version:	3.1.1
-Release:	0.1
+Version:	4.0.2
+Release:	1
 License:	Apache v2.0
 Group:		Networking/Utilities
 Source0:	https://github.com/wg/wrk/archive/%{version}/%{name}-%{version}.tar.gz
-# Source0-md5:	bf25e174845bad36fefd66f9be71889e
-Patch0:		makefile.patch
+# Source0-md5:	2c9c7cbd2468152ccdd48587762c95c1
 URL:		https://github.com/wg/wrk
 BuildRequires:	luajit-devel >= 2.0.2
 BuildRequires:	openssl-devel
@@ -23,23 +22,22 @@ response processing, and custom reporting.
 
 %prep
 %setup -q
-%patch0 -p1
-
-rm -r deps/luajit
 
 %build
 CFLAGS="%{rpmcflags}" \
-%{__make} V=1 \
-	CC="%{__cc}"
+%{__make} \
+WITH_OPENSSL=%{_prefix} WITH_LUAJIT=%{_prefix} \
+	  CC="%{__cc}"
 
 %install
 rm -rf $RPM_BUILD_ROOT
-%{__make} install \
-	DESTDIR=$RPM_BUILD_ROOT
+install -d $RPM_BUILD_ROOT%{_bindir}
+cp -p wrk $RPM_BUILD_ROOT%{_bindir}
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(644,root,root,755)
-%doc README NOTICE
+%attr(755,root,root) %{_bindir}/wrk
+%doc README CHANGES NOTICE SCRIPTING scripts
diff --git a/makefile.patch b/makefile.patch
deleted file mode 100644
index 595c69a..0000000
--- a/makefile.patch
+++ /dev/null
@@ -1,54 +0,0 @@
-diff --git i/Makefile w/Makefile
-index d956c6b..48be677 100644
---- i/Makefile
-+++ w/Makefile
-@@ -1,4 +1,4 @@
--CFLAGS  := -std=c99 -Wall -O2 -D_REENTRANT
-+CFLAGS  += -std=c99 -Wall -D_REENTRANT
- LIBS    := -lpthread -lm -lcrypto -lssl
- 
- TARGET  := $(shell uname -s | tr '[A-Z]' '[a-z]' 2>/dev/null || echo unknown)
-@@ -23,38 +23,31 @@ BIN  := wrk
- ODIR := obj
- OBJ  := $(patsubst %.c,$(ODIR)/%.o,$(SRC)) $(ODIR)/bytecode.o
- 
--LDIR     = deps/luajit/src
--LIBS    := -lluajit $(LIBS)
--CFLAGS  += -I$(LDIR)
--LDFLAGS += -L$(LDIR)
-+LIBS    := $(shell pkg-config --libs luajit) $(LIBS)
-+CFLAGS  += $(shell pkg-config --cflags luajit)
- 
- all: $(BIN)
- 
- clean:
- 	$(RM) $(BIN) obj/*
--	@$(MAKE) -C deps/luajit clean
- 
- $(BIN): $(OBJ)
- 	@echo LINK $(BIN)
--	@$(CC) $(LDFLAGS) -o $@ $^ $(LIBS)
-+	@$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $^ $(LIBS)
- 
--$(OBJ): config.h Makefile $(LDIR)/libluajit.a | $(ODIR)
-+$(OBJ): config.h Makefile | $(ODIR)
- 
- $(ODIR):
- 	@mkdir -p $@
- 
- $(ODIR)/bytecode.o: src/wrk.lua
- 	@echo LUAJIT $<
--	@$(SHELL) -c 'cd $(LDIR) && ./luajit -b $(CURDIR)/$< $(CURDIR)/$@'
-+	@$(SHELL) -c 'luajit -b $(CURDIR)/$< $(CURDIR)/$@'
- 
- $(ODIR)/%.o : %.c
- 	@echo CC $<
- 	@$(CC) $(CFLAGS) -c -o $@ $<
- 
--$(LDIR)/libluajit.a:
--	@echo Building LuaJIT...
--	@$(MAKE) -C $(LDIR) BUILDMODE=static
--
- .PHONY: all clean
- .SUFFIXES:
- .SUFFIXES: .c .o .lua
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/wrk.git/commitdiff/56db6e8da06d3f6996c2ec2afc10bbc05b495bef