rpms/siege/F-10 import.log, NONE, 1.1 siege-2.69-good.patch, NONE, 1.1 .cvsignore, 1.4, 1.5 siege.spec, 1.6, 1.7 sources, 1.4, 1.5 siege-2.65-good.patch, 1.1, NONE

[Allisson Azevedo]

Author: allisson

Update of /cvs/pkgs/rpms/siege/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24071/F-10

Modified Files:
	.cvsignore siege.spec sources 
Added Files:
	import.log siege-2.69-good.patch 
Removed Files:
	siege-2.65-good.patch 
Log Message:

Update to 2.69.



--- NEW FILE import.log ---
siege-2_69-1_fc11:F-10:siege-2.69-1.fc11.src.rpm:1246719040

siege-2.69-good.patch:

--- NEW FILE siege-2.69-good.patch ---
diff -up siege-2.69/doc/Makefile.in.good siege-2.69/doc/Makefile.in
--- siege-2.69/doc/Makefile.in.good	2009-07-04 11:12:24.411980518 -0300
+++ siege-2.69/doc/Makefile.in	2009-07-04 11:13:19.914733285 -0300
@@ -498,32 +498,32 @@ uninstall-man: uninstall-man1 uninstall-
 
 
 install-exec-hook: 
-	@if test -f $(SIEGERC); then \
-	  if cmp -s $(srcdir)/siegerc $(SIEGERC); then echo ""; \
-	    else \
-	    echo ' $(INSTALL_DATA) $(srcdir)/siegerc $(SIEGERC).new'; \
-	    $(INSTALL_DATA) $(srcdir)/siegerc $(SIEGERC).new; \
-	    echo "#####################################################"; \
-	    echo "WARNING: File $(SIEGERC) already exists."; \
-	    echo "         A new resource file has been installed as"; \
-	    echo "         $(SIEGERC).new. You may want to"; \
-	    echo "         consider using the newer version in order to"; \
-	    echo "         take advantage of any new features."; \
-	    echo "#####################################################"; \
-	  fi; \
-	else \
-	  $(INSTALL_DATA) $(srcdir)/siegerc $(SIEGERC); \
-	fi 
-	@if test -f $(URLSTXT); then \
-	  if cmp -s $(srcdir)/siegerc $(URLSTXT); then echo ""; \
-	    else \
-	    echo "WARNING: File $(URLSTXT) already exists."; \
-	    echo "         It was NOT replaced with this installation."; \
-	  fi; \
-	else \
-	  $(mkinstalldirs) $(sysconfdir); \
-	  $(INSTALL_DATA) $(srcdir)/urls.txt $(URLSTXT); \
-	fi 
+	#@if test -f $(SIEGERC); then \
+	#  if cmp -s $(srcdir)/siegerc $(SIEGERC); then echo ""; \
+	#    else \
+	#    echo ' $(INSTALL_DATA) $(srcdir)/siegerc $(SIEGERC).new'; \
+	#    $(INSTALL_DATA) $(srcdir)/siegerc $(SIEGERC).new; \
+	#    echo "#####################################################"; \
+	#    echo "WARNING: File $(SIEGERC) already exists."; \
+	#    echo "         A new resource file has been installed as"; \
+	#    echo "         $(SIEGERC).new. You may want to"; \
+	#    echo "         consider using the newer version in order to"; \
+	#    echo "         take advantage of any new features."; \
+	#    echo "#####################################################"; \
+	#  fi; \
+	#else \
+	#  $(INSTALL_DATA) $(srcdir)/siegerc $(SIEGERC); \
+	#fi 
+	#@if test -f $(URLSTXT); then \
+	#  if cmp -s $(srcdir)/siegerc $(URLSTXT); then echo ""; \
+	#    else \
+	#    echo "WARNING: File $(URLSTXT) already exists."; \
+	#    echo "         It was NOT replaced with this installation."; \
+	#  fi; \
+	#else \
+	#  $(mkinstalldirs) $(sysconfdir); \
+	#  $(INSTALL_DATA) $(srcdir)/urls.txt $(URLSTXT); \
+	#fi 
 
 uninstall:
 	rm -f $(SIEGERC)


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/siege/F-10/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- .cvsignore	17 May 2008 02:52:06 -0000	1.4
+++ .cvsignore	4 Jul 2009 14:56:39 -0000	1.5
@@ -1 +1 @@
-siege-2.67.tar.gz
+siege-2.69.tar.gz


Index: siege.spec
===================================================================
RCS file: /cvs/pkgs/rpms/siege/F-10/siege.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- siege.spec	17 May 2008 02:52:06 -0000	1.6
+++ siege.spec	4 Jul 2009 14:56:39 -0000	1.7
@@ -1,13 +1,13 @@
 Name:           siege
-Version:        2.67
+Version:        2.69
 Release:        1%{?dist}
-Summary:        Siege is an http regression testing and benchmarking utility
+Summary:        HTTP regression testing and benchmarking utility
 
 Group:          Development/Tools
 License:        GPLv2+
 URL:            http://www.joedog.org/JoeDog/Siege    
 Source0:        ftp://ftp.joedog.org/pub/siege/%{name}-%{version}.tar.gz
-Patch0:         siege-2.65-good.patch
+Patch0:         siege-2.69-good.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires: openssl-devel
@@ -26,16 +26,19 @@ simulated users. Those users place the w
 
 
 %build
-%configure
+%configure --sysconfdir=/etc/siege 
 make %{?_smp_mflags}
 
 
 %install
 rm -rf $RPM_BUILD_ROOT
 make install DESTDIR=$RPM_BUILD_ROOT
-# Create /etc/urls.txt
-mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}
-install -m 644 doc/urls.txt $RPM_BUILD_ROOT%{_sysconfdir}/
+# Create /etc/siege/urls.txt
+mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/siege
+install -m 644 doc/urls.txt $RPM_BUILD_ROOT%{_sysconfdir}/siege/
+# Create /etc/siege/siegerc
+install -m 644 doc/siegerc $RPM_BUILD_ROOT%{_sysconfdir}/siege/
+
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -54,10 +57,14 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man1/siege2csv.1.gz
 %{_mandir}/man5/urls_txt.5.gz
 %{_mandir}/man7/layingsiege.7.gz
-#%{_sysconfdir}/urls.txt
-%config(noreplace) %{_sysconfdir}/urls.txt
+%dir %{_sysconfdir}/siege
+%config(noreplace) %{_sysconfdir}/siege/urls.txt
+%config(noreplace) %{_sysconfdir}/siege/siegerc
 
 %changelog
+* Sat Jul  4 2009 Allisson Azevedo <allisson at gmail.com> 2.69-1
+- Update to 2.69
+- Update Makefile.in patch
 
 * Fri May 16 2008 Allisson Azevedo <allisson at gmail.com> 2.67-1
 - Update to 2.67


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/siege/F-10/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- sources	17 May 2008 02:52:06 -0000	1.4
+++ sources	4 Jul 2009 14:56:39 -0000	1.5
@@ -1 +1 @@
-ea7b07b4323c2ae13a070e85fad18bbe  siege-2.67.tar.gz
+77190ad255dfa14232137d03fd0d994b  siege-2.69.tar.gz


--- siege-2.65-good.patch DELETED ---