Author: glen Date: Wed Feb 17 13:09:51 2010 GMT
Module: packages Tag: HEAD
---- Log message:
- up to 2.69
---- Files affected:
packages/siege:
siege-DESTDIR.patch (1.2 -> 1.3) , siege.spec (1.25 -> 1.26)
---- Diffs:
================================================================
Index: packages/siege/siege-DESTDIR.patch
diff -u packages/siege/siege-DESTDIR.patch:1.2
packages/siege/siege-DESTDIR.patch:1.3
--- packages/siege/siege-DESTDIR.patch:1.2 Wed Aug 17 14:06:55 2005
+++ packages/siege/siege-DESTDIR.patch Wed Feb 17 14:09:46 2010
@@ -1,17 +1,5 @@
-diff -urN siege-2.53.org/doc/Makefile.am siege-2.53/doc/Makefile.am
---- siege-2.53.org/doc/Makefile.am Mon Mar 18 22:19:00 2002
-+++ siege-2.53/doc/Makefile.am Sun May 5 10:40:30 2002
-@@ -63,7 +63,7 @@
- fi; \
- else \
- $(mkinstalldirs) $(sysconfdir); \
-- $(INSTALL_DATA) $(srcdir)/urls.txt $(URLSTXT); \
-+ $(INSTALL_DATA) $(srcdir)/urls.txt $(DESTDIR)$(URLSTXT); \
- fi
-
-
---- ./doc/Makefile.am~ 2005-08-17 14:26:13.000000000 +0300
-+++ ./doc/Makefile.am 2005-08-17 14:51:01.000000000 +0300
+--- 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
@@ -21,13 +9,14 @@
+ @if test -f $(DESTDIR)$(SIEGERC); then \
+ if cmp -s $(srcdir)/siegerc $(DESTDIR)$(SIEGERC); then echo ""; \
else \
- echo ' $(INSTALL_DATA) $(srcdir)/siegerc $(SIEGERC).new'; \
+- 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,16 +61,16 @@
+@@ -61,20 +61,20 @@
echo "#####################################################"; \
fi; \
else \
@@ -39,23 +28,19 @@
+ @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 $(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); \
++ $(INSTALL_DATA) $(srcdir)/urls.txt $(DESTDIR)$(URLSTXT); \
fi
---- ./doc/Makefile.am~ 2005-08-17 14:51:43.000000000 +0300
-+++ ./doc/Makefile.am 2005-08-17 14:53:23.000000000 +0300
-@@ -42,7 +42,7 @@
- DISTCLEANFILES = siegerc $(man_MANS)
-
--SIEGERC = $(HOME)/.siegerc
-+SIEGERC = $(sysconfdir)/siegerc
-
- URLSTXT = $(sysconfdir)/urls.txt
+ uninstall:
+- rm -f $(SIEGERC)
++ rm -f $(DESTDIR)$(SIEGERC)
================================================================
Index: packages/siege/siege.spec
diff -u packages/siege/siege.spec:1.25 packages/siege/siege.spec:1.26
--- packages/siege/siege.spec:1.25 Tue Mar 10 10:01:36 2009
+++ packages/siege/siege.spec Wed Feb 17 14:09:46 2010
@@ -2,19 +2,19 @@
Summary: An HTTP regression testing/benchmarking utility
Summary(pl.UTF-8): Narzędzie do testowania serwerów HTTP
Name: siege
-Version: 2.67
+Version: 2.69
Release: 1
License: GPL v2
Group: Networking/Utilities
Source0: ftp://sid.joedog.org/pub/siege/%{name}-%{version}.tar.gz
-# Source0-md5: ea7b07b4323c2ae13a070e85fad18bbe
+# Source0-md5: 77190ad255dfa14232137d03fd0d994b
Patch0: %{name}-DESTDIR.patch
Patch1: %{name}-am_fixes.patch
Patch2: %{name}-config.patch
-URL: http://www.joedog.org/JoeDog/Siege
+URL: http://www.joedog.org/index/siege-home
BuildRequires: autoconf
BuildRequires: automake
-BuildRequires: openssl-devel >= 0.9.8b
+BuildRequires: openssl-devel >= 0.9.7d
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
%description
@@ -79,6 +79,9 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.26 2010/02/17 13:09:46 glen
+- up to 2.69
+
Revision 1.25 2009/03/10 09:01:36 duddits
- up to 2.67
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/siege/siege-DESTDIR.patch?r1=1.2&r2=1.3&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/siege/siege.spec?r1=1.25&r2=1.26&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
