Author: peter Update of /cvs/pkgs/rpms/mldonkey/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10363/devel Modified Files: import.log mldonkey.spec Log Message: fixed bz# 484884 Index: import.log =================================================================== RCS file: /cvs/pkgs/rpms/mldonkey/devel/import.log,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- import.log 8 Feb 2009 11:21:48 -0000 1.2 +++ import.log 10 Feb 2009 15:49:03 -0000 1.3 @@ -1,2 +1,3 @@ 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 Index: mldonkey.spec =================================================================== RCS file: /cvs/pkgs/rpms/mldonkey/devel/mldonkey.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- mldonkey.spec 8 Feb 2009 11:21:48 -0000 1.2 +++ mldonkey.spec 10 Feb 2009 15:49:03 -0000 1.3 @@ -1,6 +1,6 @@ Name: mldonkey Version: 2.9.7 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Client for several P2P networks License: GPLv2+ Source0: http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.bz2 @@ -159,9 +159,11 @@ install -p -m 755 distrib/kill_mldonkey $RPM_BUILD_ROOT%{_bindir}/kill_mldonkey # utils -for util in copysources mld_hash get_range make_torrent svg_converter subconv; do +for util in copysources mld_hash get_range svg_converter subconv; do install -p -m 755 $util $RPM_BUILD_ROOT%{_bindir}/$util ; 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 # gui install -p -m 755 mlguistarter $RPM_BUILD_ROOT%{_bindir}/mlguistarter @@ -256,7 +258,7 @@ %{_bindir}/kill_mldonkey %{_bindir}/copysources %{_bindir}/get_range -%{_bindir}/make_torrent +%{_bindir}/mldonkey_make_torrent %{_bindir}/mlbt %{_bindir}/mld_hash %{_bindir}/mldc @@ -317,6 +319,9 @@ %changelog +* Tue Feb 10 2009 Peter Lemenkov <lemenkov@xxxxxxxxx> 2.9.7-2 +- Fixed bz# 484884 + * Sun Feb 8 2009 Peter Lemenkov <lemenkov@xxxxxxxxx> 2.9.7-1 - Ver. 2.9.7 _______________________________________________ Fedora-ocaml-list mailing list Fedora-ocaml-list@xxxxxxxxxx https://www.redhat.com/mailman/listinfo/fedora-ocaml-list