rpms/jd/F-10 jd-rev2602-2608.diff,NONE,1.1 jd.spec,1.387,1.388

[Mamoru Tasaka]

Author: mtasaka

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

Modified Files:
	jd.spec 
Added Files:
	jd-rev2602-2608.diff 
Log Message:
* Sun Dec 28 2008 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp>
- rev 2608 (patched against previous rc)


jd-rev2602-2608.diff:

--- NEW FILE jd-rev2602-2608.diff ---
Index: src/jdlib/loader.cpp
===================================================================
--- src/jdlib/loader.cpp	(revision 2602)
+++ src/jdlib/loader.cpp	(revision 2608)
@@ -286,7 +286,9 @@
 
     // プロキシ
     m_data.host_proxy = data_in.host_proxy;
-    if( ! m_data.host_proxy.empty() ){
+
+    // å…ˆé ­ã« *tp:// が付いていたら取り除く
+    if( ! m_data.host_proxy.empty() && m_data.host_proxy.find( "tp://" ) != std::string::npos ){
         const bool protocol = false;
         m_data.host_proxy = MISC::get_hostname( m_data.host_proxy , protocol );
     }


Index: jd.spec
===================================================================
RCS file: /cvs/extras/rpms/jd/F-10/jd.spec,v
retrieving revision 1.387
retrieving revision 1.388
diff -u -r1.387 -r1.388
--- jd.spec	23 Dec 2008 14:53:54 -0000	1.387
+++ jd.spec	27 Dec 2008 18:13:06 -0000	1.388
@@ -20,7 +20,7 @@
 # Defined by vendor
 #
 %define         vendor_rel    5
-%define         extra_rel     %{nil}
+%define         extra_rel     .svn2608_trunk
 # Tag name changed from vendor to vendorname so as not to
 # overwrite Vendor entry in Summary
 %define         vendorname    fedora
@@ -53,6 +53,7 @@
 URL:            http://jd4linux.sourceforge.jp/
 Source0:        http://downloads.sourceforge.jp/jd4linux/%{repoid}/%{name}-%{main_ver}-%{strtag}.tgz
 #Source0:	%{name}-%{main_ver}-%{strtag}.tgz
+Patch0:		jd-rev2602-2608.diff
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  %{gtkmmdevel}
@@ -133,6 +134,9 @@
 %{icondir}/%{name}.png
 
 %changelog
+* Sun Dec 28 2008 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp>
+- rev 2608 (patched against previous rc)
+
 * Tue Dec 23 2008 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 2.1.0-0.5.rc081223
 - 2.1.0 rc 081223