[mldonkey/f18: 5/6] Major upgrade.

Christopher Meng cicku at fedoraproject.org
Tue Aug 13 06:47:04 UTC 2013


commit 254daed868a4ae9c129d39b4ad0342061c9671e4
Author: Koji <koji at fedoraproject.org>
Date:   Tue Aug 13 14:44:15 2013 +0800

    Major upgrade.

 .gitignore                                   |    1 +
 mldonkey-0001-Init-script-enhancements.patch |  140 ----------
 mldonkey-0002-Fix-DSO-linking.patch          |   28 --
 mldonkey-3.0.3-gcc47.patch                   |   31 ---
 mldonkey-gui.desktop                         |    7 -
 mldonkey.spec                                |  357 +++++++++-----------------
 mldonkey_df_monitor.crond                    |    1 -
 mldonkey_df_monitor.sh                       |   27 --
 sources                                      |    2 +-
 9 files changed, 123 insertions(+), 471 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 2db5b16..30a23ab 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
 mldonkey-3.0.2.tar.bz2
 mldonkey-3.0.3.tar.bz2
+/mldonkey-3.1.3.tar.bz2
diff --git a/mldonkey.spec b/mldonkey.spec
index f0d29cb..b0581dc 100644
--- a/mldonkey.spec
+++ b/mldonkey.spec
@@ -1,49 +1,31 @@
-Name:		mldonkey
-Version:	3.0.3
-Release:	10%{?dist}
-Summary:	Client for several P2P networks
-License:	GPLv2+
-Source0:	http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.bz2
-Source1:	mldonkey-gui.desktop
-Source8:	mldonkey_df_monitor.crond
-Source9:	mldonkey_df_monitor.sh
-Source11:	mldonkey.logrotate
-Source12:	mldonkey.service
-#Patch1:		mldonkey-0001-Init-script-enhancements.patch
-Patch2:		mldonkey-0002-Fix-DSO-linking.patch
-Patch3:		mldonkey-3.0.3-gcc47.patch
-URL:		http://mldonkey.sourceforge.net
-Group:		Applications/Internet
-BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-%if 0%{?el5}
-BuildRequires:	ocaml >= 3.09.3
-BuildRequires:	camlp4
-%else
-BuildRequires:	ocaml >= 3.10.0
-BuildRequires:	ocaml-camlp4-devel
-%endif
-%if 0%{?fedora}%{?el6}
-BuildRequires:	ocaml-lablgtk-devel >= 2.10.0
-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%{?el5}
-BuildRequires:	file
-%else
-BuildRequires:	file-devel
-%endif
-ExcludeArch:     sparc64 s390 s390x
-
-Requires:	logrotate
+Name:              mldonkey
+Version:           3.1.3
+Release:           1%{?dist}
+Summary:           Multiple P2P Network Client
+License:           GPLv2+
+URL:               http://mldonkey.sourceforge.net
+Source0:           http://downloads.sourceforge.net/project/%{name}/%{name}/%{version}/%{name}-%{version}.tar.bz2
+Source1:           mldonkey.logrotate
+Source2:           mldonkey.service
+BuildRequires:     bzip2-devel
+BuildRequires:     desktop-file-utils
+BuildRequires:     file-devel
+BuildRequires:     gtk2-devel
+BuildRequires:     librsvg2-devel
+#BuildRequires:     miniupnpc-devel GD
+BuildRequires:     ncurses-devel
+BuildRequires:     ocaml
+BuildRequires:     ocaml-camlp4-devel
+BuildRequires:     ocaml-lablgtk-devel
+BuildRequires:     systemd
+BuildRequires:     zlib-devel
+ExcludeArch:       sparc64 s390 s390x
+
+Requires:          logrotate
 # for kill_mldonkey
-Requires:	perl(LWP::UserAgent)
+Requires:          perl(LWP::UserAgent)
 # for mldonkey_command
-Requires:	nc
-
+Requires:          nc
 
 %description
 MLDonkey is a door to the 'donkey' network, a decentralized network used to
