Ocaml-devel June 2010

ocaml-devel@lists.fedoraproject.org

8 participants
44 discussions

Lwt enhanced toplevel
by Robin Neatherway 16 Jun '10

16 Jun '10

Hi, I would like to try the enhanced toplevel that comes with lwt. This doesn't seem to come in the Fedora package, so I have been building lwt from scratch using the tarball from the website. Unfortunately, a dependency that is required for compiling the enhanced toplevel includes the compiler libraries such as "env.cmi". There doesn't seem to be a package that would provide this available currently. I would definitely like to avoid compiling my own entire ocaml distribution, having done this in the past. Either option would work well for me: lwt coming with the toplevel or the addition of a "compiler-libs" package. Which would be the preferred option, and how could I help this to come about? Thanks, Robin

2 1

Re: OCaml Issue
by Richard W.M. Jones 16 Jun '10

16 Jun '10

On Tue, Jun 15, 2010 at 06:31:20PM -0500, Mark Rader wrote: > Richard > > We are having a strange OCAML issue. Everything builds under 686 32 bit but > it will not install. We get the following dependency error. > > error: Failed dependencies: > ocaml(GtkSourceView_types) = 54a715ab00f97f086ec8efa5bdfb1079 is needed > by frama-c-1.4-3.fc13.i686 > ocaml(Ltlast) = 74c3c642418d942308d59a8ee1249892 is needed by > frama-c-1.4-3.fc13.i686 > ocaml(Promelaast) = ca8d09a78cd4262a60715d5b1b444b13 is needed by > frama-c-1.4-3.fc13.i686 > > > It looks like we are missing an OCAML piece or we may have a corrupt > library. Any ideas? Just ignore these symbols. Add the -i flag to ocaml-find-requires or ocaml-find-provides as appropriate, see eg: http://cvs.fedoraproject.org/viewvc/devel/ocaml-mikmatch/ocaml-mikmatch.spe… Rich. -- Richard Jones, Virtualization Group, Red Hat http://people.redhat.com/~rjones virt-p2v converts physical machines to virtual machines. Boot with a live CD or over the network (PXE) and turn machines into Xen guests. http://et.redhat.com/~rjones/virt-p2v

1 0

rpms/mldonkey/EL-5 mldonkey-DSO-linking.patch, NONE, 1.1 .cvsignore, 1.5, 1.6 import.log, 1.5, 1.6 mldonkey.spec, 1.6, 1.7 sources, 1.5, 1.6
by Peter Lemenkov 12 Jun '10

12 Jun '10

