From b008b35be6e94cb149dc916e1c41c90ae78fb1a0 Mon Sep 17 00:00:00 2001
From: Roland Wolters <liquidat@fedoraproject.org>
Date: Jul 03 2007 20:09:42 +0000
Subject: New upstream version 2.2. Source file updated, spec file changed.


---

diff --git a/.cvsignore b/.cvsignore
index 6334b93..45a399b 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-ktorrent-2.1.4.tar.gz
+ktorrent-2.2.tar.gz
diff --git a/ktorrent.spec b/ktorrent.spec
index da21217..028899f 100644
--- a/ktorrent.spec
+++ b/ktorrent.spec
@@ -1,21 +1,16 @@
+%define desktopvendor fedora
 
 Name:           ktorrent
-Version:        2.1.4
+Version:        2.2
 Release:        1%{?dist}
 Summary:        A BitTorrent program for KDE
 Group:          Applications/Internet
 License:        GPL
 URL:            http://ktorrent.pwsp.net/
-Source0:        http://ktorrent.org/downloads/%{version}/ktorrent-%{version}.tar.gz
+Source0:        http://ktorrent.org/downloads/2.2/ktorrent-2.2.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:  kdelibs-devel
-BuildRequires:  gettext
-BuildRequires:  gmp-devel
-BuildRequires:  avahi-devel
-BuildRequires:  desktop-file-utils
-# for 'make -f admin/Makefile.common'
-BuildRequires:  automake
+BuildRequires:  qt-devel kdelibs-devel gettext gmp-devel avahi-devel automake desktop-file-utils
 
 %description
 KTorrent is a BitTorrent program for KDE. Its main features are native KDE
@@ -24,26 +19,16 @@ searching using various search engines, UDP Trackers and UPnP support.
 
 %prep
 %setup -q
-
-# fix "WARNING:.../Makefile.in seems to ignore the --datarootdir setting"
 make -f admin/Makefile.common
 
-
 %build
-%configure \
-  --disable-rpath \
-  --enable-new-ldflags \
-  --disable-debug --disable-warnings \
-  --disable-dependency-tracking --enable-final
+%configure	--disable-rpath
 
 make %{?_smp_mflags}
 
-
 %install
 %{__rm} -rf $RPM_BUILD_ROOT
-
 make install DESTDIR=$RPM_BUILD_ROOT
-
 %find_lang %{name}
 
 rm -f $RPM_BUILD_ROOT%{_datadir}/applnk/Internet/ktorrent.desktop
@@ -52,10 +37,6 @@ rm -f $RPM_BUILD_ROOT%{_datadir}/applnk/Internet/ktorrent.desktop
         --add-category=X-Fedora                                 \
         %{buildroot}%{_datadir}/applications/kde/ktorrent.desktop
 
-# Unpackaged files
-rm -f %{buildroot}%{_libdir}/lib*.la
-
-
 %post
 /sbin/ldconfig 2>/dev/null
 
@@ -76,14 +57,13 @@ fi
 
 update-desktop-database &> /dev/null ||:
 
-
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-
 %files -f %{name}.lang
 %defattr(-,root,root,-)
 %doc AUTHORS ChangeLog COPYING README TODO
+%exclude %{_libdir}/lib*.la
 %{_bindir}/ktcachecheck
 %{_bindir}/ktorrent
 %{_bindir}/kttorinfo
@@ -107,6 +87,8 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/kde3/ktschedulerplugin.la
 %{_libdir}/kde3/ktsearchplugin.so
 %{_libdir}/kde3/ktsearchplugin.la
+%{_libdir}/kde3/ktstatsplugin.so
+%{_libdir}/kde3/ktstatsplugin.la
 %{_libdir}/kde3/ktupnpplugin.so
 %{_libdir}/kde3/ktupnpplugin.la
 %{_libdir}/kde3/ktwebinterfaceplugin.so
@@ -114,11 +96,12 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/kde3/ktzeroconfplugin.so
 %{_libdir}/kde3/ktzeroconfplugin.la
 %{_datadir}/applications/kde/ktorrent.desktop
-%{_datadir}/apps/ktorrent/
+%{_datadir}/apps/ktorrent
 %{_datadir}/config.kcfg/ktlogviewerplugin.kcfg
 %{_datadir}/config.kcfg/ktrssfeedplugin.kcfg
 %{_datadir}/config.kcfg/ktscanfolderplugin.kcfg
 %{_datadir}/config.kcfg/ktschedulerplugin.kcfg
+%{_datadir}/config.kcfg/ktstatsplugin.kcfg
 %{_datadir}/config.kcfg/ktinfowidgetplugin.kcfg
 %{_datadir}/config.kcfg/ktipfilterplugin.kcfg
 %{_datadir}/config.kcfg/ktorrent.kcfg
@@ -147,19 +130,26 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/services/ktpartfileimportplugin.desktop
 %{_datadir}/services/ktrssfeedplugin.desktop
 %{_datadir}/services/ktsearchplugin.desktop
+%{_datadir}/services/ktstatsplugin.desktop
 %{_datadir}/services/ktupnpplugin.desktop
 %{_datadir}/servicetypes/ktorrentplugin.desktop
 %{_datadir}/services/ktwebinterfaceplugin.desktop
 %{_datadir}/services/ktzeroconfplugin.desktop
 
-
 %changelog
-* Tue Apr 24 2007 Roland Wolters <wolters.liste@gmx.net> 2.1.4-1
-- update to upstream 2.1.4
-
-* Tue Apr 03 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 2.1.3-1
-- ktorrent-2.1.3 (#235014)
-- optimize %%configure
+* Tue Jul 03 2007 Roland Wolters <wolters.liste@gmx.net> 2.2-1
+- update to upstream 2.2:
+	- cleaner UI
+	- - New file selection dialog
+	- Statistics plugin with pretty graphs
+	- Possibility to open as many tabs as you want
+	- Diskspace monitoring and stopping of downloads when the diskspace
+	  drops below a certain value
+	- Individual torrent speed limits
+	- Full disk preallocation to avoid fragmentation
+
+* Wed Jun 13 2007 Roland Wolters <wolters.liste@gmx.net> 2.2rc1-1
+- update to upstream 2.2rc1
 
 * Fri Mar 09 2007 Roland Wolters <wolters.liste@gmx.net> 2.1.2-2
 - update to upstream 2.1.2
diff --git a/sources b/sources
index 385041b..8775946 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-69d3d7df6200710181594da19ab8c248  ktorrent-2.1.4.tar.gz
+6790dd2507895da9d1d468ba3a357277  ktorrent-2.2.tar.gz