@@ -64,46 +46,33 @@ client, plus some more:
   - You can remember your old queries results in the command-line interface.
   - You can search in the history of all files you have seen on the network.
 
-It can also access other peer-to-peer networks:
+Several different file-sharing networks supported:
+- ED2K (and Kademlia and Overnet)
 - BitTorrent
-- Fasttrack
-- FileTP (wget-clone)
 - DC++
+- (FastTrack, SoulSeek, Gnutella and G2 need work)
 
-
-%if 0%{?fedora}%{?el6}
-%package gui
-Summary:	Graphical frontend for mldonkey based on GTK
-Group:		Applications/Internet
-Requires:	hicolor-icon-theme
+%package           gui
+Summary:           Graphical frontend for mldonkey based on GTK2
+Requires:          hicolor-icon-theme
 # TODO requirement for mldonkey_previewer
-# Requires:	mplayer
-
+# Requires:  mplayer
 
-%description gui
+%description       gui
 The GTK interface for mldonkey provides a convenient way of managing
 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}
-# Necessary for mldonkey_df_monitor.sh
-Requires:	mailx
-Requires(pre):	/usr/sbin/useradd
-#Requires(post): /sbin/chkconfig
-#Requires(preun):/sbin/chkconfig
-#Requires(preun):/sbin/service
-Requires(post): systemd-units
-Requires(preun): systemd-units
-Requires(postun): systemd-units
 
+%package           server
+Summary:           Enables mldonkey as a system daemon
+Requires:          %{name}%{?_isa} = %{version}-%{release}
+Requires(pre):     shadow-utils
+Requires(post):    systemd
+Requires(preun):   systemd
+Requires(postun):  systemd
 
-%description server
+%description       server
 Contains init and configs to launch mldonkey as a service.
 
 NOTE: by default incoming dir is located in %{_localstatedir}/lib/mldonkey/incoming
@@ -114,46 +83,20 @@ NOTE: If you are using a password for your mldonkey, you need to specify
 it in your %{_sysconfdir}/sysconfig/mldonkey, because mldonkey now stores
 it encrypted.
 
+%package -n        konqueror-mldonkey-ed2k-support
+Summary:           Easy way to download a ed2k-link from Konqueror
+Requires:          perl(LWP::UserAgent)
+Requires:          kde-filesystem
 
