diff --git a/FIXME.diff b/FIXME.diff new file mode 100644 index 0000000..3288889 --- /dev/null +++ b/FIXME.diff @@ -0,0 +1,13 @@ +Index: libbtcore/download/webseed.cpp +=================================================================== +--- libbtcore/download/webseed.cpp (revision 821097) ++++ libbtcore/download/webseed.cpp (working copy) +@@ -366,7 +366,7 @@ + + void WebSeed::onExcluded(Uint32 from,Uint32 to) + { +- if (from <= first_chunk <= to && from <= last_chunk <= to) ++ if (from <= first_chunk && first_chunk <= to && from <= last_chunk && last_chunk <= to) + reset(); + } + } diff --git a/dndfile.diff b/dndfile.diff new file mode 100644 index 0000000..38e4e05 --- /dev/null +++ b/dndfile.diff @@ -0,0 +1,11 @@ +--- libbtcore/diskio/multifilecache.cpp ++++ libbtcore/diskio/multifilecache.cpp +@@ -343,7 +343,7 @@ namespace bt + // then make the file + if (dnd) + { +- bt::Touch(tmpdir + "dnd" + bt::DirSeparator() + fpath); ++ bt::Touch(tmpdir + "dnd" + bt::DirSeparator() + fpath + ".dnd"); + } + else + { diff --git a/icons.tar.bz2 b/icons.tar.bz2 new file mode 100644 index 0000000..0e221ca --- /dev/null +++ b/icons.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:d1bd50231bbc51fa43f2c58c598b9fa600e0c320b3bc1beb5c71aeb9312e87b2 +size 83588 diff --git a/ktorrent-3.0.2.tar.bz2 b/ktorrent-3.0.2.tar.bz2 deleted file mode 100644 index 8eb0f5e..0000000 --- a/ktorrent-3.0.2.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:7ecbea27b25535f41fa4101b6b76c1ad36653e300b7fcaf074f9dac212d24d9f -size 2051053 diff --git a/ktorrent-3.1.tar.bz2 b/ktorrent-3.1.tar.bz2 new file mode 100644 index 0000000..c9a474f --- /dev/null +++ b/ktorrent-3.1.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:ff5d3bdb351f7bdbb643a36411e856d06be3b932ff15d659e0197adddb9df04a +size 2314512 diff --git a/ktorrent.changes b/ktorrent.changes index d0a4041..52c4ef3 100644 --- a/ktorrent.changes +++ b/ktorrent.changes @@ -1,3 +1,24 @@ +------------------------------------------------------------------- +Mon Jun 16 10:04:23 CEST 2008 - stbinner@suse.de + +- update to version 3.1: + * HTTP webseeding + * A mediaplayer plugin, supporting audio and video + * Preview sizes can now be configured + * A location column has been added in the main view + * Assured download and upload speeds per torrent + * Group policies, set default speed limits, max seed time, max + ratio and default download location for all torrents of group + * A feature to suppress sleep when torrents are running + * A redesigned tracker tab, now also showing how many times a + torrent was downloaded + * Trackers can now be disabled or enabled + +------------------------------------------------------------------- +Sat Jun 14 10:21:40 CEST 2008 - schwab@suse.de + +- Fix creation of dnd files. + ------------------------------------------------------------------- Fri May 16 19:43:25 CEST 2008 - aj@suse.de diff --git a/ktorrent.spec b/ktorrent.spec index 4dd60e8..b61e928 100644 --- a/ktorrent.spec +++ b/ktorrent.spec @@ -1,5 +1,5 @@ # -# spec file for package ktorrent (Version 3.0.2) +# spec file for package ktorrent (Version 3.1) # # Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -20,18 +20,21 @@ Url: http://ktorrent.pwsp.net/ License: GPL v2 or later Group: Productivity/Networking/File-Sharing Summary: KDE BitTorrent Client -Version: 3.0.2 -Release: 14 +Version: 3.1 +Release: 1 BuildRoot: %{_tmppath}/%{name}-%{version}-build %define rversion %version Source: %{name}-%{rversion}.tar.bz2 +Source2: icons.tar.bz2 Patch2: remove-links.diff Patch4: no-geoip-db.diff -Patch5: largefile-support-806381.diff +Patch6: dndfile.diff +Patch7: FIXME.diff %if %suse_version > 1020 Requires: %{name}-lang = %{version} %endif %kde4_runtime_requires +Requires: oxygen-icon-theme %description Torrent is a BitTorrent program for KDE. Its main features are: * @@ -70,7 +73,9 @@ Authors: %setup -q -n %{name}-%{version} %patch2 %patch4 -%patch5 +%patch6 +%patch7 +tar xfj %{SOURCE2} %build %cmake_kde4 -d build -- -DENABLE_DHT_SUPPORT=false @@ -112,23 +117,32 @@ Authors: /usr/%_lib/kde4/ktstatsplugin.so /usr/%_lib/kde4/ktupnpplugin.so /usr/%_lib/kde4/ktwebinterfaceplugin.so +/usr/%_lib/kde4/ktmediaplayerplugin.so /usr/%_lib/libbtcore.so.* /usr/%_lib/libktcore.so.* /usr/%_lib/libktupnp.so.* /usr/share/applications/kde4/ktorrent.desktop /usr/share/icons/hicolor/*/apps/ktorrent.* /usr/share/icons/hicolor/*/mimetypes/torrent.* -/usr/share/icons/hicolor/*/actions/ktencrypted.* -/usr/share/icons/hicolor/*/actions/ktremove.* -/usr/share/icons/hicolor/*/actions/ktstart.* -/usr/share/icons/hicolor/*/actions/ktstart_all.* -/usr/share/icons/hicolor/*/actions/ktstop.* -/usr/share/icons/hicolor/*/actions/ktstop_all.* -/usr/share/icons/hicolor/*/actions/ktplugins.* -/usr/share/icons/hicolor/*/actions/ktinfowidget.* -/usr/share/icons/hicolor/*/actions/ktqueuemanager.* -/usr/share/icons/hicolor/*/actions/ktupnp.* -/usr/share/icons/hicolor/*/places/ktprefdownloads.* +/usr/share/icons/hicolor/*/actions/ +/usr/share/icons/hicolor/*/actions/kt-change-tracker.* +/usr/share/icons/hicolor/*/actions/kt-check-data.* +/usr/share/icons/hicolor/*/actions/kt-chunks.* +/usr/share/icons/hicolor/*/actions/kt-info-widget.* +/usr/share/icons/hicolor/*/actions/kt-pause.* +/usr/share/icons/hicolor/*/actions/kt-queue-manager.* +/usr/share/icons/hicolor/*/actions/kt-remove.* +/usr/share/icons/hicolor/*/actions/kt-restore-defaults.* +/usr/share/icons/hicolor/*/actions/kt-set-max-download-speed.* +/usr/share/icons/hicolor/*/actions/kt-set-max-upload-speed.* +/usr/share/icons/hicolor/*/actions/kt-show-hide.* +/usr/share/icons/hicolor/*/actions/kt-show-statusbar.* +/usr/share/icons/hicolor/*/actions/kt-speed-limits.* +/usr/share/icons/hicolor/*/actions/kt-start-all.* +/usr/share/icons/hicolor/*/actions/kt-start.* +/usr/share/icons/hicolor/*/actions/kt-stop-all.* +/usr/share/icons/hicolor/*/actions/kt-stop.* +/usr/share/icons/hicolor/*/actions/kt-upnp.* /usr/share/kde4/apps/cmake/modules/FindBTCore.cmake /usr/share/kde4/apps/ktorrent /usr/share/kde4/services/ktbwschedulerplugin.desktop @@ -140,6 +154,7 @@ Authors: /usr/share/kde4/services/ktstatsplugin.desktop /usr/share/kde4/services/ktupnpplugin.desktop /usr/share/kde4/services/ktwebinterfaceplugin.desktop +/usr/share/kde4/services/ktmediaplayerplugin.desktop /usr/share/kde4/servicetypes/ktorrentplugin.desktop %files devel @@ -150,6 +165,21 @@ Authors: /usr/include/libbtcore %changelog +* Mon Jun 16 2008 stbinner@suse.de +- update to version 3.1: + * HTTP webseeding + * A mediaplayer plugin, supporting audio and video + * Preview sizes can now be configured + * A location column has been added in the main view + * Assured download and upload speeds per torrent + * Group policies, set default speed limits, max seed time, max + ratio and default download location for all torrents of group + * A feature to suppress sleep when torrents are running + * A redesigned tracker tab, now also showing how many times a + torrent was downloaded + * Trackers can now be disabled or enabled +* Sat Jun 14 2008 schwab@suse.de +- Fix creation of dnd files. * Fri May 16 2008 aj@suse.de - Add missing new line to spec file. * Thu May 15 2008 dmueller@suse.de diff --git a/largefile-support-806381.diff b/largefile-support-806381.diff deleted file mode 100644 index 8880bbc..0000000 --- a/largefile-support-806381.diff +++ /dev/null @@ -1,17 +0,0 @@ ---- libbtcore/diskio/cachefile.cpp -+++ libbtcore/diskio/cachefile.cpp -@@ -484,9 +484,13 @@ namespace bt - openFile(READ); - close_again = true; - } -- -+#ifdef HAVE_FSTAT64 -+ struct stat64 sb; -+ if (fstat64(fd,&sb) == 0) -+#else - struct stat sb; - if (fstat(fd,&sb) == 0) -+#endif - { - ret = (Uint64)sb.st_blocks * 512; - }