rpms/mldonkey/F-11 mldonkey-DSO-linking.patch, NONE, 1.1 .cvsignore, 1.4, 1.5 import.log, 1.4, 1.5 mldonkey-initscript.patch, 1.1, 1.2 mldonkey.spec, 1.6, 1.7 sources, 1.4, 1.5
Peter Lemenkov
peter at fedoraproject.org
Tue Apr 13 10:57:15 UTC 2010
- Previous message: rpms/mtkbabel/F-12 .cvsignore, 1.3, 1.4 import.log, 1.2, 1.3 mtkbabel.spec, 1.2, 1.3 sources, 1.3, 1.4
- Next message: rpms/mtkbabel/devel .cvsignore, 1.3, 1.4 import.log, 1.2, 1.3 mtkbabel.spec, 1.2, 1.3 sources, 1.3, 1.4
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: peter
Update of /cvs/pkgs/rpms/mldonkey/F-11
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv3779/F-11
Modified Files:
.cvsignore import.log mldonkey-initscript.patch mldonkey.spec
sources
Added Files:
mldonkey-DSO-linking.patch
Log Message:
Ver. 3.0.1 and fixed DSO linking
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/F-11/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- .cvsignore 14 Mar 2009 08:10:19 -0000 1.4
+++ .cvsignore 13 Apr 2010 10:57:14 -0000 1.5
@@ -1 +1 @@
-mldonkey-3.0.0.tar.bz2
+mldonkey-3.0.1.tar.bz2
Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/mldonkey/F-11/import.log,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- import.log 14 Mar 2009 08:10:19 -0000 1.4
+++ import.log 13 Apr 2010 10:57:14 -0000 1.5
@@ -2,3 +2,4 @@ mldonkey-2_9_6-3_fc10:HEAD:mldonkey-2.9.
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
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-initscript.patch:
mldonkey.init | 68 +++++++++++++++++++++++++++++++++++++++++++++-------------
1 file changed, 53 insertions(+), 15 deletions(-)
Index: mldonkey-initscript.patch
===================================================================
RCS file: /cvs/pkgs/rpms/mldonkey/F-11/mldonkey-initscript.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- mldonkey-initscript.patch 26 Jan 2009 10:55:03 -0000 1.1
+++ mldonkey-initscript.patch 13 Apr 2010 10:57:14 -0000 1.2
@@ -1,7 +1,5 @@
-diff --git a/packages/rpm/mldonkey.init b/packages/rpm/mldonkey.init
-index 536a88a..2291a9b 100755
---- a/packages/rpm/mldonkey.init
-+++ b/packages/rpm/mldonkey.init
+--- packages/rpm/mldonkey.init~ 2003-05-09 10:12:30.000000000 +0400
++++ packages/rpm/mldonkey.init 2010-01-26 17:25:03.748635819 +0300
@@ -4,7 +4,7 @@
#
# Laurent Culioli <laurent at pschit.net>
@@ -11,7 +9,7 @@ index 536a88a..2291a9b 100755
# description: Mldonkey is client to access multiple peer-to-peer network
# processname: mldonkey
# config: /etc/sysconfig/mldonkey
-@@ -15,6 +15,8 @@
+@@ -15,11 +15,19 @@
# Source some options
. /etc/sysconfig/mldonkey
@@ -19,8 +17,19 @@ index 536a88a..2291a9b 100755
+
RETVAL=0
++prog=mldonkey
++
# Path to the mldonkey binarie.
-@@ -27,17 +29,18 @@ fullpath=/usr/bin/mlnet
+ fullpath=/usr/bin/mlnet
+
++lockfile=/var/lock/subsys/$prog
++piddir=/var/run/$prog
++pidfile=$piddir/mlnet.pid
++
+ # Source networking configuration.
+ . /etc/sysconfig/network
+
+@@ -27,17 +35,35 @@
[ ${NETWORKING} = "no" ] && exit 0
start() {
@@ -30,11 +39,22 @@ index 536a88a..2291a9b 100755
- touch /var/lock/subsys/mldonkey
- echo
+ echo -n $"Starting Mldonkey (mlnet): "
-+ cd $DIRECTORY
-+ daemon --user mldonkey --check mldonkey $NICE "$fullpath > $LOGFILE 2>&1 &"
-+ RETVAL=$?
-+ [ $RETVAL -eq 0 ] && touch /var/lock/subsys/mldonkey
++ if status -p $pidfile $prog 2>&1 > /dev/null ; then
++ echo -n $"already started" && warning
++ else
++ cd $DIRECTORY
++ daemon --user mldonkey --check mldonkey $NICE "\
++ $fullpath \
++ -log_to_syslog yes \
++ -log_file $LOGFILE \
++ -pid $piddir \
++ $ADDON_PARAMS > /dev/null 2>&1 & \
++ "
++ RETVAL=$?
++ fi
+ echo
++ [ $RETVAL -eq 0 ] && touch $lockfile
++ return $RETVAL
}
stop() {
- gprintf "Stopping Mldonkey (mlnet): "
@@ -42,18 +62,33 @@ index 536a88a..2291a9b 100755
- rm -fr /var/lock/subsys/mldonkey
- echo
+ echo -n $"Stopping Mldonkey (mlnet): "
-+ killproc $fullpath
-+ rm -fr /var/lock/subsys/mldonkey
++ if ! status -p $pidfile $prog 2>&1 > /dev/null ; then
++ echo -n $"already stopped" && warning
++ else
++ killproc -p $pidfile
++ RETVAL=$?
++ fi
+ echo
++ [ $RETVAL -eq 0 ] && rm -f $lockfile $pidfile
++ return $RETVAL
}
-@@ -53,11 +56,19 @@ case "$1" in
+@@ -49,15 +75,27 @@
+ stop)
+ stop
+ ;;
+- restart|reload)
++ restart|force-reload)
stop
start
;;
-+ condrestart)
-+ if status mldonkey >/dev/null; then
++ reload)
++ echo $"reload unimplemented"
++ RETVAL=3
++ ;;
++ try-restart|condrestart)
++ if status -p $pidfile $prog >/dev/null; then
+ stop
+ start
+ else
@@ -61,12 +96,14 @@ index 536a88a..2291a9b 100755
+ fi
+ ;;
status)
- status mldonkey
+- status mldonkey
++ status -p $pidfile $prog
;;
- *)
- gprintf "Usage: mldonkey {start|stop|restart|reload|status}\n"
+- RETVAL=1
+ *)
-+ echo $"Usage: $0 {start|stop|restart|reload|condrestart|status}"
- RETVAL=1
++ echo $"Usage: $0 {start|stop|restart|try-restart|status}"
++ RETVAL=2
esac
exit $RETVAL
Index: mldonkey.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mldonkey/F-11/mldonkey.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- mldonkey.spec 14 Mar 2009 08:10:19 -0000 1.6
+++ mldonkey.spec 13 Apr 2010 10:57:14 -0000 1.7
@@ -1,6 +1,6 @@
Name: mldonkey
-Version: 3.0.0
-Release: 1%{?dist}
+Version: 3.0.1
+Release: 2%{?dist}
Summary: Client for several P2P networks
License: GPLv2+
Source0: http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.bz2
@@ -9,19 +9,33 @@ 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}
+BuildRequires: ocaml >= 3.09.3
+BuildRequires: camlp4
+%else
BuildRequires: ocaml >= 3.10.0
BuildRequires: ocaml-camlp4-devel
+%endif
+%if 0%{?fedora}
BuildRequires: ocaml-lablgtk-devel >= 2.10.0
-BuildRequires: zlib-devel
BuildRequires: desktop-file-utils
BuildRequires: gtk2-devel >= 2.4.0
BuildRequires: librsvg2-devel >= 2.4.0
+%endif
+BuildRequires: zlib-devel
BuildRequires: bzip2-devel
BuildRequires: ncurses-devel
+%if 0%{?rhel}
+BuildRequires: file
+%else
BuildRequires: file-devel
+%endif
+ExcludeArch: sparc64 s390 s390x
+
Requires: logrotate
# for kill_mldonkey
Requires: perl(LWP::UserAgent)
@@ -55,6 +69,7 @@ It can also access other peer-to-peer ne
- DC++
+%if 0%{?fedora}
%package gui
Summary: Graphical frontend for mldonkey based on GTK
Group: Applications/Internet
@@ -68,13 +83,14 @@ The GTK interface for mldonkey provides
all mldonkey operations. It gives details about conected servers,
downloaded files, friends and lets one search for files in a pleasing
way.
+%endif
%package server
Summary: Enables mldonkey as a system daemon
Group: System Environment/Daemons
Requires: %{name} = %{version}-%{release}
-# Neseccary for mldonkey_df_monitor.sh
+# Necessary for mldonkey_df_monitor.sh
Requires: mailx
Requires(pre): /usr/sbin/useradd
Requires(post): /sbin/chkconfig
@@ -124,7 +140,8 @@ You need to edit %{_sysconfdir}/sysconfi
%prep
%setup -q
-%patch0 -p1 -b .fedora
+%patch0 -p0 -b .fedora
+%patch1 -p0 -b .DSO_linking
# Let's make rpmlint happy
sed -i 's|\r||g' distrib/ed2k_submit/README.MLdonkeySubmit
sed -i 's|\r||g' docs/slavanap.txt
@@ -139,7 +156,11 @@ chmod 644 src/networks/fasttrack/fst_cry
%build
%configure --enable-pthread \
--enable-ocamlver=%(rpm -q --qf '%%{version}' ocaml) \
+%if 0%{?fedora}
--enable-gui=newgui2 \
+%else
+ --disable-gui \
+%endif
--disable-gd
make depend
@@ -165,6 +186,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}
# gui
install -p -m 755 mlguistarter $RPM_BUILD_ROOT%{_bindir}/mlguistarter
@@ -178,6 +200,7 @@ install packages/rpm/mldonkey-icon-48.pn
install -d -m 755 $RPM_BUILD_ROOT%{_datadir}/pixmaps
ln -s ../icons/hicolor/48x48/apps/mldonkey.png $RPM_BUILD_ROOT%{_datadir}/pixmaps/mldonkey.png
desktop-file-install --vendor fedora --dir $RPM_BUILD_ROOT%{_datadir}/applications --copy-generic-name-to-name %{SOURCE1}
+%endif
# Send email when mldonkey runs out of allowed disk space
install -D -p -m 755 %{SOURCE9} $RPM_BUILD_ROOT%{_sbindir}/mldonkey_df_monitor.sh
@@ -204,13 +227,18 @@ sed -e 's,/etc/init.d,%{_initrddir},g;
# Create necessary directories for server
install -d -m 755 $RPM_BUILD_ROOT%{_localstatedir}/cache/mldonkey
install -d -m 755 $RPM_BUILD_ROOT%{_localstatedir}/lib/%{name}/incoming
+install -d -m 755 $RPM_BUILD_ROOT%{_localstatedir}/run/%{name}
# create downloads.ini
-echo "temp_directory = \"%{_localstatedir}/cache/mldonkey\"" > $RPM_BUILD_ROOT%{_localstatedir}/lib/%{name}/downloads.ini
-echo "incoming_directory = \"%{_localstatedir}/lib/%{name}/incoming\"" >> $RPM_BUILD_ROOT%{_localstatedir}/lib/%{name}/downloads.ini
-echo "mldonkey_gui = \"%{_bindir}/mlgui\"" >> $RPM_BUILD_ROOT%{_localstatedir}/lib/%{name}/downloads.ini
-echo "mldonkey_bin = \"%{_bindir}/mldonkey\"" >> $RPM_BUILD_ROOT%{_localstatedir}/lib/%{name}/downloads.ini
-echo "log_file = \"%{_localstatedir}/log/mldonkey/mldonkey.log\"" >> $RPM_BUILD_ROOT%{_localstatedir}/lib/%{name}/downloads.ini
+echo -e \
+"temp_directory = \"%{_localstatedir}/cache/mldonkey\"\n"\
+"incoming_directory = \"%{_localstatedir}/lib/%{name}/incoming\"\n"\
+%if 0%{?fedora}
+"mldonkey_gui = \"%{_bindir}/mlgui\"\n"\
+%endif
+"mldonkey_bin = \"%{_bindir}/mldonkey\"\n"\
+"log_file = \"%{_localstatedir}/log/mldonkey/mldonkey.log\"\n"\
+> $RPM_BUILD_ROOT%{_localstatedir}/lib/%{name}/downloads.ini
# Install sysconfig file
install -D -p -m 644 packages/rpm/mldonkey.sysconfig $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/mldonkey
@@ -269,6 +297,7 @@ fi
%{_bindir}/svg_converter
+%if 0%{?fedora}
%files gui
%defattr(-,root,root)
%doc Copying.txt distrib/Authors.txt distrib/Bugs.txt distrib/ChangeLog distrib/Developers.txt
@@ -287,6 +316,7 @@ fi
%{_datadir}/icons/hicolor/32x32/apps/mldonkey.png
%{_datadir}/icons/hicolor/48x48/apps/mldonkey.png
%{_datadir}/pixmaps/mldonkey.png
+%endif
%files server
@@ -300,6 +330,7 @@ fi
%attr(750,mldonkey,mldonkey) %dir %{_localstatedir}/log/mldonkey
%attr(750,mldonkey,mldonkey) %dir %{_localstatedir}/cache/mldonkey
%attr(750,mldonkey,mldonkey) %dir %{_localstatedir}/lib/mldonkey
+%attr(755,mldonkey,mldonkey) %dir %{_localstatedir}/run/mldonkey
%attr(770,mldonkey,mldonkey) %dir %{_localstatedir}/lib/mldonkey/incoming
%config(noreplace) %{_localstatedir}/lib/mldonkey/downloads.ini
@@ -319,6 +350,21 @@ fi
%changelog
+* Mon Mar 15 2010 Peter Lemenkov <lemenkov at 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 at gmail.com> 3.0.1-1
+- Ver. 3.0.1
+- Greatly changed init-script
+- Disabled GUI for EPEL
+
+* Tue Sep 22 2009 Dennis Gilmore <dennis at ausil.us> - 3.0.0-3
+- ExlcudeArch sparc64 s390 s390x since they dont have ocaml
+
+* Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 3.0.0-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
* Sat Mar 14 2009 Peter Lemenkov <lemenkov at gmail.com> 3.0.0-1
- Ver. 3.0.0
- Dropped patch1
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/mldonkey/F-11/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- sources 14 Mar 2009 08:10:20 -0000 1.4
+++ sources 13 Apr 2010 10:57:14 -0000 1.5
@@ -1 +1 @@
-d45b37f334a4008ed15343dfb2caf453 mldonkey-3.0.0.tar.bz2
+b0c3be56f2335b2e8a1749c0e10fa29c mldonkey-3.0.1.tar.bz2
- Previous message: rpms/mtkbabel/F-12 .cvsignore, 1.3, 1.4 import.log, 1.2, 1.3 mtkbabel.spec, 1.2, 1.3 sources, 1.3, 1.4
- Next message: rpms/mtkbabel/devel .cvsignore, 1.3, 1.4 import.log, 1.2, 1.3 mtkbabel.spec, 1.2, 1.3 sources, 1.3, 1.4
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the scm-commits
mailing list