Accepting request 63780 from KDE:Distro:Factory
Accepted submit request 63780 from user coolo OBS-URL: https://build.opensuse.org/request/show/63780 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/libktorrent?expand=0&rev=14
This commit is contained in:
Sascha Peilicke
Git OBS Bridge
parent
d959ef0294
commit
bbe83d616c
@ -1,46 +0,0 @@
|
||||
index fd5084d..42a2138 100644
|
||||
Index: src/peer/peermanager.cpp
|
||||
===================================================================
|
||||
--- src/peer/peermanager.cpp.orig 2010-12-30 14:38:17.000000000 +0200
|
||||
+++ src/peer/peermanager.cpp 2011-01-15 16:01:48.761678784 +0200
|
||||
@@ -430,6 +430,8 @@ namespace bt
|
||||
delete d->superseeder;
|
||||
d->superseeder = 0;
|
||||
}
|
||||
+
|
||||
+ closeAllConnections();
|
||||
}
|
||||
|
||||
Peer* PeerManager::findPeer(Uint32 peer_id)
|
||||
@@ -548,6 +550,7 @@ namespace bt
|
||||
|
||||
void PeerManager::setSuperSeeding(bool on,const BitSet & chunks)
|
||||
{
|
||||
+ Q_UNUSED(chunks);
|
||||
if ((d->superseeder && on) || (!d->superseeder && !on))
|
||||
return;
|
||||
|
||||
@@ -571,9 +574,8 @@ namespace bt
|
||||
pp.port = addr.port();
|
||||
pp.local = false;
|
||||
d->potential_peers.insert(std::make_pair(pp.ip,pp));
|
||||
+ p->kill();
|
||||
}
|
||||
-
|
||||
- closeAllConnections();
|
||||
}
|
||||
|
||||
void PeerManager::allowChunk(PeerInterface* peer, Uint32 chunk)
|
||||
Index: src/torrent/torrentcontrol.cpp
|
||||
===================================================================
|
||||
--- src/torrent/torrentcontrol.cpp.orig 2010-12-30 14:38:17.000000000 +0200
|
||||
+++ src/torrent/torrentcontrol.cpp 2011-01-15 16:03:44.113678723 +0200
|
||||
@@ -496,8 +496,6 @@ namespace bt
|
||||
|
||||
pman->savePeerList(tordir + "peer_list");
|
||||
pman->stop();
|
||||
- pman->closeAllConnections();
|
||||
- pman->clearDeadPeers();
|
||||
cman->stop();
|
||||
|
||||
stats.running = false;
|
||||
@ -1,3 +0,0 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:979949177a192f45d17c050d747a3eee4785db3ade0597372a3422878ea94822
|
||||
size 974551
|
||||
3
libktorrent-1.1rc1.tar.bz2
Normal file
3
libktorrent-1.1rc1.tar.bz2
Normal file
@ -0,0 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:6392c77946fd523904cdd29148264fdd0b5bbcbd4abe07cecbf9ee00f2f1d1b4
|
||||
size 967260
|
||||
@ -1,3 +0,0 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:940fbbc7f44d6f1890f19b25d67d909c0a6dcb59ea3612bfc470e3415fe447bf
|
||||
size 710185
|
||||
@ -1,3 +1,30 @@
|
||||
-------------------------------------------------------------------
|
||||
Sat Feb 26 10:30:55 UTC 2011 - coolo@novell.com
|
||||
|
||||
- recommend -lang package again
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Fri Feb 25 20:12:14 UTC 2011 - asterios.dramis@gmail.com
|
||||
|
||||
- Update to libktorrent-1.0.99rc1 (1.1rc1):
|
||||
* Fix bug in UPnP so that it works properly with D-Link DIR 635 routers
|
||||
* Fix crash due to manipulating timers in the wrong thread (261903)
|
||||
* Fix compiler warning in TimeEstimator (262618)
|
||||
* Fix crash due to cleaning up timer in the wrong thread (260712)
|
||||
* Fix crash due to not properly cleaning up Peers and everything related when
|
||||
switching to superseeding mode (261529)
|
||||
* Fix invalid read in utp timer cleanup code (263800)
|
||||
* Fix crashes at exit (264378, 256639)
|
||||
- Spec file updates:
|
||||
* Changes based on rpmdevtools templates and spec-cleaner run.
|
||||
* Updates in Summary:, Url: and %description.
|
||||
* Changed License: to GPLv2+ and LGPLv2+ and MIT and BSD.
|
||||
* Updates in Buildrequires:, %build, %install and %files sections.
|
||||
* Use Suggests: and not Recommends: for lang package.
|
||||
* Removed %pre /sbin/ldconfig section (not needed).
|
||||
- Removed libktorrent-1.1beta1-sprseedcrash.patch (fixed upstream).
|
||||
- Removed libktorrent-po.tar.bz2 (not needed, its included in the package).
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Sat Jan 15 14:09:54 UTC 2011 - davejplater@gmail.com
|
||||
|
||||
|
||||
117
libktorrent.spec
117
libktorrent.spec
@ -15,45 +15,41 @@
|
||||
# Please submit bugfixes or comments via http://bugs.opensuse.org/
|
||||
#
|
||||
|
||||
|
||||
%define gitver git20101211
|
||||
%define srcversion 1.1beta1
|
||||
%define debug_package_requires libktorrent3 = %{version}-%{release}
|
||||
|
||||
Name: libktorrent
|
||||
BuildRequires: fdupes gmp-devel kdebase4-workspace-devel libkdepimlibs4-devel libqca2-devel taglib-devel
|
||||
Url: http://ktorrent.pwsp.net/
|
||||
License: GPLv2+
|
||||
Version: 1.0.99rc1
|
||||
Release: 1
|
||||
Summary: Torrent Downloading Library
|
||||
|
||||
License: GPLv2+ and LGPLv2+ and MIT and BSD
|
||||
Url: http://ktorrent.org/
|
||||
Group: Productivity/Networking/File-Sharing
|
||||
Summary: KTorrent Downloading Library
|
||||
Version: 1.0.80
|
||||
Release: 2
|
||||
Source0: http://ktorrent.org/downloads/4.1rc1/%{name}-1.1rc1.tar.bz2
|
||||
BuildRoot: %{_tmppath}/%{name}-%{version}-build
|
||||
Source: %{name}-%{srcversion}.tar.bz2
|
||||
Source1: %{name}-po.tar.bz2
|
||||
# Patch0 fixes superseeding crash, see : kde #(261529), first reported in kde #(262560).
|
||||
Patch0: libktorrent-1.1beta1-sprseedcrash.patch
|
||||
|
||||
BuildRequires: boost-devel
|
||||
BuildRequires: doxygen
|
||||
BuildRequires: gmp-devel
|
||||
BuildRequires: libgcrypt-devel
|
||||
BuildRequires: libkde4-devel
|
||||
BuildRequires: libqca2-devel
|
||||
|
||||
%description
|
||||
Torrent is a BitTorrent program for KDE. Its main features are:
|
||||
* Download of torrent files
|
||||
* Upload speed capping, seeing that most people cannot upload
|
||||
infinite amounts of data
|
||||
* Internet searching using the BitTorrent Web site's search engine
|
||||
* UDP trackers
|
||||
libktorrent is a torrent downloading library.
|
||||
|
||||
|
||||
|
||||
Authors:
|
||||
--------
|
||||
Jois Guisson <jrois.guisson@gmail.com>
|
||||
|
||||
%package devel
|
||||
License: GPLv2+
|
||||
Summary: Development files for libktorrent
|
||||
License: GPLv2+ and LGPLv2+ and MIT and BSD
|
||||
Group: Development/Libraries/C and C++
|
||||
Summary: KDE BitTorrent Client Build Environment
|
||||
Requires: libktorrent3 = %{version}
|
||||
|
||||
%description devel
|
||||
This package includes the necessary files to build KTorrent plugins.
|
||||
This package includes the necessary files for development using libktorrent.
|
||||
|
||||
|
||||
|
||||
@ -62,13 +58,13 @@ Authors:
|
||||
Jois Guisson <jrois.guisson@gmail.com>
|
||||
|
||||
%package -n libktorrent3
|
||||
License: GPLv2+
|
||||
Summary: Torrent Downloading Library
|
||||
License: GPLv2+ and LGPLv2+ and MIT and BSD
|
||||
Group: Productivity/Networking/File-Sharing
|
||||
Summary: KDE BitTorrent Client Build Environment
|
||||
Recommends: libktorrent2-lang = %{version}
|
||||
Recommends: libktorrent3-lang = %{version}
|
||||
|
||||
%description -n libktorrent3
|
||||
This package includes the ktorrent donwloading library
|
||||
libktorrent is a torrent downloading library.
|
||||
|
||||
|
||||
|
||||
@ -78,52 +74,51 @@ Authors:
|
||||
|
||||
|
||||
%lang_package -n libktorrent3
|
||||
|
||||
%prep
|
||||
%setup -q -n %{name}-%{srcversion}
|
||||
# -a 1
|
||||
%patch0
|
||||
echo "find_package(Msgfmt REQUIRED)" >> CMakeLists.txt
|
||||
echo "find_package(Gettext REQUIRED)" >> CMakeLists.txt
|
||||
echo "add_subdirectory( po ) " >> CMakeLists.txt
|
||||
%setup -q -n %{name}-1.1rc1
|
||||
|
||||
%build
|
||||
%cmake_kde4 -d build -- -DENABLE_DHT_SUPPORT=true
|
||||
%make_jobs
|
||||
%cmake_kde4 -d build
|
||||
%make_jobs
|
||||
|
||||
%install
|
||||
cd build
|
||||
%makeinstall
|
||||
%fdupes -s $RPM_BUILD_ROOT
|
||||
%if %suse_version < 1120
|
||||
rm -rf $RPM_BUILD_ROOT/usr/share/locale/hne
|
||||
%endif
|
||||
%kde_post_install
|
||||
%find_lang %name
|
||||
cd build
|
||||
%kde4_makeinstall
|
||||
cd ..
|
||||
|
||||
%pre -n libktorrent3 -p /sbin/ldconfig
|
||||
# Remove unneeded locales
|
||||
%if 0%{?suse_version} < 1140
|
||||
rm -rf %{buildroot}%{_datadir}/locale/ast/
|
||||
rm -rf %{buildroot}%{_datadir}/locale/hne/
|
||||
rm -rf %{buildroot}%{_datadir}/locale/sr@ijekavian/
|
||||
rm -rf %{buildroot}%{_datadir}/locale/sr@ijekavianlatin/
|
||||
%endif
|
||||
#
|
||||
|
||||
%find_lang %{name}
|
||||
|
||||
%kde_post_install
|
||||
|
||||
%clean
|
||||
rm -rf %{buildroot}
|
||||
|
||||
%post -n libktorrent3 -p /sbin/ldconfig
|
||||
|
||||
%postun -n libktorrent3 -p /sbin/ldconfig
|
||||
|
||||
%files -n libktorrent3-lang -f build/%name.lang
|
||||
%defattr(-,root,root)
|
||||
%if 0%{?suse_version} < 1140
|
||||
%dir /usr/share/locale/sr@ijekavian
|
||||
%dir /usr/share/locale/sr@ijekavian/LC_MESSAGES
|
||||
%dir /usr/share/locale/sr@ijekavianlatin
|
||||
%dir /usr/share/locale/sr@ijekavianlatin/LC_MESSAGES
|
||||
%endif
|
||||
%files devel
|
||||
%defattr(-,root,root,-)
|
||||
%{_kde4_includedir}/libktorrent/
|
||||
%{_kde4_libdir}/libktorrent.so
|
||||
%{_kde4_appsdir}/cmake/modules/FindKTorrent.cmake
|
||||
|
||||
%files -n libktorrent3
|
||||
%defattr(-,root,root)
|
||||
%_libdir/libktorrent.so.*
|
||||
%defattr(-,root,root,-)
|
||||
%doc COPYING ChangeLog RoadMap
|
||||
%{_kde4_libdir}/libktorrent.so.*
|
||||
|
||||
%files devel
|
||||
%defattr(-,root,root)
|
||||
%dir /usr/include/libktorrent
|
||||
%_libdir/libktorrent.so
|
||||
/usr/include/libktorrent
|
||||
/usr/share/kde4/apps/cmake/modules/FindKTorrent.cmake
|
||||
%files -n libktorrent3-lang -f %{name}.lang
|
||||
%defattr(-,root,root,-)
|
||||
|
||||
%changelog
|
||||
|
||||
Loading…
Reference in New Issue
Block a user