Author: peter Update of /cvs/pkgs/rpms/mldonkey/EL-5 In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv1699/EL-5 Modified Files: .cvsignore import.log mldonkey.spec sources Added Files: mldonkey-DSO-linking.patch Log Message: Ver. 3.0.2 mldonkey-DSO-linking.patch: Makefile.in | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) --- NEW FILE mldonkey-DSO-linking.patch --- --- config/Makefile.in~ 2008-02-04 02:06:30.000000000 +0300 +++ config/Makefile.in 2010-03-15 17:40:08.412447287 +0300 @@ -609,8 +609,8 @@ ifneq ("$(GUI)" , "no") ifeq ("$(GUI)", "newgui2") SUBDIRS += $(SRC_GUI) $(SRC_GUI)/x11 $(SRC_GUI)/win32 $(ICONS_CHOICE) +lablgtk2 - GTK_LIBS_byte=-ccopt "$(GTKLLIBS)" -cclib "$(GTKLFLAGS)" -I +lablgtk2 $(LABLGL_CMA) lablgtk.cma gtkInit.cmo lablrsvg.cma - GTK_LIBS_opt=-ccopt "$(GTKLLIBS)" -cclib "$(GTKLFLAGS)" -I +lablgtk2 $(LABLGL_CMXA) lablgtk.cmxa gtkInit.cmx lablrsvg.cmxa + GTK_LIBS_byte=-ccopt "$(GTKLLIBS) -lX11" -cclib "$(GTKLFLAGS)" -I +lablgtk2 $(LABLGL_CMA) lablgtk.cma gtkInit.cmo lablrsvg.cma + GTK_LIBS_opt=-ccopt "$(GTKLLIBS) -lX11" -cclib "$(GTKLFLAGS)" -I +lablgtk2 $(LABLGL_CMXA) lablgtk.cmxa gtkInit.cmx lablrsvg.cmxa GTK_STATIC_LIBS_opt=-ccopt "$(GTKLLIBS)" -cclib "$(GTKLFLAGS)" -I +lablgtk2 lablgtk.cmxa gtkInit.cmx lablrsvg.cmxa else SUBDIRS += $(SRC_GUI) $(CONFIGWIN) $(OKEY) $(GPATTERN) $(ICONS_CHOICE) +lablgtk $(SRC_PROGRESS) Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/mldonkey/EL-5/.cvsignore,v retrieving revision 1.5 retrieving revision 1.6 diff -u -p -r1.5 -r1.6 --- .cvsignore 27 Jan 2010 10:49:21 -0000 1.5 +++ .cvsignore 11 Jun 2010 19:02:44 -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/EL-5/import.log,v retrieving revision 1.5 retrieving revision 1.6 diff -u -p -r1.5 -r1.6 --- import.log 27 Jan 2010 10:49:22 -0000 1.5 +++ import.log 11 Jun 2010 19:02:45 -0000 1.6 @@ -3,3 +3,4 @@ mldonkey-2_9_7-1_fc10:EL-5:mldonkey-2.9. mldonkey-2_9_7-2_fc10:EL-5:mldonkey-2.9.7-2.fc10.src.rpm:1234280124 mldonkey-3_0_0-1_fc10:EL-5:mldonkey-3.0.0-1.fc10.src.rpm:1237018500 mldonkey-3_0_1-1_fc12:EL-5:mldonkey-3.0.1-1.fc12.src.rpm:1264589279 +mldonkey-3_0_2-1_fc12:EL-5:mldonkey-3.0.2-1.fc12.src.rpm:1276282908 Index: mldonkey.spec =================================================================== RCS file: /cvs/pkgs/rpms/mldonkey/EL-5/mldonkey.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -p -r1.6 -r1.7 --- mldonkey.spec 27 Jan 2010 10:49:22 -0000 1.6 +++ mldonkey.spec 11 Jun 2010 19:02:45 -0000 1.7 @@ -1,5 +1,5 @@ Name: mldonkey -Version: 3.0.1 +Version: 3.0.2 Release: 1%{?dist} Summary: Client for several P2P networks License: GPLv2+ @@ -9,17 +9,18 @@ Source8: mldonkey_df_monitor.crond Source9: mldonkey_df_monitor.sh Source11: mldonkey.logrotate Patch0: mldonkey-initscript.patch +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%{!?rhel} +%if 0%{?fedora}%{?el6} BuildRequires: ocaml-lablgtk-devel >= 2.10.0 BuildRequires: desktop-file-utils BuildRequires: gtk2-devel >= 2.4.0 @@ -28,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 @@ -68,7 +69,7 @@ It can also access other peer-to-peer ne - DC++ -%if 0%{!?rhel} +%if 0%{?fedora}%{?el6} %package gui Summary: Graphical frontend for mldonkey based on GTK Group: Applications/Internet @@ -140,6 +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 @@ -153,11 +157,12 @@ chmod 644 src/networks/fasttrack/fst_cry %build %configure --enable-pthread \ +%if 0%{?fedora}%{?el6} --enable-ocamlver=%(rpm -q --qf '%%{version}' ocaml) \ -%if 0%{!?rhel} - --disable-gui \ -%else --enable-gui=newgui2 \ +%else + --enable-ocamlver=3.09.3 \ + --disable-gui \ %endif --disable-gd @@ -184,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%{!?rhel} +%if 0%{?fedora}%{?el6} # gui install -p -m 755 mlguistarter $RPM_BUILD_ROOT%{_bindir}/mlguistarter @@ -231,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%{!?rhel} +%if 0%{?fedora}%{?el6} "mldonkey_gui = \"%{_bindir}/mlgui\"\n"\ %endif "mldonkey_bin = \"%{_bindir}/mldonkey\"\n"\ @@ -295,7 +300,7 @@ fi %{_bindir}/svg_converter -%if 0%{!?rhel} +%if 0%{?fedora}%{?el6} %files gui %defattr(-,root,root) %doc Copying.txt distrib/Authors.txt distrib/Bugs.txt distrib/ChangeLog distrib/Developers.txt @@ -348,6 +353,13 @@ fi %changelog +* Fri Jun 11 2010 Peter Lemenkov <lemenkov(a)gmail.com> 3.0.2-1 +- Ver. 3.0.2 + +* Mon Mar 15 2010 Peter Lemenkov <lemenkov(a)gmail.com> 3.0.1-2 +- Disable probing for GUI libraries in EPEL +- Fixed DSO linking with newest GCC + * Tue Jan 26 2010 Peter Lemenkov <lemenkov(a)gmail.com> 3.0.1-1 - Ver. 3.0.1 - Greatly changed init-script Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/mldonkey/EL-5/sources,v retrieving revision 1.5 retrieving revision 1.6 diff -u -p -r1.5 -r1.6 --- sources 27 Jan 2010 10:49:22 -0000 1.5 +++ sources 11 Jun 2010 19:02:45 -0000 1.6 @@ -1 +1 @@ -b0c3be56f2335b2e8a1749c0e10fa29c mldonkey-3.0.1.tar.bz2 +bed733181ec3634cdf0073085eed0110 mldonkey-3.0.2.tar.bz2

