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@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
+
* Tue Jan 26 2010 Peter Lemenkov <lemenkov@xxxxxxxxx> 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
_______________________________________________
ocaml-devel mailing list
ocaml-devel@xxxxxxxxxxxxxxxxxxxxxxx
https://admin.fedoraproject.org/mailman/listinfo/ocaml-devel
