Author: peter
Update of /cvs/pkgs/rpms/mldonkey/devel
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv31274/devel
Modified Files:
.cvsignore import.log mldonkey.spec sources
Log Message:
Ver. 3.0.2
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/mldonkey/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- .cvsignore 13 Apr 2010 10:51:36 -0000 1.5
+++ .cvsignore 11 Jun 2010 18:41:07 -0000 1.6
@@ -1 +1 @@
-mldonkey-3.0.1.tar.bz2
+mldonkey-3.0.2.tar.bz2
Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/mldonkey/devel/import.log,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- import.log 13 Apr 2010 10:51:36 -0000 1.5
+++ import.log 11 Jun 2010 18:41:07 -0000 1.6
@@ -3,3 +3,4 @@ mldonkey-2_9_7-1_fc10:HEAD:mldonkey-2.9.
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
mldonkey-3_0_1-2_fc12:HEAD:mldonkey-3.0.1-2.fc12.src.rpm:1271155842
+mldonkey-3_0_2-1_fc12:HEAD:mldonkey-3.0.2-1.fc12.src.rpm:1276281595
Index: mldonkey.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mldonkey/devel/mldonkey.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- mldonkey.spec 13 Apr 2010 10:51:37 -0000 1.9
+++ mldonkey.spec 11 Jun 2010 18:41:07 -0000 1.10
@@ -1,6 +1,6 @@
Name: mldonkey
-Version: 3.0.1
-Release: 2%{?dist}
+Version: 3.0.2
+Release: 1%{?dist}
Summary: Client for several P2P networks
License: GPLv2+
Source0: http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.bz2
@@ -13,14 +13,14 @@ Patch1: mldonkey-DSO-linking.patch
URL: http://mldonkey.sourceforge.net
Group: Applications/Internet
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-%if 0%{?rhel}
+%if 0%{?el5}
BuildRequires: ocaml >= 3.09.3
BuildRequires: camlp4
%else
BuildRequires: ocaml >= 3.10.0
BuildRequires: ocaml-camlp4-devel
%endif
-%if 0%{?fedora}
+%if 0%{?fedora}%{?el6}
BuildRequires: ocaml-lablgtk-devel >= 2.10.0
BuildRequires: desktop-file-utils
BuildRequires: gtk2-devel >= 2.4.0
@@ -29,7 +29,7 @@ BuildRequires: librsvg2-devel >= 2.4.0
BuildRequires: zlib-devel
BuildRequires: bzip2-devel
BuildRequires: ncurses-devel
-%if 0%{?rhel}
+%if 0%{?el5}
BuildRequires: file
%else
BuildRequires: file-devel
@@ -69,7 +69,7 @@ It can also access other peer-to-peer ne
- DC++
-%if 0%{?fedora}
+%if 0%{?fedora}%{?el6}
%package gui
Summary: Graphical frontend for mldonkey based on GTK
Group: Applications/Internet
@@ -141,7 +141,9 @@ You need to edit %{_sysconfdir}/sysconfi
%prep
%setup -q
%patch0 -p0 -b .fedora
+%if 0%{?fedora}
%patch1 -p0 -b .DSO_linking
+%endif
# Let's make rpmlint happy
sed -i 's|\r||g' distrib/ed2k_submit/README.MLdonkeySubmit
sed -i 's|\r||g' docs/slavanap.txt
@@ -155,10 +157,11 @@ chmod 644 src/networks/fasttrack/fst_cry
%build
%configure --enable-pthread \
+%if 0%{?fedora}%{?el6}
--enable-ocamlver=%(rpm -q --qf '%%{version}' ocaml) \
-%if 0%{?fedora}
--enable-gui=newgui2 \
%else
+ --enable-ocamlver=3.09.3 \
--disable-gui \
%endif
--disable-gd
@@ -186,7 +189,7 @@ done
# in order to avoid conflicts with rb_libtorrent (see bz# 484885, 484884)
install -p -m 755 make_torrent $RPM_BUILD_ROOT%{_bindir}/mldonkey_make_torrent
-%if 0%{?fedora}
+%if 0%{?fedora}%{?el6}
# gui
install -p -m 755 mlguistarter $RPM_BUILD_ROOT%{_bindir}/mlguistarter
@@ -233,7 +236,7 @@ install -d -m 755 $RPM_BUILD_ROOT%{_loca
echo -e \
"temp_directory = \"%{_localstatedir}/cache/mldonkey\"\n"\
"incoming_directory = \"%{_localstatedir}/lib/%{name}/incoming\"\n"\
-%if 0%{?fedora}
+%if 0%{?fedora}%{?el6}
"mldonkey_gui = \"%{_bindir}/mlgui\"\n"\
%endif
"mldonkey_bin = \"%{_bindir}/mldonkey\"\n"\
@@ -297,7 +300,7 @@ fi
%{_bindir}/svg_converter
-%if 0%{?fedora}
+%if 0%{?fedora}%{?el6}
%files gui
%defattr(-,root,root)
%doc Copying.txt distrib/Authors.txt distrib/Bugs.txt distrib/ChangeLog distrib/Developers.txt
@@ -350,6 +353,9 @@ fi
%changelog
+* Fri Jun 11 2010 Peter Lemenkov <lemenkov@xxxxxxxxx> 3.0.2-1
+- Ver. 3.0.2
+
* Mon Mar 15 2010 Peter Lemenkov <lemenkov@xxxxxxxxx> 3.0.1-2
- Disable probing for GUI libraries in EPEL
- Fixed DSO linking with newest GCC
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/mldonkey/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- sources 13 Apr 2010 10:51:37 -0000 1.5
+++ sources 11 Jun 2010 18:41:07 -0000 1.6
@@ -1 +1 @@
-b0c3be56f2335b2e8a1749c0e10fa29c mldonkey-3.0.1.tar.bz2
+bed733181ec3634cdf0073085eed0110 mldonkey-3.0.2.tar.bz2
_______________________________________________
ocaml-devel mailing list
ocaml-devel@xxxxxxxxxxxxxxxxxxxxxxx
https://admin.fedoraproject.org/mailman/listinfo/ocaml-devel