1 0

rpms/mldonkey/EL-6 .cvsignore, 1.5, 1.6 import.log, 1.5, 1.6 mldonkey.spec, 1.9, 1.10 sources, 1.5, 1.6
by Peter Lemenkov 12 Jun '10

12 Jun '10

Author: peter Update of /cvs/pkgs/rpms/mldonkey/EL-6 In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv1302/EL-6 Modified Files: .cvsignore import.log mldonkey.spec sources Log Message: Ver. 3.0.2 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/mldonkey/EL-6/.cvsignore,v retrieving revision 1.5 retrieving revision 1.6 diff -u -p -r1.5 -r1.6 --- .cvsignore 13 Apr 2010 10:54:13 -0000 1.5 +++ .cvsignore 11 Jun 2010 19:01:02 -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/EL-6/import.log,v retrieving revision 1.5 retrieving revision 1.6 diff -u -p -r1.5 -r1.6 --- import.log 13 Apr 2010 10:54:13 -0000 1.5 +++ import.log 11 Jun 2010 19:01:03 -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:F-12:mldonkey-3.0.1-2.fc12.src.rpm:1271155993 +mldonkey-3_0_2-1_fc12:EL-6:mldonkey-3.0.2-1.fc12.src.rpm:1276282818 Index: mldonkey.spec =================================================================== RCS file: /cvs/pkgs/rpms/mldonkey/EL-6/mldonkey.spec,v retrieving revision 1.9 retrieving revision 1.10 diff -u -p -r1.9 -r1.10 --- mldonkey.spec 13 Apr 2010 10:54:14 -0000 1.9 +++ mldonkey.spec 11 Jun 2010 19:01:03 -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(a)gmail.com> 3.0.2-1 +- Ver. 3.0.2 + * Mon Mar 15 2010 Peter Lemenkov <lemenkov(a)gmail.com> 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/EL-6/sources,v retrieving revision 1.5 retrieving revision 1.6 diff -u -p -r1.5 -r1.6 --- sources 13 Apr 2010 10:54:14 -0000 1.5 +++ sources 11 Jun 2010 19:01:03 -0000 1.6 @@ -1 +1 @@ -b0c3be56f2335b2e8a1749c0e10fa29c mldonkey-3.0.1.tar.bz2 +bed733181ec3634cdf0073085eed0110 mldonkey-3.0.2.tar.bz2

1 0

rpms/mldonkey/F-11 .cvsignore, 1.5, 1.6 import.log, 1.5, 1.6 mldonkey.spec, 1.7, 1.8 sources, 1.5, 1.6
by Peter Lemenkov 12 Jun '10

12 Jun '10

