[packages/siege/fixing] up to 2.77

[glen]

commit 57c8c5df470ef86bc57709da876e49fba32cb120
Author: Elan Ruusamäe <glen at delfi.ee>
Date:   Mon Mar 11 13:10:36 2013 +0200

    up to 2.77

 autofoo.patch        | 21 ---------------------
 siege-DESTDIR.patch  | 46 ----------------------------------------------
 siege-am_fixes.patch | 15 ---------------
 siege.spec           | 12 +++---------
 4 files changed, 3 insertions(+), 91 deletions(-)
---
diff --git a/siege.spec b/siege.spec
index ed33053..68ccef5 100644
--- a/siege.spec
+++ b/siege.spec
@@ -1,16 +1,13 @@
 Summary:	An HTTP regression testing/benchmarking utility
 Summary(pl.UTF-8):	Narzędzie do testowania serwerów HTTP
 Name:		siege
-Version:	2.75
-Release:	2
+Version:	2.77
+Release:	1
 License:	GPL v2
 Group:		Networking/Utilities
 Source0:	http://www.joedog.org/pub/siege/%{name}-%{version}.tar.gz
-# Source0-md5:	f5c43420a4b7a4db5010eba68c8fc3f4
-Patch0:		%{name}-DESTDIR.patch
-Patch1:		%{name}-am_fixes.patch
+# Source0-md5:	4dd92c5a26b312c9182c173dda458bb0
 Patch2:		%{name}-config.patch
-Patch3:		autofoo.patch
 URL:		http://www.joedog.org/index/siege-home
 BuildRequires:	autoconf
 BuildRequires:	automake
@@ -40,10 +37,7 @@ użytkownika.
 
 %prep
 %setup -q
-%patch0 -p1
-%patch1 -p1
 %patch2 -p1
-%patch3 -p1
 
 %build
 rm -f missing
diff --git a/autofoo.patch b/autofoo.patch
deleted file mode 100644
index 955e3f4..0000000
--- a/autofoo.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-fix:
-configure.in:9: error: 'AM_CONFIG_HEADER': this macro is obsolete.
-    You should use the 'AC_CONFIG_HEADERS' macro instead.
-/usr/share/aclocal-1.13/obsolete-err.m4:12: AM_CONFIG_HEADER is expanded from...
-configure.in:9: the top level
-autom4te: /usr/bin/m4 failed with exit status: 1
-
-upstream should also rename configure.in to configure.ac:
-
-aclocal: warning: autoconf input should be named 'configure.ac', not 'configure.in'
---- siege-2.75/configure.in~	2012-04-17 17:43:03.000000000 +0300
-+++ siege-2.75/configure.in	2013-03-04 17:49:26.656390759 +0200
-@@ -6,7 +6,7 @@
- dnl
- AC_INIT
- AC_CONFIG_SRCDIR([src/setup.h]) 
--AM_CONFIG_HEADER(include/config.h)
-+AC_CONFIG_HEADERS(include/config.h)
- 
- dnl
- dnl Define the utils directory
diff --git a/siege-DESTDIR.patch b/siege-DESTDIR.patch
deleted file mode 100644
index 0a323d9..0000000
--- a/siege-DESTDIR.patch
+++ /dev/null
@@ -1,46 +0,0 @@
---- siege-2.69/doc/Makefile.am~	2010-02-17 14:54:27.000000000 +0200
-+++ siege-2.69/doc/Makefile.am	2010-02-17 14:55:55.178013240 +0200
-@@ -47,11 +47,11 @@
- URLSTXT           =      $(sysconfdir)/urls.txt
- 
- install-exec-hook: 
--	@if test -f $(SIEGERC); then \
--	  if cmp -s $(srcdir)/siegerc $(SIEGERC); then echo ""; \
-+	@if test -f $(DESTDIR)$(SIEGERC); then \
-+	  if cmp -s $(srcdir)/siegerc $(DESTDIR)$(SIEGERC); then echo ""; \
- 	    else \
--	    echo ' $(INSTALL_DATA) $(srcdir)/siegerc $(SIEGERC).new'; \
--	    $(INSTALL_DATA) $(srcdir)/siegerc $(SIEGERC).new; \
-+	    echo ' $(INSTALL_DATA) $(srcdir)/siegerc $(DESTDIR)$(SIEGERC).new'; \
-+	    $(INSTALL_DATA) $(srcdir)/siegerc $(DESTDIR)$(SIEGERC).new; \
- 	    echo "#####################################################"; \
- 	    echo "WARNING: File $(SIEGERC) already exists."; \
- 	    echo "         A new resource file has been installed as"; \
-@@ -61,20 +61,20 @@
- 	    echo "#####################################################"; \
- 	  fi; \
- 	else \
--	  $(INSTALL_DATA) $(srcdir)/siegerc $(SIEGERC); \
-+	  $(INSTALL_DATA) $(srcdir)/siegerc $(DESTDIR)$(SIEGERC); \
- 	fi 
--	@if test -f $(URLSTXT); then \
--	  if cmp -s $(srcdir)/siegerc $(URLSTXT); then echo ""; \
-+	@if test -f $(DESTDIR)$(URLSTXT); then \
-+	  if cmp -s $(srcdir)/siegerc $(DESTDIR)$(URLSTXT); then echo ""; \
- 	    else \
--	    echo "WARNING: File $(URLSTXT) already exists."; \
-+	    echo "WARNING: File $(DESTDIR)$(URLSTXT) already exists."; \
- 	    echo "         It was NOT replaced with this installation."; \
- 	  fi; \
- 	else \
--	  $(mkinstalldirs) $(sysconfdir); \
--	  $(INSTALL_DATA) $(srcdir)/urls.txt $(URLSTXT); \
-+	  $(mkinstalldirs) $(DESTDIR)$(sysconfdir); \
-+	  $(INSTALL_DATA) $(srcdir)/urls.txt $(DESTDIR)$(URLSTXT); \
- 	fi 
- 
- 
- uninstall:
--	rm -f $(SIEGERC)
-+	rm -f $(DESTDIR)$(SIEGERC)
- 
diff --git a/siege-am_fixes.patch b/siege-am_fixes.patch
deleted file mode 100644
index 43f9faa..0000000
--- a/siege-am_fixes.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-diff -Nur siege-2.59.orig/src/Makefile.am siege-2.59/src/Makefile.am
---- siege-2.59.orig/src/Makefile.am	2004-01-06 21:14:35.000000000 +0100
-+++ siege-2.59/src/Makefile.am	2004-03-24 19:52:59.449429232 +0100
-@@ -28,9 +28,9 @@
- 
- AM_CFLAGS          =   $(PTHREAD_CFLAGS) $(WARN_CFLAGS) $(SSL_CFLAGS)
- 
--LDFLAGS            =   $(SSL_LDFLAGS) $(PTHREAD_LDFLAGS)  
-+AM_LDFLAGS         =   $(SSL_LDFLAGS) $(PTHREAD_LDFLAGS)  
- 
--LIBS               =   $(SSL_LIBS) 
-+LIBS               =   $(SSL_LIBS)
- 
- siege_LDADD        =   $(top_srcdir)/lib/joedog/libjoedog.la
- 
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/siege.git/commitdiff/57c8c5df470ef86bc57709da876e49fba32cb120