From 334bcd06f32d2bea64f8d58456d8f009c6a72aac Mon Sep 17 00:00:00 2001
From: Peter Lemenkov <peter@fedoraproject.org>
Date: Mar 14 2009 08:10:20 +0000
Subject: ver. 3.0.0


---

diff --git a/.cvsignore b/.cvsignore
index c9a51f8..46de498 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-mldonkey-2.9.7.tar.bz2
+mldonkey-3.0.0.tar.bz2
diff --git a/import.log b/import.log
index 7921ac2..0b8129e 100644
--- a/import.log
+++ b/import.log
@@ -1,3 +1,4 @@
 mldonkey-2_9_6-3_fc10:HEAD:mldonkey-2.9.6-3.fc10.src.rpm:1232967277
 mldonkey-2_9_7-1_fc10:HEAD:mldonkey-2.9.7-1.fc10.src.rpm:1234090801
 mldonkey-2_9_7-2_fc10:HEAD:mldonkey-2.9.7-2.fc10.src.rpm:1234279003
+mldonkey-3_0_0-1_fc10:HEAD:mldonkey-3.0.0-1.fc10.src.rpm:1237018173
diff --git a/mldonkey.spec b/mldonkey.spec
index 939b207..ea97416 100644
--- a/mldonkey.spec
+++ b/mldonkey.spec
@@ -1,6 +1,6 @@
 Name:		mldonkey
-Version:	2.9.7
-Release:	4%{?dist}
+Version:	3.0.0
+Release:	1%{?dist}
 Summary:	Client for several P2P networks
 License:	GPLv2+
 Source0:	http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.bz2
@@ -9,7 +9,6 @@ Source8:	mldonkey_df_monitor.crond
 Source9:	mldonkey_df_monitor.sh
 Source11:	mldonkey.logrotate
 Patch0:		mldonkey-initscript.patch
-Patch1:         url_slashes.patch
 URL:		http://mldonkey.sourceforge.net
 Group:		Applications/Internet
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -126,7 +125,6 @@ You need to edit %{_sysconfdir}/sysconfig/mldonkey_submit
 %prep
 %setup -q
 %patch0 -p1 -b .fedora
-%patch1 -p0
 # Let's make rpmlint happy
 sed -i 's|\r||g' distrib/ed2k_submit/README.MLdonkeySubmit
 sed -i 's|\r||g' docs/slavanap.txt
@@ -321,6 +319,10 @@ fi
 
 
 %changelog
+* Sat Mar 14 2009 Peter Lemenkov <lemenkov@gmail.com> 3.0.0-1
+- Ver. 3.0.0
+- Dropped patch1
+
 * Thu Feb 26 2009 Richard W.M. Jones <rjones@redhat.com> - 2.9.7-4
 - Fix remote arbitrary file disclosure via a GET request with more
   than one leading / (slash) character in the filename (rhbz#487132).
diff --git a/sources b/sources
index 36ad5fc..03d98b0 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-4733e48d71ea777506f7065a1605f98d  mldonkey-2.9.7.tar.bz2
+d45b37f334a4008ed15343dfb2caf453  mldonkey-3.0.0.tar.bz2
diff --git a/url_slashes.patch b/url_slashes.patch
deleted file mode 100644
index 601e55e..0000000
--- a/url_slashes.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-diff -a -x Root -x Repository -x Tag -x Entries -x Entries.Log -x .svn -x '*.rej' -x '*.orig' -x '*.cmi' -x '*.cma' -x '*.cmo' -x '*.cmx' -x '*.cmxa' -x '*.a' -x '*.o' -x .depend -x Makefile -x mlnet -x ocamlpp.byte -N -r -u ./src/utils/lib/url.ml ./src/utils/lib/url.ml
---- ./src/utils/lib/url.ml	2007-03-17 19:49:32.000000000 +0100
-+++ ./src/utils/lib/url.ml	2009-02-23 19:29:04.000000000 +0100
-@@ -175,6 +175,19 @@
-   Buffer.contents res  
-   
- let of_string ?(args=[]) s =
-+  let remove_leading_slashes s =
-+    let len = String.length s in
-+    let left =
-+      let rec aux i =
-+        if i < len && s.[i] = '/' then aux (i+1) else i in
-+      aux 0 in
-+    if left = 0 then s
-+    else
-+      String.sub s left (len - left) in
-+
-+  (* redefine s to remove all leading slashes *)
-+  let s = remove_leading_slashes s in
-+
-   let s = put_args s args in
-   let url =
-     let get_two init_pos =