summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJan Rękorajski2003-11-12 15:15:31 (GMT)
committercvs2git2012-06-24 12:13:13 (GMT)
commitc940dfbecd98bf6447e1b14a90860acc11602b1b (patch)
tree06b1c133554502438f5b14fd1389d42dc14e0c4e
parent2857a69b1a1cacccf73f0b6b846b07da254f8fe9 (diff)
downloadmldonkey-c940dfbecd98bf6447e1b14a90860acc11602b1b.zip
mldonkey-c940dfbecd98bf6447e1b14a90860acc11602b1b.tar.gz
- fix building with ocaml 3.07
Changed files: mldonkey-ocaml307.patch -> 1.1 mldonkey.spec -> 1.31
-rw-r--r--mldonkey-ocaml307.patch11
-rw-r--r--mldonkey.spec2
2 files changed, 13 insertions, 0 deletions
diff --git a/mldonkey-ocaml307.patch b/mldonkey-ocaml307.patch
new file mode 100644
index 0000000..1c5b90d
--- /dev/null
+++ b/mldonkey-ocaml307.patch
@@ -0,0 +1,11 @@
+--- mldonkey-2.5-4/config/configure~ 2003-10-12 20:41:28.000000000 +0200
++++ mldonkey-2.5-4/config/configure 2003-11-12 16:12:21.000000000 +0100
+@@ -3652,7 +3652,7 @@
+ case "$OCAMLVERSION" in
+ 3.06) TYPE_FORMAT="";;
+ 3.07) TYPE_FORMAT="";;
+- *) TYPE_FORMAT="type ('a,'b,'c) ml_format = ('a,'b, 'c,'c) format type ('a,'b,'c) format = ('a,'b, 'c) ml_format";;
++ *) TYPE_FORMAT="type ('a,'b,'c) ml_format = ('a,'b, 'c) format type ('a,'b,'c) format = ('a,'b, 'c) ml_format";;
+ esac
+
+
diff --git a/mldonkey.spec b/mldonkey.spec
index 402fb2a..7bcd56f 100644
--- a/mldonkey.spec
+++ b/mldonkey.spec
@@ -28,6 +28,7 @@ Source3: %{name}.sh
Source4: %{name}.png
Source5: %{name}-gui.desktop
Patch0: %{name}-configwin.patch
+Patch1: %{name}-ocaml307.patch
URL: http://www.nongnu.org/mldonkey/
BuildRequires: bzip2-devel
BuildRequires: gtk+-devel
@@ -140,6 +141,7 @@ Trzeba zmodyfikować plik /etc/sysconfig/mldonkey_submit.
%prep
%setup -q -n %{name}-%{main_ver}-%{sub_ver}
%patch0 -p1
+%patch1 -p1
%build
perl -pi -e 's|/etc/sysconfig/mldonkey|/etc/sysconfig/mldonkey_submit|' distrib/ed2k_submit/mldonkey_submit