[mldonkey] Ver. 3.0.3
Peter Lemenkov
peter at fedoraproject.org
Sun Aug 15 11:56:01 UTC 2010
commit c263832083407662968e565f1d1fab0d2a28e52a
Author: Peter Lemenkov <lemenkov at gmail.com>
Date: Sun Aug 15 15:55:18 2010 +0400
Ver. 3.0.3
Signed-off-by: Peter Lemenkov <lemenkov at gmail.com>
...=> mldonkey-0001-Init-script-enhancements.patch | 45 ++++++++++++++++---
...ng.patch => mldonkey-0002-Fix-DSO-linking.patch | 21 ++++++++-
mldonkey-gui.desktop | 3 +-
mldonkey.spec | 23 ++++++++--
sources | 2 +-
5 files changed, 76 insertions(+), 18 deletions(-)
---
diff --git a/mldonkey-initscript.patch b/mldonkey-0001-Init-script-enhancements.patch
similarity index 68%
rename from mldonkey-initscript.patch
rename to mldonkey-0001-Init-script-enhancements.patch
index 75ceead..a79d390 100644
--- a/mldonkey-initscript.patch
+++ b/mldonkey-0001-Init-script-enhancements.patch
@@ -1,5 +1,18 @@
---- packages/rpm/mldonkey.init~ 2003-05-09 10:12:30.000000000 +0400
-+++ packages/rpm/mldonkey.init 2010-01-26 17:25:03.748635819 +0300
+From 7f73b5b843ae2e48644307cdabac93876c1c1953 Mon Sep 17 00:00:00 2001
+From: Peter Lemenkov <lemenkov at gmail.com>
+Date: Sun, 15 Aug 2010 15:46:10 +0400
+Subject: [PATCH 1/2] Init-script enhancements
+
+Signed-off-by: Peter Lemenkov <lemenkov at gmail.com>
+---
+ packages/rpm/mldonkey.init | 71 ++++++++++++++++++++++++++++++---------
+ packages/rpm/mldonkey.sysconfig | 3 ++
+ 2 files changed, 58 insertions(+), 16 deletions(-)
+
+diff --git a/packages/rpm/mldonkey.init b/packages/rpm/mldonkey.init
+index 536a88a..8fa6f6f 100755
+--- a/packages/rpm/mldonkey.init
++++ b/packages/rpm/mldonkey.init
@@ -4,7 +4,7 @@
#
# Laurent Culioli <laurent at pschit.net>
@@ -9,11 +22,16 @@
# description: Mldonkey is client to access multiple peer-to-peer network
# processname: mldonkey
# config: /etc/sysconfig/mldonkey
-@@ -15,11 +15,19 @@
- # Source some options
+@@ -12,14 +12,23 @@
+ # Source function library.
+ . /etc/init.d/functions
+
+-# Source some options
++# User-defined options
. /etc/sysconfig/mldonkey
+[ -z $LOGFILE ] && LOGFILE="/dev/null"
++[ -z $LOG_TO_SYSLOG ] && LOG_TO_SYSLOG="yes"
+
RETVAL=0
@@ -29,7 +47,7 @@
# Source networking configuration.
. /etc/sysconfig/network
-@@ -27,17 +35,35 @@
+@@ -27,17 +36,35 @@ fullpath=/usr/bin/mlnet
[ ${NETWORKING} = "no" ] && exit 0
start() {
@@ -45,7 +63,7 @@
+ cd $DIRECTORY
+ daemon --user mldonkey --check mldonkey $NICE "\
+ $fullpath \
-+ -log_to_syslog yes \
++ -log_to_syslog $LOG_TO_SYSLOG \
+ -log_file $LOGFILE \
+ -pid $piddir \
+ $ADDON_PARAMS > /dev/null 2>&1 & \
@@ -74,7 +92,7 @@
}
-@@ -49,15 +75,27 @@
+@@ -49,15 +76,27 @@ case "$1" in
stop)
stop
;;
@@ -107,3 +125,16 @@
+ RETVAL=2
esac
exit $RETVAL
+diff --git a/packages/rpm/mldonkey.sysconfig b/packages/rpm/mldonkey.sysconfig
+index 9f3d82f..98a2b5d 100755
+--- a/packages/rpm/mldonkey.sysconfig
++++ b/packages/rpm/mldonkey.sysconfig
+@@ -1,2 +1,5 @@
+ NICE=+2
+ DIRECTORY=/var/lib/mldonkey
++LOGFILE="/dev/null"
++LOG_TO_SYSLOG=yes
++
+--
+1.7.2.1
+
diff --git a/mldonkey-DSO-linking.patch b/mldonkey-0002-Fix-DSO-linking.patch
similarity index 63%
rename from mldonkey-DSO-linking.patch
rename to mldonkey-0002-Fix-DSO-linking.patch
index 57a72ee..75297f7 100644
--- a/mldonkey-DSO-linking.patch
+++ b/mldonkey-0002-Fix-DSO-linking.patch
@@ -1,6 +1,18 @@
---- 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 @@
+From 8068fe31da51ddc722c7f2b77b28a3c81b5e8e4c Mon Sep 17 00:00:00 2001
+From: Peter Lemenkov <lemenkov at gmail.com>
+Date: Sun, 15 Aug 2010 15:46:53 +0400
+Subject: [PATCH 2/2] Fix DSO linking
+
+Signed-off-by: Peter Lemenkov <lemenkov at gmail.com>
+---
+ config/Makefile.in | 4 ++--
+ 1 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/config/Makefile.in b/config/Makefile.in
+index 50c8b72..6fcc726 100644
+--- a/config/Makefile.in
++++ b/config/Makefile.in
+@@ -613,8 +613,8 @@ install:: opt
ifneq ("$(GUI)" , "no")
ifeq ("$(GUI)", "newgui2")
SUBDIRS += $(SRC_GUI) $(SRC_GUI)/x11 $(SRC_GUI)/win32 $(ICONS_CHOICE) +lablgtk2
@@ -11,3 +23,6 @@
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)
+--
+1.7.2.1
+
diff --git a/mldonkey-gui.desktop b/mldonkey-gui.desktop
index 499ef0e..965d0f0 100644
--- a/mldonkey-gui.desktop
+++ b/mldonkey-gui.desktop
@@ -4,5 +4,4 @@ Type=Application
GenericName=MlDonkey peer-to-peer client
Exec=mlgui
Icon=mldonkey
-Categories=Network;
-Encoding=UTF-8
+Categories=GTK;Network;P2P;
diff --git a/mldonkey.spec b/mldonkey.spec
index 158920d..a7f296b 100644
--- a/mldonkey.spec
+++ b/mldonkey.spec
@@ -1,5 +1,5 @@
Name: mldonkey
-Version: 3.0.2
+Version: 3.0.3
Release: 1%{?dist}
Summary: Client for several P2P networks
License: GPLv2+
@@ -8,8 +8,8 @@ Source1: mldonkey-gui.desktop
Source8: mldonkey_df_monitor.crond
Source9: mldonkey_df_monitor.sh
Source11: mldonkey.logrotate
-Patch0: mldonkey-initscript.patch
-Patch1: mldonkey-DSO-linking.patch
+Patch1: mldonkey-0001-Init-script-enhancements.patch
+Patch2: mldonkey-0002-Fix-DSO-linking.patch
URL: http://mldonkey.sourceforge.net
Group: Applications/Internet
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -114,7 +114,11 @@ it encrypted.
Summary: Easy way to download a ed2k-link from Konqueror
Group: User Interface/Desktops
Requires: perl(LWP::UserAgent)
+%if 0%{?fedora}
Requires: kde-filesystem
+%else
+Requires: kdelibs
+%endif
%description -n konqueror-mldonkey-ed2k-support
@@ -140,9 +144,9 @@ You need to edit %{_sysconfdir}/sysconfig/mldonkey_submit
%prep
%setup -q
-%patch0 -p0 -b .fedora
+%patch1 -p1 -b .fedora
%if 0%{?fedora}
-%patch1 -p0 -b .DSO_linking
+%patch2 -p1 -b .DSO_linking
%endif
# Let's make rpmlint happy
sed -i 's|\r||g' distrib/ed2k_submit/README.MLdonkeySubmit
@@ -203,6 +207,7 @@ install packages/rpm/mldonkey-icon-48.png -D -m 644 $RPM_BUILD_ROOT%{_datadir}/i
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}
+desktop-file-validate $RPM_BUILD_ROOT%{_datadir}/applications/*.desktop
%endif
# Send email when mldonkey runs out of allowed disk space
@@ -353,6 +358,14 @@ fi
%changelog
+* Fri Aug 13 2010 Peter Lemenkov <lemenkov at gmail.com> 3.0.3-1
+- Ver. 3.0.3
+- Fixed rhbz #616128
+- Fixed rhbz #589261 (forced log to syslog)
+
+* Thu Aug 12 2010 Peter Lemenkov <lemenkov at gmail.com> 3.0.2-2
+- Fixed rhbz #623627
+
* Fri Jun 11 2010 Peter Lemenkov <lemenkov at gmail.com> 3.0.2-1
- Ver. 3.0.2
diff --git a/sources b/sources
index 7bc9bf0..64be627 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-bed733181ec3634cdf0073085eed0110 mldonkey-3.0.2.tar.bz2
+b5b5252fe60b5ec52396c9f58b7cb577 mldonkey-3.0.3.tar.bz2
More information about the scm-commits
mailing list