Author: peter Update of /cvs/pkgs/rpms/mldonkey/F-11 In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv367/F-11 Modified Files: .cvsignore import.log mldonkey.spec sources Log Message: Ver. 3.0.2 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/mldonkey/F-11/.cvsignore,v retrieving revision 1.5 retrieving revision 1.6 diff -u -p -r1.5 -r1.6 --- .cvsignore 13 Apr 2010 10:57:14 -0000 1.5 +++ .cvsignore 11 Jun 2010 18:54: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/F-11/import.log,v retrieving revision 1.5 retrieving revision 1.6 diff -u -p -r1.5 -r1.6 --- import.log 13 Apr 2010 10:57:14 -0000 1.5 +++ import.log 11 Jun 2010 18:54:08 -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:F-11:mldonkey-3.0.1-2.fc12.src.rpm:1271156105 +mldonkey-3_0_2-1_fc12:F-11:mldonkey-3.0.2-1.fc12.src.rpm:1276282368 Index: mldonkey.spec =================================================================== RCS file: /cvs/pkgs/rpms/mldonkey/F-11/mldonkey.spec,v retrieving revision 1.7 retrieving revision 1.8 diff -u -p -r1.7 -r1.8 --- mldonkey.spec 13 Apr 2010 10:57:14 -0000 1.7 +++ mldonkey.spec 11 Jun 2010 18:54:08 -0000 1.8 @@ -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(a)gmail.com> 3.0.2-1 +- Ver. 3.0.2 + * Mon Mar 15 2010 Peter Lemenkov <lemenkov(a)gmail.com> 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/F-11/sources,v retrieving revision 1.5 retrieving revision 1.6 diff -u -p -r1.5 -r1.6 --- sources 13 Apr 2010 10:57:14 -0000 1.5 +++ sources 11 Jun 2010 18:54:08 -0000 1.6 @@ -1 +1 @@ -b0c3be56f2335b2e8a1749c0e10fa29c mldonkey-3.0.1.tar.bz2 +bed733181ec3634cdf0073085eed0110 mldonkey-3.0.2.tar.bz2

1 0

rpms/mldonkey/F-12 .cvsignore, 1.5, 1.6 import.log, 1.5, 1.6 mldonkey.spec, 1.9, 1.10 sources, 1.5, 1.6
by Peter Lemenkov 12 Jun '10

12 Jun '10

Author: peter Update of /cvs/pkgs/rpms/mldonkey/F-12 In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv32470/F-12 Modified Files: .cvsignore import.log mldonkey.spec sources Log Message: Ver. 3.0.2 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/mldonkey/F-12/.cvsignore,v retrieving revision 1.5 retrieving revision 1.6 diff -u -p -r1.5 -r1.6 --- .cvsignore 13 Apr 2010 10:54:13 -0000 1.5 +++ .cvsignore 11 Jun 2010 18:52:01 -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/F-12/import.log,v retrieving revision 1.5 retrieving revision 1.6 diff -u -p -r1.5 -r1.6 --- import.log 13 Apr 2010 10:54:13 -0000 1.5 +++ import.log 11 Jun 2010 18:52:01 -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:F-12:mldonkey-3.0.1-2.fc12.src.rpm:1271155993 +mldonkey-3_0_2-1_fc12:F-12:mldonkey-3.0.2-1.fc12.src.rpm:1276282195 Index: mldonkey.spec =================================================================== RCS file: /cvs/pkgs/rpms/mldonkey/F-12/mldonkey.spec,v retrieving revision 1.9 retrieving revision 1.10 diff -u -p -r1.9 -r1.10 --- mldonkey.spec 13 Apr 2010 10:54:14 -0000 1.9 +++ mldonkey.spec 11 Jun 2010 18:52:01 -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(a)gmail.com> 3.0.2-1 +- Ver. 3.0.2 + * Mon Mar 15 2010 Peter Lemenkov <lemenkov(a)gmail.com> 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/F-12/sources,v retrieving revision 1.5 retrieving revision 1.6 diff -u -p -r1.5 -r1.6 --- sources 13 Apr 2010 10:54:14 -0000 1.5 +++ sources 11 Jun 2010 18:52:01 -0000 1.6 @@ -1 +1 @@ -b0c3be56f2335b2e8a1749c0e10fa29c mldonkey-3.0.1.tar.bz2 +bed733181ec3634cdf0073085eed0110 mldonkey-3.0.2.tar.bz2

1 0

rpms/mldonkey/F-13 .cvsignore, 1.5, 1.6 import.log, 1.5, 1.6 mldonkey.spec, 1.9, 1.10 sources, 1.5, 1.6
by Peter Lemenkov 12 Jun '10

12 Jun '10

