Hello community,
here is the log from the commit of package ktorrent
checked in at Tue Feb 19 14:12:26 CET 2008.
--------
--- KDE/ktorrent/ktorrent.changes 2008-01-27 18:12:35.000000000 +0100
+++ /mounts/work_src_done/STABLE/ktorrent/ktorrent.changes 2008-02-19 14:02:42.000000000 +0100
@@ -1,0 +2,5 @@
+Tue Feb 19 14:00:11 CET 2008 - stbinner@suse.de
+
+- update to 3.0, the first KDE4-based release
+
+-------------------------------------------------------------------
Old:
----
build-kde-3.4.diff
disable-DHT.diff
ktorrent-2.2.5.tar.bz2
ktorrent-fix-columns.diff
New:
----
ktorrent-3.0.0.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ ktorrent.spec ++++++
--- /var/tmp/diff_new_pack.IA9248/_old 2008-02-19 14:12:11.000000000 +0100
+++ /var/tmp/diff_new_pack.IA9248/_new 2008-02-19 14:12:11.000000000 +0100
@@ -1,5 +1,5 @@
#
-# spec file for package ktorrent (Version 2.2.5)
+# spec file for package ktorrent (Version 3.0.0)
#
# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine
@@ -10,8 +10,9 @@
# norootforbuild
+
Name: ktorrent
-BuildRequires: gmp-devel kdelibs3-devel
+BuildRequires: gmp-devel kdebase4-workspace-devel libqca2-devel
%if %suse_version > 1020
BuildRequires: fdupes
%endif
@@ -19,16 +20,13 @@
License: GPL v2 or later
Group: Productivity/Networking/File-Sharing
Summary: KDE BitTorrent Client
-Version: 2.2.5
+Version: 3.0.0
Release: 1
BuildRoot: %{_tmppath}/%{name}-%{version}-build
%define rversion %version
Source: %{name}-%{rversion}.tar.bz2
Patch2: remove-links.diff
Patch4: no-geoip-db.diff
-Patch10: ktorrent-fix-columns.diff
-Patch16: disable-DHT.diff
-Patch18: build-kde-3.4.diff
%if %suse_version > 1020
Requires: %{name}-lang = %{version}
%endif
@@ -50,76 +48,108 @@
--------
Jois Guisson
+%package devel
+Group: Productivity/Networking/File-Sharing
+Summary: KDE BitTorrent Client Build Environment
+Requires: ktorrent = %{version}
+
+%description devel
+This packages include the necessary files to build KTorrent plugins.
+
+
+
+Authors:
+--------
+ Jois Guisson
+
%lang_package
%prep
-%setup -q -n %{name}-%{rversion}
-%patch2 -p1
-%patch4 -p1
-%patch10
-%patch16
-%if %suse_version < 1010
-%patch18
-%endif
-. /etc/opt/kde3/common_options
-update_admin
+%setup -q -n %{name}-%{version}
+%patch2
+%patch4
%build
-%if %suse_version > 1000
-export RPM_OPT_FLAGS="$RPM_OPT_FLAGS -fstack-protector"
-%endif
-. /etc/opt/kde3/common_options
-./configure $configkde
-do_make %{?jobs:-j %jobs}
+ %cmake_kde4 -d build -- -DENABLE_DHT_SUPPORT=false
+ %make_jobs
%install
-. /etc/opt/kde3/common_options
-make DESTDIR=$RPM_BUILD_ROOT install
-%suse_update_desktop_file %name Network FileTransfer
-%if %suse_version > 1020
-%fdupes -s $RPM_BUILD_ROOT
-%endif
-kde_post_install
-%find_lang %name
+ cd build
+ %makeinstall
+ %if %suse_version > 1020
+ %fdupes -s $RPM_BUILD_ROOT
+ %endif
+ %kde_post_install
+ %find_lang %name
%pre
%run_ldconfig
%post
%run_ldconfig
+
+%postun
+%run_ldconfig
%if %suse_version > 1020
-%files lang -f %name.lang
+%files lang -f build/%name.lang
%files
%else
-%files -f %name.lang
+%files -f build/%name.lang
%endif
%defattr(-,root,root)
-%dir /opt/kde3/share/icons/hicolor/16x16
-%dir /opt/kde3/share/icons/hicolor/32x32
-%dir /opt/kde3/share/icons/hicolor/128x128
-%dir /opt/kde3/share/icons/hicolor/128x128/apps
-%dir /opt/kde3/share/icons/hicolor/16x16/apps
-%dir /opt/kde3/share/icons/hicolor/32x32/apps
-%dir /opt/kde3/share/icons/hicolor/48x48
-%dir /opt/kde3/share/icons/hicolor/48x48/apps
-%dir /opt/kde3/share/icons/hicolor/64x64
-%dir /opt/kde3/share/icons/hicolor/64x64/apps
-%dir /opt/kde3/share/icons/hicolor/scalable
-%dir /opt/kde3/share/icons/hicolor/scalable/apps
-/opt/kde3/bin/*
-/opt/kde3/share/icons/*/*/*/*
-/opt/kde3/share/appl*/*/*.desktop
-/opt/kde3/share/apps/*
-/opt/kde3/%_lib/kde3/*
-/opt/kde3/%_lib/libktorrent.*
-/opt/kde3/%_lib/libktorrent-%{version}.so
-/opt/kde3/share/config.kcfg/*.kcfg
-/opt/kde3/share/services/*.desktop
-/opt/kde3/share/servicetypes/*.desktop
+/usr/bin/ktorrent
+/usr/bin/ktupnptest
+/usr/lib/kde4/ktbwschedulerplugin.so
+/usr/lib/kde4/ktinfowidgetplugin.so
+/usr/lib/kde4/ktipfilterplugin.so
+/usr/lib/kde4/ktlogviewerplugin.so
+/usr/lib/kde4/ktscanfolderplugin.so
+/usr/lib/kde4/ktsearchplugin.so
+/usr/lib/kde4/ktstatsplugin.so
+/usr/lib/kde4/ktupnpplugin.so
+/usr/lib/kde4/ktwebinterfaceplugin.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/kde4/apps/cmake/modules/FindBTCore.cmake
+/usr/share/kde4/apps/ktorrent
+/usr/share/kde4/services/ktbwschedulerplugin.desktop
+/usr/share/kde4/services/ktinfowidgetplugin.desktop
+/usr/share/kde4/services/ktipfilterplugin.desktop
+/usr/share/kde4/services/ktlogviewerplugin.desktop
+/usr/share/kde4/services/ktscanfolderplugin.desktop
+/usr/share/kde4/services/ktsearchplugin.desktop
+/usr/share/kde4/services/ktstatsplugin.desktop
+/usr/share/kde4/services/ktupnpplugin.desktop
+/usr/share/kde4/services/ktwebinterfaceplugin.desktop
+/usr/share/kde4/servicetypes/ktorrentplugin.desktop
+
+%files devel
+%defattr(-,root,root)
+/usr/lib/libbtcore.so
+/usr/lib/libktcore.so
+/usr/lib/libktupnp.so
+/usr/include/libbtcore
%changelog
+* Tue Feb 19 2008 stbinner@suse.de
+- update to 3.0, the first KDE4-based release
* Sun Jan 27 2008 stbinner@suse.de
- update to 2.2.5, several minor bug fixes
* Thu Nov 22 2007 stbinner@suse.de
++++++ ktorrent-2.2.5.tar.bz2 -> ktorrent-3.0.0.tar.bz2 ++++++
++++ 779176 lines of diff (skipped)
++++++ no-geoip-db.diff ++++++
--- /var/tmp/diff_new_pack.IA9248/_old 2008-02-19 14:12:17.000000000 +0100
+++ /var/tmp/diff_new_pack.IA9248/_new 2008-02-19 14:12:17.000000000 +0100
@@ -1,37 +1,34 @@
-diff -u -r ktorrent-2.1beta1.orig/plugins/infowidget/Makefile.am ktorrent-2.1beta1/plugins/infowidget/Makefile.am
---- ktorrent-2.1beta1.orig/plugins/infowidget/Makefile.am 2006-11-25 13:49:50.000000000 +0100
-+++ ktorrent-2.1beta1/plugins/infowidget/Makefile.am 2006-11-25 14:13:45.000000000 +0100
-@@ -27,8 +27,4 @@
- kde_services_DATA = ktinfowidgetplugin.desktop
-
- kde_kcfg_DATA = ktinfowidgetplugin.kcfg
--
--ktdatadir = $(kde_datadir)/ktorrent/geoip
--
--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/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;
+--- plugins/infowidget/peerview.cpp 2008/02/19 10:53:21 1.1
++++ plugins/infowidget/peerview.cpp 2008/02/19 10:54:10
+@@ -45,7 +45,7 @@
+ static bool icons_loaded = false;
+ static GeoIP* geo_ip = 0;
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)
-@@ -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);
+
+ PeerViewItem::PeerViewItem(PeerView* pv,PeerInterface* peer) : QTreeWidgetItem(pv,QTreeWidgetItem::UserType),peer(peer)
+@@ -57,10 +57,9 @@
+ icons_loaded = true;
+ flagDB.addFlagSource("data", QString("ktorrent/%1.png"));
+ flagDB.addFlagSource("locale", QString("l10n/%1/flag.png"));
-#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";
+ geoip_db_exists = !KStandardDirs::locate("data", "ktorrent/geoip.dat").isNull();
+ if(geoip_db_exists)
+ {
+--- plugins/infowidget/CMakeLists.txt 2008/02/19 10:52:14 1.1
++++ plugins/infowidget/CMakeLists.txt 2008/02/19 10:55:36
+@@ -25,8 +25,6 @@
+ set(geoip_src GeoIP.c)
+ endif(WITH_SYSTEM_GEOIP)
+
+-add_subdirectory(geoip)
+-
+ set(ktinfowidgetplugin_SRC
+ infowidgetplugin.cpp
+ iwprefpage.cpp
++++++ remove-links.diff ++++++
--- /var/tmp/diff_new_pack.IA9248/_old 2008-02-19 14:12:17.000000000 +0100
+++ /var/tmp/diff_new_pack.IA9248/_new 2008-02-19 14:12:17.000000000 +0100
@@ -1,7 +1,24 @@
-diff -r -u ktorrent-2.1beta1.orig/plugins/search/searchenginelist.cpp ktorrent-2.1beta1/plugins/search/searchenginelist.cpp
---- ktorrent-2.1beta1.orig/plugins/search/searchenginelist.cpp 2006-11-25 13:49:50.000000000 +0100
-+++ ktorrent-2.1beta1/plugins/search/searchenginelist.cpp 2006-11-25 13:54:01.000000000 +0100
-@@ -106,6 +106,7 @@
+--- plugins/search/searchprefpage.cpp 2008/02/19 10:41:08 1.1
++++ plugins/search/searchprefpage.cpp 2008/02/19 10:49:33
+@@ -180,6 +180,7 @@
+ {
+ newItem( "KTorrents", KUrl("http://www.ktorrents.com/search.php?lg=0&sourceid=ktorrent&q=FOOBAR&f=0"));
+ newItem( "bittorrent.com", KUrl("http://search.bittorrent.com/search.jsp?query=FOOBAR"));
++#if 0
+ newItem( "isohunt.com", KUrl("http://isohunt.com/torrents.php?ihq=FOOBAR&op=and"));
+ newItem( "mininova.org", KUrl("http://www.mininova.org/search.php?search=FOOBAR"));
+ newItem( "thepiratebay.org", KUrl("http://thepiratebay.org/search.php?q=FOOBAR"));
+@@ -187,6 +188,7 @@
+ newItem( "bytenova.org", KUrl("http://www.bitenova.org/search.php?search=FOOBAR&start=0&start=0&ie=utf-8&oe=utf-8"));
+ newItem( "torrentspy.com", KUrl("http://torrentspy.com/search.asp?query=FOOBAR"));
+ newItem( "torrentz.com", KUrl("http://www.torrentz.com/search_FOOBAR"));
++#endif
+ saveSearchEngines();
+ }
+
+--- plugins/search/searchenginelist.cpp 2008/02/19 10:41:08 1.1
++++ plugins/search/searchenginelist.cpp 2008/02/19 10:41:08
+@@ -100,6 +100,7 @@
out << "# SEARCH ENGINES list" << ::endl;
out << "KTorrents http://www.ktorrents.com/search.php?lg=0&sourceid=ktorrent&q=FOOBAR&f=0" << ::endl;
out << "bittorrent.com http://www.bittorrent.com/search_result.myt?search=FOOBAR" << ::endl;
@@ -9,33 +26,11 @@
out << "isohunt.com http://isohunt.com/torrents.php?ihq=FOOBAR&op=and" << ::endl;
out << "mininova.org http://www.mininova.org/search.php?search=FOOBAR" << ::endl;
out << "thepiratebay.org http://thepiratebay.org/search.php?q=FOOBAR" << ::endl;
-@@ -113,6 +114,7 @@
+@@ -107,6 +108,7 @@
out << "bytenova.org http://www.bitenova.org/search.php?search=FOOBAR&start=0&start=0&ie=utf-8&oe=utf-8" << ::endl;
out << "torrentspy.com http://torrentspy.com/search.asp?query=FOOBAR" << ::endl;
out << "torrentz.com http://www.torrentz.com/search_FOOBAR" << ::endl;
+#endif
}
- KURL SearchEngineList::getSearchURL(bt::Uint32 engine) const
-Only in ktorrent-2.1beta1/plugins/search: searchenginelist.cpp~
-diff -r -u ktorrent-2.1beta1.orig/plugins/search/searchprefpage.cpp ktorrent-2.1beta1/plugins/search/searchprefpage.cpp
---- ktorrent-2.1beta1.orig/plugins/search/searchprefpage.cpp 2006-11-25 13:49:50.000000000 +0100
-+++ ktorrent-2.1beta1/plugins/search/searchprefpage.cpp 2006-11-25 13:53:18.000000000 +0100
-@@ -153,7 +153,7 @@
- QListViewItem* se = new QListViewItem(m_engines, "KTorrents", "http://www.ktorrents.com/search.php?lg=0&sourceid=ktorrent&q=FOOBAR&f=0");
-
- se = new QListViewItem(m_engines, "bittorrent.com", "http://search.bittorrent.com/search.jsp?query=FOOBAR");
--
-+#if 0
- se = new QListViewItem(m_engines, "isohunt.com", "http://isohunt.com/torrents.php?ihq=FOOBAR&op=and");
-
- se = new QListViewItem(m_engines, "mininova.org", "http://www.mininova.org/search.php?search=FOOBAR");
-@@ -167,6 +167,7 @@
- se = new QListViewItem(m_engines, "torrentspy.com", "http://torrentspy.com/search.asp?query=FOOBAR");
-
- se = new QListViewItem(m_engines, "torrentz.com", "http://www.torrentz.com/search_FOOBAR");
-+#endif
- }
-
- void SearchPrefPageWidget::removeAllClicked()
-Only in ktorrent-2.1beta1/plugins/search: searchprefpage.cpp~
+ KUrl SearchEngineList::getSearchURL(bt::Uint32 engine) const
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org