-%package -n konqueror-mldonkey-ed2k-support
-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
+%description -n    konqueror-mldonkey-ed2k-support
 This package contains tool which gives you an easy way to add an ed2k-link
 (like ed2k://|file|filename.exe|21352658|72b0b287cab7d875ccc1d89ebe910b9g|)
 with a single click to your mldonkey download queue.
 You need to edit %{_sysconfdir}/sysconfig/mldonkey_submit
 
-
-#%package -n mozilla-mldonkey-ed2k-support
-#Summary:	Easy way to download a ed2k-link from Mozilla/Firefox
-#Group:		User Interface/Desktops
-# TODO should it require firefox?
-
-
-#%description -n mozilla-mldonkey-ed2k-support
-#This package contains tool which gives you an easy way to add an ed2k-link
-#(like ed2k://|file|filename.exe|21352658|72b0b287cab7d875ccc1d89ebe910b9g|)
-#with a single click within Mozilla/Firefox to your mldonkey download queue.
-#The tool is a .xpi file to import into mozilla. The file is located in
-#%{_datadir}/%name
-
-
 %prep
 %setup -q
-#%patch1 -p1 -b .fedora
-%if 0%{?fedora}
-%patch2 -p1 -b .DSO_linking
-%patch3 -p1 -b .gcc47
-%endif
+
 # Let's make rpmlint happy
 sed -i 's|\r||g' distrib/ed2k_submit/README.MLdonkeySubmit
 sed -i 's|\r||g' docs/slavanap.txt
@@ -164,155 +107,114 @@ iconv -f iso8859-1 -t UTF-8 distrib/Authors.txt > distrib/Authors.utf8 && mv dis
 chmod 644 src/utils/lib/fst_hash.c
 chmod 644 src/networks/fasttrack/fst_crypt_ml.c
 
-
 %build
-%configure --enable-pthread \
-%if 0%{?fedora}%{?el6}
-           --enable-ocamlver=%(rpm -q --qf '%%{version}' ocaml) \
-           --enable-gui=newgui2 \
-%else
-           --enable-ocamlver=3.09.3 \
-           --disable-gui \
-%endif
-           --disable-gd
-
+./configure --sysconfdir=%{_sysconfdir}/mldonkey \
+            --sharedstatedir=%{_localstatedir}/lib/mldonkey \
+            --localstatedir=%{_localstatedir}/mldonkey \
+            --prefix=%{_prefix} \
+            --disable-rpath \
+            --enable-pthread \
+            --enable-ocamlver=%(rpm -q --qf '%%{version}' ocaml) \
+            --enable-gui=newgui2 \
+            --disable-gd \
+            --enable-checks
+# --enable-upnp-natpmp without libnatpmp
 
 make depend
-# Does not support parallel builds
-make
-make utils
+make %{?_smp_mflags}
+make utils %{?_smp_mflags}
 
+perl -pi -e 's|/etc/sysconfig/mldonkey|/etc/sysconfig/mldonkey_submit|'  distrib/ed2k_submit/mldonkey_submit
 
 %install
-rm -rf $RPM_BUILD_ROOT
 DONT_GPRINTIFY=1
 export DONT_GPRINTIFY
-make DESTDIR=$RPM_BUILD_ROOT install
+make install DESTDIR=%{buildroot}
 
 # core
-install -p -m 755 distrib/mldonkey_command $RPM_BUILD_ROOT%{_bindir}/mldonkey_command
-install -p -m 755 distrib/kill_mldonkey $RPM_BUILD_ROOT%{_bindir}/kill_mldonkey
+install -d -m 755 %{buildroot}%{_bindir}
+install -d -m 755 %{buildroot}%{_libdir}/mldonkey
+install -p -m 755 distrib/mldonkey_command %{buildroot}%{_bindir}/mldonkey_command
+install -p -m 755 distrib/kill_mldonkey %{buildroot}%{_bindir}/kill_mldonkey
 
 # utils
 for util in copysources mld_hash get_range svg_converter subconv; do
-	install -p -m 755 $util $RPM_BUILD_ROOT%{_bindir}/$util ;
+  install -p -m 755 $util %{buildroot}%{_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
+install -p -m 755 make_torrent %{buildroot}%{_bindir}/mldonkey_make_torrent
 
-%if 0%{?fedora}%{?el6}
 # gui
-install -p -m 755 mlguistarter $RPM_BUILD_ROOT%{_bindir}/mlguistarter
+install -p -m 755 mlguistarter %{buildroot}%{_bindir}/mlguistarter
 
 # install preview utility
-install -p -m 755 distrib/mldonkey_previewer $RPM_BUILD_ROOT%{_bindir}/mldonkey_previewer
+install -p -m 755 distrib/mldonkey_previewer %{buildroot}%{_bindir}/mldonkey_previewer
 
 # menu and pixmaps
-install packages/rpm/mldonkey-icon-16.png -D -m 644 $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/16x16/apps/mldonkey.png
-install packages/rpm/mldonkey-icon-32.png -D -m 644 $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/32x32/apps/mldonkey.png
-install packages/rpm/mldonkey-icon-48.png -D -m 644 $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/48x48/apps/mldonkey.png
-install -d -m 755 $RPM_BUILD_ROOT%{_datadir}/pixmaps
-ln -s ../icons/hicolor/48x48/apps/mldonkey.png $RPM_BUILD_ROOT%{_datadir}/pixmaps/mldonkey.png
-
-%if (0%{?fedora} && 0%{?fedora} < 19) || (0%{?rhel} && 0%{?rhel} < 7)
-desktop-file-install --vendor fedora --dir $RPM_BUILD_ROOT%{_datadir}/applications --copy-generic-name-to-name %{SOURCE1}
-%else
-desktop-file-install --dir $RPM_BUILD_ROOT%{_datadir}/applications --copy-generic-name-to-name %{SOURCE1}
-%endif
-desktop-file-validate $RPM_BUILD_ROOT%{_datadir}/applications/*.desktop
-%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
-sed -i 's,/var,%{_localstatedir},g;
-        s,/etc/init.d,%{_initrddir},g;
-        s,/etc,%{_sysconfdir},g' $RPM_BUILD_ROOT%{_sbindir}/mldonkey_df_monitor.sh
-
-install -D -p -m 644 %{SOURCE8} $RPM_BUILD_ROOT%{_sysconfdir}/cron.d/mldonkey_df_monitor
-sed -i 's,/usr/sbin,%{_sbindir},g' $RPM_BUILD_ROOT%{_sysconfdir}/cron.d/mldonkey_df_monitor
+install packages/rpm/mldonkey-icon-16.png -D -m 644 %{buildroot}%{_datadir}/icons/hicolor/16x16/apps/mldonkey.png
+install packages/rpm/mldonkey-icon-32.png -D -m 644 %{buildroot}%{_datadir}/icons/hicolor/32x32/apps/mldonkey.png
+install packages/rpm/mldonkey-icon-48.png -D -m 644 %{buildroot}%{_datadir}/icons/hicolor/48x48/apps/mldonkey.png
+install -d -m 755 %{buildroot}%{_datadir}/pixmaps
+ln -s ../icons/hicolor/48x48/apps/mldonkey.png %{buildroot}%{_datadir}/pixmaps/mldonkey.png
+
+desktop-file-install --dir %{buildroot}%{_datadir}/applications distrib/%{name}.desktop
 
 # create directory for storing log-file
-install -d -m 755 $RPM_BUILD_ROOT%{_localstatedir}/log/mldonkey
+install -d -m 755 %{buildroot}%{_localstatedir}/log/mldonkey
 
 # install logrotate script for  /var/log/mldonkey/mldonkey.log
-install -D -p -m 644 %{SOURCE11} $RPM_BUILD_ROOT%{_sysconfdir}/logrotate.d/mldonkey
-sed -i 's,/var,%{_localstatedir},g' $RPM_BUILD_ROOT%{_sysconfdir}/logrotate.d/mldonkey
+install -pDm644 %{S:1} %{buildroot}%{_sysconfdir}/logrotate.d/mldonkey
+sed -i 's,/var,%{_localstatedir},g' %{buildroot}%{_sysconfdir}/logrotate.d/mldonkey
 
-# install init-scipt
-#install -D -p -m 755 packages/rpm/mldonkey.init $RPM_BUILD_ROOT%{_initrddir}/mldonkey
-#sed -e 's,/etc/init.d,%{_initrddir},g;
-#        s,/etc,%{_sysconfdir},g;
-#        s,/var,%{_localstatedir},g' $RPM_BUILD_ROOT%{_initrddir}/mldonkey
-install -D -p -m 644 %{SOURCE12} $RPM_BUILD_ROOT/%{_unitdir}/mldonkey.service
+install -pDm644 %{S:2} %{buildroot}%{_unitdir}/mldonkey.service
 
 # 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}
+install -d -m 755 %{buildroot}%{_localstatedir}/cache/mldonkey
+install -d -m 755 %{buildroot}%{_localstatedir}/lib/%{name}/incoming
+install -d -m 755 %{buildroot}%{_localstatedir}/run/%{name}
 
 # create downloads.ini
 echo -e \
 "temp_directory = \"%{_localstatedir}/cache/mldonkey\"\n"\
 "incoming_directory = \"%{_localstatedir}/lib/%{name}/incoming\"\n"\
-%if 0%{?fedora}%{?el6}
 "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
-sed -i 's,/var,%{_localstatedir},g' $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/mldonkey
+> %{buildroot}%{_localstatedir}/lib/%{name}/downloads.ini
 
 # ed2k for konqueror support
-install -p -m 755 distrib/ed2k_submit/mldonkey_submit $RPM_BUILD_ROOT%{_bindir}/mldonkey_submit
-install -p -m 644 distrib/ed2k_submit/mldonkey $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/mldonkey_submit
-sed -i 's,myusername,,;s,mypassword,,' $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/mldonkey_submit
-install -D -p -m 644 distrib/ed2k_submit/ed2k.protocol  $RPM_BUILD_ROOT%{_datadir}/services/ed2k.protocol
-
-# ed2k for mozilla support
-# TODO should we unpack it into FF's plugins directory?
-#install -D -p -m 644 distrib/ed2k_mozilla/mldonkey_protocol_handler-2.2.xpi $RPM_BUILD_ROOT%{_datadir}/%{name}/mldonkey_protocol_handler-2.2.xpi
-
-
-%clean
-rm -rf $RPM_BUILD_ROOT
+mkdir -p %{_sysconfdir}/sysconfig
+install -pm 755 distrib/ed2k_submit/mldonkey_submit %{buildroot}%{_bindir}/mldonkey_submit
+install -pDm 644 distrib/ed2k_submit/mldonkey %{buildroot}%{_sysconfdir}/sysconfig/mldonkey_submit
+sed -i 's,myusername,,;s,mypassword,,' %{buildroot}%{_sysconfdir}/sysconfig/mldonkey_submit
+install -pDm644 distrib/ed2k_submit/ed2k.protocol  %{buildroot}%{_datadir}/services/ed2k.protocol
 
+%pre          server
+getent group %{name} >/dev/null || groupadd -r %{name}
+getent passwd %{name} >/dev/null || \
+    useradd -r -g %{name} -d %{_localstatedir}/lib/%{name} -s /bin/bash \
+    -c "MLDonkey server" %{name}
 
-%pre server
-/usr/sbin/useradd -r -d %{_localstatedir}/lib/%{name} \
-                  -c "MlDonkey service" -s /bin/bash mldonkey 2>/dev/null || :
+%post         gui
+touch --no-create %{_datadir}/icons/hicolor &>/dev/null || :
 
+%post         server
+%systemd_post %{S:2}
 
-%post server
-#if [ "$1" == "1" ]; then
-#	/sbin/chkconfig --add mldonkey || :
-#fi
-if [ $1 -eq 1 ] ; then 
-    # Initial installation 
-    /bin/systemctl daemon-reload >/dev/null 2>&1 || :
+%postun       gui
+if [ $1 -eq 0 ] ; then
+    touch --no-create %{_datadir}/icons/hicolor &>/dev/null
+    gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 fi
 
+%posttrans    gui
+gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 
+%preun        server
+%systemd_preun %{S:2}
 
-%preun server
-#if [ "$1" == "0" ]; then
-#	/sbin/service mldonkey stop >/dev/null 2>&1 || :
-#	/sbin/chkconfig --del mldonkey || :
-#fi
-if [ $1 -eq 0 ] ; then
-    # Package removal, not upgrade
-    /bin/systemctl --no-reload disable mldonkey.service > /dev/null 2>&1 || :
-    /bin/systemctl stop mldonkey.service > /dev/null 2>&1 || :
-fi
-
-%postun server
-/bin/systemctl daemon-reload >/dev/null 2>&1 || :
-if [ $1 -ge 1 ] ; then
-    # Package upgrade, not uninstall
-    /bin/systemctl try-restart mldonkey.service >/dev/null 2>&1 || :
-fi
+%postun       server
+%systemd_postun_with_restart %{S:2}
 
 %triggerun -- mldonkey-server < 3.0.3-5
 # Save the current service runlevel info
@@ -324,30 +226,25 @@ fi
 /sbin/chkconfig --del mldonkey >/dev/null 2>&1 || :
 /bin/systemctl try-restart mldonkey.service >/dev/null 2>&1 || :
 
-
 %files
-%defattr(-,root,root)
 %doc Copying.txt distrib/Authors.txt distrib/Bugs.txt distrib/ChangeLog distrib/Developers.txt
 %doc docs
-%{_bindir}/mlnet
-%{_bindir}/mldonkey_command
-%{_bindir}/kill_mldonkey
 %{_bindir}/copysources
 %{_bindir}/get_range
+%{_bindir}/kill_mldonkey
 %{_bindir}/mldonkey_make_torrent
 %{_bindir}/mlbt
 %{_bindir}/mld_hash
 %{_bindir}/mldc
-%{_bindir}/mlgnut
+%{_bindir}/mlnet
+%{_bindir}/mldonkey_command
 %{_bindir}/mldonkey
+%{_bindir}/mlgnut
 %{_bindir}/mlslsk
 %{_bindir}/subconv
 %{_bindir}/svg_converter
 
-
-%if 0%{?fedora}%{?el6}
 %files gui
-%defattr(-,root,root)
 %doc Copying.txt distrib/Authors.txt distrib/Bugs.txt distrib/ChangeLog distrib/Developers.txt
 %{_bindir}/mlbt+gui
 %{_bindir}/mldc+gui
@@ -360,22 +257,13 @@ fi
 %{_bindir}/mlnet+gui
 %{_bindir}/mlslsk+gui
 %{_datadir}/applications/*.desktop
-%{_datadir}/icons/hicolor/16x16/apps/mldonkey.png
-%{_datadir}/icons/hicolor/32x32/apps/mldonkey.png
-%{_datadir}/icons/hicolor/48x48/apps/mldonkey.png
+%{_datadir}/icons/hicolor/*x*/apps/%{name}.png
 %{_datadir}/pixmaps/mldonkey.png
-%endif
-
 
 %files server
-%defattr(-,root,root)
 %doc Copying.txt
-%config(noreplace) %{_sysconfdir}/sysconfig/mldonkey
-%config(noreplace) %{_sysconfdir}/cron.d/mldonkey_df_monitor
-#%%attr(755,root,root) %%{_initrddir}/mldonkey
-%attr(755,root,root) %{_unitdir}/mldonkey.service
 %config(noreplace) %{_sysconfdir}/logrotate.d/mldonkey
-%{_sbindir}/mldonkey_df_monitor.sh
+%{_unitdir}/mldonkey.service
 %attr(750,mldonkey,mldonkey) %dir %{_localstatedir}/log/mldonkey
 %attr(750,mldonkey,mldonkey) %dir %{_localstatedir}/cache/mldonkey
 %attr(750,mldonkey,mldonkey) %dir %{_localstatedir}/lib/mldonkey
@@ -383,22 +271,19 @@ fi
 %attr(770,mldonkey,mldonkey) %dir %{_localstatedir}/lib/mldonkey/incoming
 %config(noreplace) %{_localstatedir}/lib/mldonkey/downloads.ini
 
-
-#%files -n mozilla-mldonkey-ed2k-support
-#%defattr(-,root,root)
-#%doc Copying.txt
-#%{_datadir}/%{name}/mldonkey_protocol_handler-2.2.xpi
-
-
 %files -n konqueror-mldonkey-ed2k-support
-%defattr(-,root,root)
 %doc Copying.txt distrib/ed2k_submit/README.MLdonkeySubmit
 %config(noreplace) %{_sysconfdir}/sysconfig/mldonkey_submit
 %{_bindir}/mldonkey_submit
 %{_datadir}/services/ed2k.protocol
 
+# Prepare to enable UPnP support.
 
 %changelog
+* Sat Aug 10 2013 Christopher Meng <rpm at cicku.me> - 3.1.3-1
+- Major upgrade.
+- SPEC cleanup(systemd macro, obsoleted tags)
+
 * Sat Aug 03 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 3.0.3-10
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
 
diff --git a/sources b/sources
index 64be627..6d1decf 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-b5b5252fe60b5ec52396c9f58b7cb577  mldonkey-3.0.3.tar.bz2
+671f60467a918a9b7c2affef63ff5c25  mldonkey-3.1.3.tar.bz2


More information about the scm-commits mailing list