Author: peter Update of /cvs/pkgs/rpms/mldonkey/F-13 In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv31544/F-13 Modified Files: .cvsignore import.log mldonkey.spec sources Log Message: Ver. 3.0.2 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/mldonkey/F-13/.cvsignore,v retrieving revision 1.5 retrieving revision 1.6 diff -u -p -r1.5 -r1.6 --- .cvsignore 13 Apr 2010 10:52:46 -0000 1.5 +++ .cvsignore 11 Jun 2010 18:43:31 -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/F-13/import.log,v retrieving revision 1.5 retrieving revision 1.6 diff -u -p -r1.5 -r1.6 --- import.log 13 Apr 2010 10:52:46 -0000 1.5 +++ import.log 11 Jun 2010 18:43:31 -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:F-13:mldonkey-3.0.1-2.fc12.src.rpm:1271155937 +mldonkey-3_0_2-1_fc12:F-13:mldonkey-3.0.2-1.fc12.src.rpm:1276281779 Index: mldonkey.spec =================================================================== RCS file: /cvs/pkgs/rpms/mldonkey/F-13/mldonkey.spec,v retrieving revision 1.9 retrieving revision 1.10 diff -u -p -r1.9 -r1.10 --- mldonkey.spec 13 Apr 2010 10:52:46 -0000 1.9 +++ mldonkey.spec 11 Jun 2010 18:43:31 -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(a)gmail.com> 3.0.2-1 +- Ver. 3.0.2 + * Mon Mar 15 2010 Peter Lemenkov <lemenkov(a)gmail.com> 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/F-13/sources,v retrieving revision 1.5 retrieving revision 1.6 diff -u -p -r1.5 -r1.6 --- sources 13 Apr 2010 10:52:46 -0000 1.5 +++ sources 11 Jun 2010 18:43:31 -0000 1.6 @@ -1 +1 @@ -b0c3be56f2335b2e8a1749c0e10fa29c mldonkey-3.0.1.tar.bz2 +bed733181ec3634cdf0073085eed0110 mldonkey-3.0.2.tar.bz2

1 0

rpms/mldonkey/devel .cvsignore, 1.5, 1.6 import.log, 1.5, 1.6 mldonkey.spec, 1.9, 1.10 sources, 1.5, 1.6
by Peter Lemenkov 12 Jun '10

12 Jun '10

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(a)gmail.com> 3.0.2-1 +- Ver. 3.0.2 + * Mon Mar 15 2010 Peter Lemenkov <lemenkov(a)gmail.com> 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

1 0

File mldonkey-3.0.2.tar.bz2 uploaded to lookaside cache by peter
by Peter Lemenkov 12 Jun '10

12 Jun '10

A file has been added to the lookaside cache for mldonkey: bed733181ec3634cdf0073085eed0110 mldonkey-3.0.2.tar.bz2

1 0

[Bug 533948] New: please consider changing the requires from /usr/lib/perl5/5.10.0/i386-linux-thread-multi/CORE/libperl.so to perl-libs%{?_isa}
by Red Hat Bugzilla 09 Jun '10

09 Jun '10

Please do not reply directly to this email. All additional comments should be made in the comments box of this bug. Summary: please consider changing the requires from /usr/lib/perl5/5.10.0/i386-linux-thread-multi/CORE/libperl.so to perl-libs%{?_isa} https://bugzilla.redhat.com/show_bug.cgi?id=533948 Summary: please consider changing the requires from /usr/lib/perl5/5.10.0/i386-linux-thread-multi/CORE/lib perl.so to perl-libs%{?_isa} Product: Fedora Version: rawhide Platform: All OS/Version: Linux Status: NEW Severity: medium Priority: medium Component: ocaml-perl4caml AssignedTo: rjones(a)redhat.com ReportedBy: svidal(a)redhat.com QAContact: extras-qa(a)fedoraproject.org CC: rjones(a)redhat.com, fedora-ocaml-list(a)redhat.com Classification: Fedora Target Release: --- Please consider changing the requires from a file-requires to a %{?_isa} requires -- Configure bugmail: https://bugzilla.redhat.com/userprefs.cgi?tab=email ------- You are receiving this mail because: ------- You are on the CC list for the bug.

1 4

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

Ocaml-devel June 2010