Hello community, here is the log from the commit of package ktorrent checked in at Thu Jul 5 10:24:05 CEST 2007. -------- --- KDE/ktorrent/ktorrent.changes 2007-06-21 11:19:51.000000000 +0200 +++ /mounts/work_src_done/STABLE/ktorrent/ktorrent.changes 2007-07-04 11:15:19.000000000 +0200 @@ -1,0 +2,5 @@ +Wed Jul 4 11:15:14 CEST 2007 - stbinner@suse.de + +- update to final 2.2 release + +------------------------------------------------------------------- Old: ---- FIXME.diff ktorrent-2.2rc1.tar.bz2 New: ---- ktorrent-2.2.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ ktorrent.spec ++++++ --- /var/tmp/diff_new_pack.Y22164/_old 2007-07-05 10:23:52.000000000 +0200 +++ /var/tmp/diff_new_pack.Y22164/_new 2007-07-05 10:23:52.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package ktorrent (Version 2.2rc1) +# spec file for package ktorrent (Version 2.2.0) # # Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -16,19 +16,18 @@ BuildRequires: fdupes %endif URL: http://ktorrent.pwsp.net/ -License: GNU General Public License (GPL) -Group: Productivity/Networking/Other +License: GPL v2 or later +Group: Productivity/Networking/File-Sharing Summary: KDE BitTorrent Client -Version: 2.2rc1 -Release: 2 +Version: 2.2.0 +Release: 1 BuildRoot: %{_tmppath}/%{name}-%{version}-build -%define rversion %{version} +%define rversion 2.2 Source: %{name}-%{rversion}.tar.bz2 Patch2: remove-links.diff Patch4: no-geoip-db.diff Patch10: ktorrent-fix-columns.diff Patch16: disable-DHT.diff -Patch17: FIXME.diff %if %suse_version > 1020 Requires: %{name}-lang = %{version} %endif @@ -57,7 +56,6 @@ %patch4 -p1 %patch10 %patch16 -%patch17 . /etc/opt/kde3/common_options update_admin @@ -113,12 +111,14 @@ /opt/kde3/share/apps/* /opt/kde3/%_lib/kde3/* /opt/kde3/%_lib/libktorrent.* -/opt/kde3/%_lib/libktorrent-%{version}.so +/opt/kde3/%_lib/libktorrent-2.2.so /opt/kde3/share/config.kcfg/*.kcfg /opt/kde3/share/services/*.desktop /opt/kde3/share/servicetypes/*.desktop %changelog +* Wed Jul 04 2007 - stbinner@suse.de +- update to final 2.2 release * Thu Jun 21 2007 - stbinner@suse.de - run fdupes and kde_post_install, fix invalid .desktop file * Sun Jun 17 2007 - stbinner@suse.de ++++++ ktorrent-2.2rc1.tar.bz2 -> ktorrent-2.2.tar.bz2 ++++++ ++++ 158446 lines of diff (skipped) ++++++ no-geoip-db.diff ++++++ --- /var/tmp/diff_new_pack.Y22164/_old 2007-07-05 10:23:58.000000000 +0200 +++ /var/tmp/diff_new_pack.Y22164/_new 2007-07-05 10:23:58.000000000 +0200 @@ -11,24 +11,27 @@ -SUBDIRS = geoip KDE_CXXFLAGS = $(USE_EXCEPTIONS) $(USE_RTTI) diff -u -r ktorrent-2.1beta1.orig/plugins/infowidget/peerview.cpp ktorrent-2.1beta1/plugins/infowidget/peerview.cpp ---- ktorrent-2.1beta1.orig/plugins/infowidget/peerview.cpp 2006-11-25 13:49:50.000000000 +0100 -+++ ktorrent-2.1beta1/plugins/infowidget/peerview.cpp 2006-11-25 14:13:31.000000000 +0100 -@@ -45,7 +45,7 @@ - static QPixmap no_pix; +--- ktorrent/plugins/infowidget/peerview.cpp 2007/07/04 09:15:48 1.1 ++++ ktorrent/plugins/infowidget/peerview.cpp 2007/07/04 09:17:59 +@@ -53,7 +53,7 @@ static QPixmap lock_pix; + static FlagDB flagDB(22, 18); static bool yes_no_pix_loaded = false; - static bool geoip_db_exists = true; + static bool geoip_db_exists = false; - + static QString geoip_data_file; PeerViewItem::PeerViewItem(PeerView* pv,kt::PeerInterface* peer) : KListViewItem(pv),peer(peer) -@@ -56,9 +56,6 @@ +@@ -67,10 +67,10 @@ yes_pix = iload->loadIcon("button_ok",KIcon::Small); no_pix = iload->loadIcon("button_cancel",KIcon::Small); lock_pix = iload->loadIcon("ktencrypted",KIcon::Small); -- geoip_db_exists = !locate("data", "ktorrent/geoip/geoip.dat").isNull(); -- if(!geoip_db_exists) -- geoip_db_exists = !locate("data", "ktorrent/geoip/GeoIP.dat").isNull(); - yes_no_pix_loaded = true; - } - +-#ifdef USE_SYSTEM_GEOIP ++#if 0 + geo_ip = GeoIP_open_type(GEOIP_COUNTRY_EDITION, GEOIP_STANDARD); + geoip_db_exists = (geo_ip != NULL); +-#else ++ + geoip_db_exists = !locate("data", "ktorrent/geoip/geoip.dat").isNull(); + if(geoip_db_exists) { + geoip_data_file = "ktorrent/geoip/geoip.dat"; ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org
participants (1)
-
root@Hilbert.suse.de