rpms/smokeping/F-10 smokeping-2.4.2-scriptname.patch, NONE, 1.1 smokeping.spec, 1.1, 1.2

[terjeros]

Author: terjeros

Update of /cvs/extras/rpms/smokeping/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16164/F-10

Modified Files:
	smokeping.spec 
Added Files:
	smokeping-2.4.2-scriptname.patch 
Log Message:
Sync with rawhide.



smokeping-2.4.2-scriptname.patch:
 Smokeping.pm |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE smokeping-2.4.2-scriptname.patch ---
diff -uNr -x '*~' smokeping-2.4.2.orig/lib/Smokeping.pm smokeping-2.4.2/lib/Smokeping.pm
--- smokeping-2.4.2.orig/lib/Smokeping.pm	2008-07-24 19:37:05.000000000 +0200
+++ smokeping-2.4.2/lib/Smokeping.pm	2009-08-16 23:00:27.000000000 +0200
@@ -73,7 +73,7 @@
 }
 
 sub dummyCGI::script_name {
-    return wantarray ? () : "";
+    return "sorry_no_script_name_when_running_offline";
 }
 
 sub load_probes ($){


Index: smokeping.spec
===================================================================
RCS file: /cvs/extras/rpms/smokeping/F-10/smokeping.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- smokeping.spec	27 Oct 2008 20:33:24 -0000	1.1
+++ smokeping.spec	16 Aug 2009 21:18:03 -0000	1.2
@@ -7,7 +7,7 @@
 Summary:          Latency Logging and Graphing System
 Name:             smokeping
 Version:          2.4.2
-Release:          7%{?dist}
+Release:          10%{?dist}
 License:          GPLv2+
 Group:            Applications/Internet
 URL:              http://oss.oetiker.ch/smokeping/
@@ -22,6 +22,7 @@ Patch1:           smokeping-2.4.2-config
 Patch2:           smokeping-2.4.2-tr.patch
 Patch3:           smokeping-2.3.5-silence.patch
 Patch4:           smokeping-2.4.2-jsonrpc-strict.patch
+Patch5:           smokeping-2.4.2-scriptname.patch
 BuildRequires:    glibc-common
 Requires:         perl >= 5.6.1 rrdtool >= 1.0.33 fping >= 2.4b2 traceroute
 # Not picked up for some reason
@@ -45,6 +46,7 @@ which presents the graphs.
 %patch2 -p1
 %patch3 -p1
 %patch4 -p1
+%patch5 -p1
 
 %{__install} -p -m 0644 %{SOURCE5} . 
 iconv -f ISO-8859-1 -t utf-8 -o CHANGES.utf8 CHANGES
@@ -132,6 +134,15 @@ fi
 %attr(0755, apache, root) %{_localstatedir}/lib/%{name}/images
 
 %changelog
+* Sun Aug 16 2009 Terje Rosten <terje.rosten at ntnu.no> - 2.4.2-10
+- Add patch to fix #497746
+
+* Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.4.2-9
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
+* Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.4.2-8
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
+
 * Tue Oct 27 2008 Terje Rosten <terje.rosten at ntnu.no> - 2.4.2-7
 - Add some SELinux information, thanks to wolfy for help
   with this and other improvements.
@@ -143,9 +154,9 @@ fi
 - move Qooxdoo::JSONRPC to separate package
 
 * Tue Sep 16 2008 Terje Rosten <terje.rosten at ntnu.no> - 2.4.2-4
-- use mv macro
-- fix cut-n-paste error in rm lines
-- remove perl as buildreq
+- Use mv macro
+- Fix cut-n-paste error in rm lines
+- Remove perl as buildreq
 
 * Mon Sep 15 2008 Terje Rosten <terje.rosten at ntnu.no> - 2.4.2-3
 - Fix perms on writeable dir for apache